{"thread":{"id":"20458","subject":"[PATCH 4/4] rebase -i: use \"git sequencer--helper --fast-forward\"","startedAt":"2009-08-07T20:40:53Z","lastAt":"2009-08-07T20:40:53Z","messageCount":1,"participants":["Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"119931","messageId":"20090807204054.6280.39494.chriscool@tuxfamily.org","threadId":"20458","inReplyTo":null,"subject":"[PATCH 4/4] rebase -i: use \"git sequencer--helper --fast-forward\"","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-08-07T20:40:53Z","receivedAt":"2009-08-07T20:40:53Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"when fast forwarding.\n\nNote that in the first hunk of this patch, there was this line:\n\ntest \"a$1\" = a-n && output git reset --soft $current_sha1\n\nbut the test always failed.\n\nSigned-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n\n\tThe test \"a$1\" = a-n fails because if \"$1\" is set to \"-n\"\n\tthen \"$no_ff\" is set to \"t\" above by:\n\n\tcase \"$1\" in -n) sha1=$2; no_ff=t ;; *) sha1=$1 ;; esac\n\n\tand that means that:\n\n\ttest \"$no_ff$current_sha1\" = \"$parent_sha1\"\n\n\twill fail.\n\n\tBut maybe I missed something. Otherwise I can send a patch\n\tfor master to remove the dead code. \n\n git-rebase--interactive.sh |   11 +++--------\n 1 files changed, 3 insertions(+), 8 deletions(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 0041994..7651fd6 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -154,11 +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\tgit sequencer--helper --reset-hard $sha1 \\\n+\t\tgit sequencer--helper --fast-forward $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 \telse\n \t\toutput git cherry-pick \"$@\"\n \tfi\n@@ -238,10 +235,8 @@ pick_one_preserving_merges () {\n \tdone\n \tcase $fast_forward in\n \tt)\n-\t\toutput warn \"Fast forward to $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\tgit sequencer--helper --fast-forward $sha1 \\\n+\t\t\t\"$GIT_REFLOG_ACTION\" \"$VERBOSE\" || exit\n \t\t;;\n \tf)\n \t\tfirst_parent=$(expr \"$new_parents\" : ' \\([^ ]*\\)')\n-- \n1.6.4.209.g16b77\n"}]}