mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
rebase-i-p: delay saving current-commit to REWRITTEN if squashing
If the current-commit was dumped to REWRITTEN, but then we squash the next commit in to it, we have invalidated the HEAD was just written to REWRITTEN. Instead, append the squash hash to current-commit and save both of them the next time around. Signed-off-by: Stephen Haberman <stephen@exigencecorp.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
72583e6c68
commit
bb64507164
|
@ -170,13 +170,18 @@ pick_one_preserving_merges () {
|
|||
|
||||
if test -f "$DOTEST"/current-commit
|
||||
then
|
||||
current_commit=$(cat "$DOTEST"/current-commit) &&
|
||||
git rev-parse HEAD > "$REWRITTEN"/$current_commit &&
|
||||
rm "$DOTEST"/current-commit ||
|
||||
die "Cannot write current commit's replacement sha1"
|
||||
if [ "$fast_forward" == "t" ]
|
||||
then
|
||||
cat "$DOTEST"/current-commit | while read current_commit
|
||||
do
|
||||
git rev-parse HEAD > "$REWRITTEN"/$current_commit
|
||||
done
|
||||
rm "$DOTEST"/current-commit ||
|
||||
die "Cannot write current commit's replacement sha1"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo $sha1 > "$DOTEST"/current-commit
|
||||
echo $sha1 >> "$DOTEST"/current-commit
|
||||
|
||||
# rewrite parents; if none were rewritten, we can fast-forward.
|
||||
new_parents=
|
||||
|
|
Loading…
Reference in a new issue