summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2008-08-13 23:41:24 +0200
committerJunio C Hamano <gitster@pobox.com>2008-08-13 15:17:10 -0700
commita96dc01e21603849cb454a311f18780c2e839f29 (patch)
tree5e77504859088bb6a608e96eb4f250ce1a639905 /git-rebase--interactive.sh
parent71d9451e061841ed5acb576652e09df32c700b86 (diff)
downloadgit-a96dc01e21603849cb454a311f18780c2e839f29.tar.gz
rebase -i -p: fix parent rewriting
The existing parent rewriting did not handle the case where a previous commit was amended (via edit or squash). Fix by always putting the new sha1 of the last commit into the $REWRITTEN map. Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 58126bd80c..929d681c47 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -165,14 +165,14 @@ pick_one_preserving_merges () {
die "Cannot write current commit's replacement sha1"
fi
+ echo $sha1 > "$DOTEST"/current-commit
+
# rewrite parents; if none were rewritten, we can fast-forward.
- preserve=t
new_parents=
for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -f2-)
do
if test -f "$REWRITTEN"/$p
then
- preserve=f
new_p=$(cat "$REWRITTEN"/$p)
test $p != $new_p && fast_forward=f
case "$new_parents" in
@@ -189,7 +189,6 @@ pick_one_preserving_merges () {
case $fast_forward in
t)
output warn "Fast forward to $sha1"
- test $preserve = f || echo $sha1 > "$REWRITTEN"/$sha1
output git reset --hard $sha1 ||
die "Cannot fast forward to $sha1"
;;
@@ -201,7 +200,6 @@ pick_one_preserving_merges () {
output git checkout $first_parent 2> /dev/null ||
die "Cannot move HEAD to $first_parent"
- echo $sha1 > "$DOTEST"/current-commit
case "$new_parents" in
' '*' '*)
# redo merge