undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5f5608bcec
git-commit-vandalism/git-rebase-script

62 lines
1.3 KiB
Plaintext
Raw Normal View History

[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>
2005-06-25 11:23:43 +02:00
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano.
#
Teach format-patch, rebase and cherry a..b format Although these commands take only begin and end, not necessarily generic SHA1 expressions rev-parse supports, supporting a..b notation is good for consistency. This commit adds such without breaking backward compatibility. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-08 00:51:09 +02:00
. git-sh-setup-script || die "Not a git archive."
[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>
2005-06-25 11:23:43 +02:00
usage="usage: $0 "'<upstream> [<head>]
Uses output from git-cherry to rebase local commits to the new head of
upstream tree.'
Teach format-patch, rebase and cherry a..b format Although these commands take only begin and end, not necessarily generic SHA1 expressions rev-parse supports, supporting a..b notation is good for consistency. This commit adds such without breaking backward compatibility. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-08 00:51:09 +02:00
case "$#,$1" in
1,*..*)
upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$')
set x "$upstream" "$ours"
shift ;;
esac
[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>
2005-06-25 11:23:43 +02:00
Make rebase script saner. It did not check to see if the working tree was clean and matched the commit we were starting out as, resulting in the initial rebased commit including whatever dirty state the working tree has had. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-18 00:19:57 +02:00
git-update-cache --refresh || exit
[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>
2005-06-25 11:23:43 +02:00
case "$#" in
Make rebase script saner. It did not check to see if the working tree was clean and matched the commit we were starting out as, resulting in the initial rebased commit including whatever dirty state the working tree has had. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-18 00:19:57 +02:00
1) ours_symbolic=HEAD ;;
2) ours_symbolic="$2" ;;
*) die "$usage" ;;
[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>
2005-06-25 11:23:43 +02:00
esac
Make rebase script saner. It did not check to see if the working tree was clean and matched the commit we were starting out as, resulting in the initial rebased commit including whatever dirty state the working tree has had. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-18 00:19:57 +02:00
upstream=`git-rev-parse --verify "$1"` &&
Stupid typo fix for git rebase. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-18 22:00:53 +02:00
ours=`git-rev-parse --verify "$ours_symbolic"` || exit
Also make git-rebase-script stricter about dirty working tree. Otherwise the first commit rebase makes could include whatever dirty state the original working tree had. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-19 01:30:36 +02:00
different1=$(git-diff-cache --name-only --cached "$ours") &&
different2=$(git-diff-cache --name-only "$ours") &&
test "$different1$different2" = "" ||
Make rebase script saner. It did not check to see if the working tree was clean and matched the commit we were starting out as, resulting in the initial rebased commit including whatever dirty state the working tree has had. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-18 00:19:57 +02:00
die "Your working tree does not match $ours_symbolic."
Teach format-patch, rebase and cherry a..b format Although these commands take only begin and end, not necessarily generic SHA1 expressions rev-parse supports, supporting a..b notation is good for consistency. This commit adds such without breaking backward compatibility. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-08 00:51:09 +02:00
git-read-tree -m -u $ours $upstream &&
Audit rev-parse users. Make sure that we say --verify when we want to get a single SHA1 name. Also when we say --verify, --revs-only is redundant. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-16 00:37:37 +02:00
git-rev-parse --verify "$upstream^0" >"$GIT_DIR/HEAD" || exit
[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>
2005-06-25 11:23:43 +02:00
tmp=.rebase-tmp$$
fail=$tmp-fail
trap "rm -rf $tmp-*" 0 1 2 3 15
>$fail
Teach format-patch, rebase and cherry a..b format Although these commands take only begin and end, not necessarily generic SHA1 expressions rev-parse supports, supporting a..b notation is good for consistency. This commit adds such without breaking backward compatibility. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-08 00:51:09 +02:00
git-cherry $upstream $ours |
[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>
2005-06-25 11:23:43 +02:00
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: log parameter updates. While moving '-m' to make room for CVS compatible "here is the log message", enhance source of log parameters. -m 'message': a command line parameter. -F <file> : a file (use '-' to read from stdin). -C <commit> : message in existing commit. -c <commit> : message in existing commit (allows further editing). Longer option names for these options are also available. While we are at it, get rid of shell array bashism. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-09 02:03:14 +02:00
git-commit-script -C "$commit" || {
[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>
2005-06-25 11:23:43 +02:00
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
Reference in New Issue Copy Permalink