development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

[PATCH] git-rebase-script: rebase local commits to new upstream head.

Browse source 
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>
This commit is contained in:
Junio C Hamano 2005-06-25 02:23:43 -07:00 committed by Linus Torvalds
parent 93c36dcd0a
commit 59e6b23ace
2 changed files with 50 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -25,7 +25,7 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
git-deltafy-script git-fetch-script git-status-script git-commit-script \
git-log-script git-shortlog git-cvsimport-script git-diff-script \
git-reset-script git-add-script git-checkout-script git-clone-script \
gitk git-cherry
gitk git-cherry git-rebase-script
PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-read-tree git-commit-tree git-cat-file git-fsck-cache \

49
git-rebase-script Executable file
View file

@ -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