{"thread":{"id":"8926","subject":"[PATCH 3/3] rebase -i: remember the settings of -v, -s and -p when interrupted","startedAt":"2007-07-08T02:02:47Z","lastAt":"2007-07-08T05:54:47Z","messageCount":2,"participants":["Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"46729","messageId":"Pine.LNX.4.64.0707080302370.4093@racer.site","threadId":"8926","inReplyTo":null,"subject":"[PATCH 3/3] rebase -i: remember the settings of -v, -s and -p when interrupted","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-07-08T02:02:47Z","receivedAt":"2007-07-08T02:02:47Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nAfter interruption, be that an edit, or a conflicting commit, reset\nthe variables VERBOSE, STRATEGY and PRESERVE_MERGES, so that the\nuser does not have to respecify them with \"rebase --continue\".\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n git-rebase--interactive.sh    |    4 ++++\n t/t3404-rebase-interactive.sh |   10 ++++++++++\n 2 files changed, 14 insertions(+), 0 deletions(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 84148a9..a9bb622 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -23,6 +23,9 @@ REWRITTEN=\"$DOTEST\"/rewritten\n PRESERVE_MERGES=\n STRATEGY=\n VERBOSE=\n+test -d \"$REWRITTEN\" && PRESERVE_MERGES=t\n+test -f \"$DOTEST\"/strategy && STRATEGY=\"$(cat \"$DOTEST\"/strategy)\"\n+test -f \"$DOTEST\"/verbose && VERBOSE=t\n \n warn () {\n \techo \"$*\" >&2\n@@ -365,6 +368,7 @@ do\n \t\techo $HEAD > \"$DOTEST\"/head\n \t\techo $UPSTREAM > \"$DOTEST\"/upstream\n \t\techo $ONTO > \"$DOTEST\"/onto\n+\t\ttest -z \"$STRATEGY\" || echo \"$STRATEGY\" > \"$DOTEST\"/strategy\n \t\ttest t = \"$VERBOSE\" && : > \"$DOTEST\"/verbose\n \t\tif [ t = \"$PRESERVE_MERGES\" ]\n \t\tthen\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex c251336..43a6675 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -202,4 +202,14 @@ test_expect_success '--continue tries to commit' '\n \tgit show HEAD | grep chouette\n '\n \n+test_expect_success 'verbose flag is heeded, even after --continue' '\n+\tgit reset --hard HEAD@{1} &&\n+\ttest_tick &&\n+\t! git rebase -v -i --onto new-branch1 HEAD^ &&\n+\techo resolved > file1 &&\n+\tgit add file1 &&\n+\tgit rebase --continue > output &&\n+\tgrep \"^ file1 |    2 +-$\" output\n+'\n+\n test_done\n-- \n1.5.3.rc0.2712.g125b7f\n"},{"id":"46736","messageId":"7v1wfj5tjs.fsf@assigned-by-dhcp.cox.net","threadId":"8926","inReplyTo":"Pine.LNX.4.64.0707080302370.4093@racer.site","subject":"Re: [PATCH 3/3] rebase -i: remember the settings of -v, -s and -p when interrupted","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-07-08T05:54:47Z","receivedAt":"2007-07-08T05:54:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"All three makes sense.  Thanks.\n"}]}