[PATCH] Use "git cherry-pick" in "git rebase"
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:05
Subsystem:
the rest · Maintainer:
Linus Torvalds
Rewrite "git rebase" using "git cherry-pick". Signed-off-by: Junio C Hamano <redacted> --- git-rebase-script | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) 913404ae6371857c21c696cc3d8b0a04421fdeb2
diff --git a/git-rebase-script b/git-rebase-script
--- a/git-rebase-script
+++ b/git-rebase-script@@ -37,7 +37,7 @@ git-rev-parse --verify "$upstream^0" >"$ tmp=.rebase-tmp$$ fail=$tmp-fail -trap "rm -rf $tmp-*" 0 1 2 3 15 +trap "rm -rf $tmp-*" 1 2 3 15 >$fail
@@ -48,14 +48,18 @@ do -) continue ;; esac S=`cat "$GIT_DIR/HEAD"` && - GIT_EXTERNAL_DIFF=git-apply-patch-script git-diff-tree -p $commit && - git-commit-script -C "$commit" || { + git-cherry-pick-script --replay $commit || { + echo >&2 "* Not applying the patch and continuing." echo $commit >>$fail - git-read-tree --reset -u $S + git-reset-script --hard $S } done if test -s $fail then - echo Some commits could not be rebased, check by hand: - cat $fail + echo >&2 Some commits could not be rebased, check by hand: + cat >&2 $fail + echo >&2 "(the same list of commits are found in $tmp)" + exit 1 +else + rm -f $fail fi