diff options
| author | Stephen Haberman <stephen@exigencecorp.com> | 2008-10-15 02:44:39 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-16 09:23:54 -0700 |
| commit | d80d6bc146232d81f1bb4bc58e5d89263fd228d4 (patch) | |
| tree | e1ce75a3fc84c51c20597abf7941e2c9a1bc6c57 /git-rebase--interactive.sh | |
| parent | acc8559aa33b7a1ea49b0841e0759ecf05c6f26e (diff) | |
| download | git-d80d6bc146232d81f1bb4bc58e5d89263fd228d4.tar.gz git-d80d6bc146232d81f1bb4bc58e5d89263fd228d4.tar.xz | |
rebase-i-p: do not include non-first-parent commits touching UPSTREAM
This covers an odd boundary case found by Avi Kivity's script where a branch
coming off of UPSTREAM is merged into HEAD. Initially it show up in
UPSTREAM..HEAD, but technically UPSTREAM is not moving, the rest of head is, so
we should not need to rewrite the merge.
This adds a check saying we can keep `preserve=t` if `p=UPSTREAM`...unless this
is the first first-parent commit in our UPSTREAM..HEAD rev-list, which could
very well point to UPSTREAM, but we still need to consider it as rewritten so we
start pulling in the rest of the UPSTREAM..HEAD commits that point to it.
Signed-off-by: Stephen Haberman <stephen@exigencecorp.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 851066f0f..495f554b6 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -583,6 +583,7 @@ first and then run 'git rebase --continue' again." # parents to rewrite and skipping dropped commits would # prematurely end our probe MERGES_OPTION= + first_after_upstream="$(git rev-list --reverse --first-parent $UPSTREAM..$HEAD | head -n 1)" else MERGES_OPTION="--no-merges --cherry-pick" fi @@ -603,7 +604,7 @@ first and then run 'git rebase --continue' again." preserve=t for p in $(git rev-list --parents -1 $sha1 | cut -d' ' -f2-) do - if test -f "$REWRITTEN"/$p + if test -f "$REWRITTEN"/$p -a \( $p != $UPSTREAM -o $sha1 = $first_after_upstream \) then preserve=f fi |