{"thread":{"id":"20416","subject":"[PATCH v2 4/4] rebase -i: use \"git sequencer--helper --reset-hard\"","startedAt":"2009-08-05T20:53:00Z","lastAt":"2009-08-05T20:53:00Z","messageCount":1,"participants":["Christian Couder"],"isPatch":true,"patchVersion":2,"patchTotal":4},"messages":[{"id":"119706","messageId":"20090805205301.3673.71764.chriscool@tuxfamily.org","threadId":"20416","inReplyTo":null,"subject":"[PATCH v2 4/4] rebase -i: use \"git sequencer--helper --reset-hard\"","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-08-05T20:53:00Z","receivedAt":"2009-08-05T20:53:00Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"instead of \"git reset --hard\"\n\nSigned-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n git-rebase--interactive.sh |   13 +++++++++----\n 1 files changed, 9 insertions(+), 4 deletions(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex c9c75c0..0041994 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -154,7 +154,8 @@ pick_one () {\n \t\tdie \"Could not get the parent of $sha1\"\n \tcurrent_sha1=$(git rev-parse --verify HEAD)\n \tif test \"$no_ff$current_sha1\" = \"$parent_sha1\"; then\n-\t\toutput git reset --hard $sha1\n+\t\tgit sequencer--helper --reset-hard $sha1 \\\n+\t\t\t\"$GIT_REFLOG_ACTION\" \"$VERBOSE\"\n \t\ttest \"a$1\" = a-n && output git reset --soft $current_sha1\n \t\tsha1=$(git rev-parse --short $sha1)\n \t\toutput warn Fast forward to $sha1\n@@ -238,7 +239,8 @@ pick_one_preserving_merges () {\n \tcase $fast_forward in\n \tt)\n \t\toutput warn \"Fast forward to $sha1\"\n-\t\toutput git reset --hard $sha1 ||\n+\t\tgit sequencer--helper --reset-hard $sha1 \\\n+\t\t\t\"$GIT_REFLOG_ACTION\" \"$VERBOSE\" ||\n \t\t\tdie \"Cannot fast forward to $sha1\"\n \t\t;;\n \tf)\n@@ -536,7 +538,8 @@ first and then run 'git rebase --continue' again.\"\n \t\t\tgit symbolic-ref HEAD $HEADNAME\n \t\t\t;;\n \t\tesac &&\n-\t\toutput git reset --hard $HEAD &&\n+\t\tgit sequencer--helper --reset-hard $HEAD \\\n+\t\t\t\"$GIT_REFLOG_ACTION\" \"$VERBOSE\" &&\n \t\trm -rf \"$DOTEST\"\n \t\texit\n \t\t;;\n@@ -548,7 +551,9 @@ first and then run 'git rebase --continue' again.\"\n \t\tgit rerere clear\n \t\ttest -d \"$DOTEST\" || die \"No interactive rebase running\"\n \n-\t\toutput git reset --hard && do_rest\n+\t\tgit sequencer--helper --reset-hard HEAD \\\n+\t\t\t\"$GIT_REFLOG_ACTION\" \"$VERBOSE\" &&\n+\t\tdo_rest\n \t\t;;\n \t-s)\n \t\tcase \"$#,$1\" in\n-- \n1.6.4.133.g8a5c8\n"}]}