Fossil SCM
Avoid repeating the 'commit aborted' message.
Commit
30ac5c00dd6a4d6d593ef1e64c393e8e52cb9ae7c2534a7a8dc69ecf6fc3d476
Parent
190d138a13741f6…
1 file changed
+2
-4
+2
-4
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -2525,15 +2525,14 @@ | ||
| 2525 | 2525 | if( !noPrompt ){ |
| 2526 | 2526 | prompt_user("empty check-in comment. continue (y/N)? ", &ans); |
| 2527 | 2527 | cReply = blob_str(&ans)[0]; |
| 2528 | 2528 | blob_reset(&ans); |
| 2529 | 2529 | }else{ |
| 2530 | - fossil_print("Abandoning commit due to empty check-in comment\n"); | |
| 2531 | 2530 | cReply = 'N'; |
| 2532 | 2531 | } |
| 2533 | 2532 | if( cReply!='y' && cReply!='Y' ){ |
| 2534 | - fossil_fatal("Commit aborted."); | |
| 2533 | + fossil_fatal("Abandoning commit due to empty check-in comment\n"); | |
| 2535 | 2534 | } |
| 2536 | 2535 | } |
| 2537 | 2536 | } |
| 2538 | 2537 | |
| 2539 | 2538 | if( !noVerify && hook_exists("before-commit") ){ |
| @@ -2678,15 +2677,14 @@ | ||
| 2678 | 2677 | if( !noPrompt ){ |
| 2679 | 2678 | prompt_user("unable to sign manifest. continue (y/N)? ", &ans); |
| 2680 | 2679 | cReply = blob_str(&ans)[0]; |
| 2681 | 2680 | blob_reset(&ans); |
| 2682 | 2681 | }else{ |
| 2683 | - fossil_print("Abandoning commit due to manifest signing failure\n"); | |
| 2684 | 2682 | cReply = 'N'; |
| 2685 | 2683 | } |
| 2686 | 2684 | if( cReply!='y' && cReply!='Y' ){ |
| 2687 | - fossil_fatal("Commit aborted."); | |
| 2685 | + fossil_fatal("Abandoning commit due to manifest signing failure\n"); | |
| 2688 | 2686 | } |
| 2689 | 2687 | } |
| 2690 | 2688 | |
| 2691 | 2689 | /* If the -n|--dry-run option is specified, output the manifest file |
| 2692 | 2690 | ** and rollback the transaction. |
| 2693 | 2691 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2525,15 +2525,14 @@ | |
| 2525 | if( !noPrompt ){ |
| 2526 | prompt_user("empty check-in comment. continue (y/N)? ", &ans); |
| 2527 | cReply = blob_str(&ans)[0]; |
| 2528 | blob_reset(&ans); |
| 2529 | }else{ |
| 2530 | fossil_print("Abandoning commit due to empty check-in comment\n"); |
| 2531 | cReply = 'N'; |
| 2532 | } |
| 2533 | if( cReply!='y' && cReply!='Y' ){ |
| 2534 | fossil_fatal("Commit aborted."); |
| 2535 | } |
| 2536 | } |
| 2537 | } |
| 2538 | |
| 2539 | if( !noVerify && hook_exists("before-commit") ){ |
| @@ -2678,15 +2677,14 @@ | |
| 2678 | if( !noPrompt ){ |
| 2679 | prompt_user("unable to sign manifest. continue (y/N)? ", &ans); |
| 2680 | cReply = blob_str(&ans)[0]; |
| 2681 | blob_reset(&ans); |
| 2682 | }else{ |
| 2683 | fossil_print("Abandoning commit due to manifest signing failure\n"); |
| 2684 | cReply = 'N'; |
| 2685 | } |
| 2686 | if( cReply!='y' && cReply!='Y' ){ |
| 2687 | fossil_fatal("Commit aborted."); |
| 2688 | } |
| 2689 | } |
| 2690 | |
| 2691 | /* If the -n|--dry-run option is specified, output the manifest file |
| 2692 | ** and rollback the transaction. |
| 2693 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -2525,15 +2525,14 @@ | |
| 2525 | if( !noPrompt ){ |
| 2526 | prompt_user("empty check-in comment. continue (y/N)? ", &ans); |
| 2527 | cReply = blob_str(&ans)[0]; |
| 2528 | blob_reset(&ans); |
| 2529 | }else{ |
| 2530 | cReply = 'N'; |
| 2531 | } |
| 2532 | if( cReply!='y' && cReply!='Y' ){ |
| 2533 | fossil_fatal("Abandoning commit due to empty check-in comment\n"); |
| 2534 | } |
| 2535 | } |
| 2536 | } |
| 2537 | |
| 2538 | if( !noVerify && hook_exists("before-commit") ){ |
| @@ -2678,15 +2677,14 @@ | |
| 2677 | if( !noPrompt ){ |
| 2678 | prompt_user("unable to sign manifest. continue (y/N)? ", &ans); |
| 2679 | cReply = blob_str(&ans)[0]; |
| 2680 | blob_reset(&ans); |
| 2681 | }else{ |
| 2682 | cReply = 'N'; |
| 2683 | } |
| 2684 | if( cReply!='y' && cReply!='Y' ){ |
| 2685 | fossil_fatal("Abandoning commit due to manifest signing failure\n"); |
| 2686 | } |
| 2687 | } |
| 2688 | |
| 2689 | /* If the -n|--dry-run option is specified, output the manifest file |
| 2690 | ** and rollback the transaction. |
| 2691 |