diff options
author | Elijah Newren <newren@gmail.com> | 2018-07-01 01:25:00 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-11 16:38:36 (GMT) |
commit | e1f8694f3394caf3d3cd57c6c7593f0b0cdb1f9e (patch) | |
tree | dd07179f9af2ebd29a518d3553ea061ceb099b77 /builtin | |
parent | 92702392cefdbd66ca593fa909540230ef9e005e (diff) | |
download | git-e1f8694f3394caf3d3cd57c6c7593f0b0cdb1f9e.zip git-e1f8694f3394caf3d3cd57c6c7593f0b0cdb1f9e.tar.gz git-e1f8694f3394caf3d3cd57c6c7593f0b0cdb1f9e.tar.bz2 |
merge-recursive: fix assumption that head tree being merged is HEAD
`git merge-recursive` does a three-way merge between user-specified trees
base, head, and remote. Since the user is allowed to specify head, we can
not necesarily assume that head == HEAD.
Modify index_has_changes() to take an extra argument specifying the tree
to compare against. If NULL, it will compare to HEAD. We then use this
from merge-recursive to make sure we compare to the user-specified head.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/am.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin/am.c b/builtin/am.c index 2d80056..3d827d1 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1763,7 +1763,7 @@ static void am_run(struct am_state *state, int resume) refresh_and_write_cache(); - if (index_has_changes(&the_index, &sb)) { + if (index_has_changes(&the_index, NULL, &sb)) { write_state_bool(state, "dirtyindex", 1); die(_("Dirty index: cannot apply patches (dirty: %s)"), sb.buf); } @@ -1820,7 +1820,8 @@ static void am_run(struct am_state *state, int resume) * Applying the patch to an earlier tree and merging * the result may have produced the same tree as ours. */ - if (!apply_status && !index_has_changes(&the_index, NULL)) { + if (!apply_status && + !index_has_changes(&the_index, NULL, NULL)) { say(state, stdout, _("No changes -- Patch already applied.")); goto next; } @@ -1878,7 +1879,7 @@ static void am_resolve(struct am_state *state) say(state, stdout, _("Applying: %.*s"), linelen(state->msg), state->msg); - if (!index_has_changes(&the_index, NULL)) { + if (!index_has_changes(&the_index, NULL, NULL)) { printf_ln(_("No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch.")); |