summaryrefslogtreecommitdiff
path: root/git-rebase-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-25 09:23:43 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 23:52:16 (GMT)
commit59e6b23acef9d29b9bdabc38ee80361e19ef7ebe (patch)
tree32e674e352960114da7940e79f7ba1d23d3c818e /git-rebase-script
parent93c36dcd0a4f6373e3a02a8505046801106ddb85 (diff)
downloadgit-59e6b23acef9d29b9bdabc38ee80361e19ef7ebe.zip
git-59e6b23acef9d29b9bdabc38ee80361e19ef7ebe.tar.gz
git-59e6b23acef9d29b9bdabc38ee80361e19ef7ebe.tar.bz2
[PATCH] git-rebase-script: rebase local commits to new upstream head.
Using git-cherry, forward port local commits missing from the new upstream head. This also depends on "-m" flag support in git-commit-script. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'git-rebase-script')
-rwxr-xr-xgit-rebase-script49
1 files changed, 49 insertions, 0 deletions
diff --git a/git-rebase-script b/git-rebase-script
new file mode 100755
index 0000000..10ab700
--- /dev/null
+++ b/git-rebase-script
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Junio C Hamano.
+#
+
+usage="usage: $0 "'<upstream> [<head>]
+
+Uses output from git-cherry to rebase local commits to the new head of
+upstream tree.'
+
+: ${GIT_DIR=.git}
+
+case "$#" in
+1) linus=`git-rev-parse "$1"` &&
+ junio=`git-rev-parse HEAD` || exit
+ ;;
+2) linus=`git-rev-parse "$1"` &&
+ junio=`git-rev-parse "$2"` || exit
+ ;;
+*) echo >&2 "$usage"; exit 1 ;;
+esac
+
+git-read-tree -m -u $junio $linus &&
+echo "$linus" >"$GIT_DIR/HEAD" || exit
+
+tmp=.rebase-tmp$$
+fail=$tmp-fail
+trap "rm -rf $tmp-*" 0 1 2 3 15
+
+>$fail
+
+git-cherry $linus $junio |
+while read sign commit
+do
+ case "$sign" in
+ -) continue ;;
+ esac
+ S=`cat "$GIT_DIR/HEAD"` &&
+ GIT_EXTERNAL_DIFF=git-apply-patch-script git-diff-tree -p $commit &&
+ git-commit-script -m "$commit" || {
+ echo $commit >>$fail
+ git-read-tree --reset -u $S
+ }
+done
+if test -s $fail
+then
+ echo Some commits could not be rebased, check by hand:
+ cat $fail
+fi