From 215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 7 Sep 2005 17:26:23 -0700 Subject: Big tool rename. As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano --- git-rebase.sh | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100755 git-rebase.sh (limited to 'git-rebase.sh') diff --git a/git-rebase.sh b/git-rebase.sh new file mode 100755 index 0000000000..49c8f12e51 --- /dev/null +++ b/git-rebase.sh @@ -0,0 +1,68 @@ +#!/bin/sh +# +# Copyright (c) 2005 Junio C Hamano. +# + +. git-sh-setup || die "Not a git archive." + +usage="usage: $0 "' [] + +Uses output from git-cherry to rebase local commits to the new head of +upstream tree.' + +case "$#,$1" in +1,*..*) + upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$') + set x "$upstream" "$ours" + shift ;; +esac + +git-update-index --refresh || exit + +case "$#" in +1) ours_symbolic=HEAD ;; +2) ours_symbolic="$2" ;; +*) die "$usage" ;; +esac + +upstream=`git-rev-parse --verify "$1"` && +ours=`git-rev-parse --verify "$ours_symbolic"` || exit +different1=$(git-diff-index --name-only --cached "$ours") && +different2=$(git-diff-index --name-only "$ours") && +test "$different1$different2" = "" || +die "Your working tree does not match $ours_symbolic." + +git-read-tree -m -u $ours $upstream && +git-rev-parse --verify "$upstream^0" >"$GIT_DIR/HEAD" || exit + +tmp=.rebase-tmp$$ +fail=$tmp-fail +trap "rm -rf $tmp-*" 1 2 3 15 + +>$fail + +git-cherry -v $upstream $ours | +while read sign commit msg +do + case "$sign" in + -) + echo >&2 "* Already applied: $msg" + continue ;; + esac + echo >&2 "* Applying: $msg" + S=`cat "$GIT_DIR/HEAD"` && + git-cherry-pick --replay $commit || { + echo >&2 "* Not applying the patch and continuing." + echo $commit >>$fail + git-reset --hard $S + } +done +if test -s $fail +then + 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 -- cgit v1.2.3