Fossil SCM

Avoid warning about extra call to db_end_transaction() by returning at the end of a complete block.

andybradford 2019-08-31 18:09 trunk
Commit 7b2350a86b96f2b5839a6480ca0bee17eeab0014a931689a4640387b18ab9540
1 file changed +1
--- src/stash.c
+++ src/stash.c
@@ -616,10 +616,11 @@
616616
/* Make sure the stash has committed before running the revert, so that
617617
** we have a copy of the changes before deleting them. */
618618
db_commit_transaction();
619619
g.argv[1] = "revert";
620620
revert_cmd();
621
+ return;
621622
}else
622623
if( memcmp(zCmd, "snapshot", nCmd)==0 ){
623624
stash_create();
624625
}else
625626
if( memcmp(zCmd, "list", nCmd)==0 || memcmp(zCmd, "ls", nCmd)==0 ){
626627
--- src/stash.c
+++ src/stash.c
@@ -616,10 +616,11 @@
616 /* Make sure the stash has committed before running the revert, so that
617 ** we have a copy of the changes before deleting them. */
618 db_commit_transaction();
619 g.argv[1] = "revert";
620 revert_cmd();
 
621 }else
622 if( memcmp(zCmd, "snapshot", nCmd)==0 ){
623 stash_create();
624 }else
625 if( memcmp(zCmd, "list", nCmd)==0 || memcmp(zCmd, "ls", nCmd)==0 ){
626
--- src/stash.c
+++ src/stash.c
@@ -616,10 +616,11 @@
616 /* Make sure the stash has committed before running the revert, so that
617 ** we have a copy of the changes before deleting them. */
618 db_commit_transaction();
619 g.argv[1] = "revert";
620 revert_cmd();
621 return;
622 }else
623 if( memcmp(zCmd, "snapshot", nCmd)==0 ){
624 stash_create();
625 }else
626 if( memcmp(zCmd, "list", nCmd)==0 || memcmp(zCmd, "ls", nCmd)==0 ){
627

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button