projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement a test for git-fetch-pack/git-upload-pack
[git.git]
/
git-rebase.sh
diff --git
a/git-rebase.sh
b/git-rebase.sh
index
49c8f12
..
fa95009
100755
(executable)
--- a/
git-rebase.sh
+++ b/
git-rebase.sh
@@
-33,7
+33,8
@@
test "$different1$different2" = "" ||
die "Your working tree does not match $ours_symbolic."
git-read-tree -m -u $ours $upstream &&
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
+new_head=$(git-rev-parse --verify "$upstream^0") &&
+git-update-ref HEAD "$new_head" || exit
tmp=.rebase-tmp$$
fail=$tmp-fail
tmp=.rebase-tmp$$
fail=$tmp-fail
@@
-50,7
+51,7
@@
do
continue ;;
esac
echo >&2 "* Applying: $msg"
continue ;;
esac
echo >&2 "* Applying: $msg"
- S=
`cat "$GIT_DIR/HEAD"`
&&
+ S=
$(git-rev-parse --verify HEAD)
&&
git-cherry-pick --replay $commit || {
echo >&2 "* Not applying the patch and continuing."
echo $commit >>$fail
git-cherry-pick --replay $commit || {
echo >&2 "* Not applying the patch and continuing."
echo $commit >>$fail