diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-01-06 00:28:09 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-01-06 00:28:09 +0300 |
commit | 843d94b3cd30e61c7c4879f9bc6d013021b9350a (patch) | |
tree | 8e9700c13e1b66580c1cb729f0274fe6bb5567a9 /builtin | |
parent | fa62d0392b6f69e5c2ba0885bd85e670c28e9546 (diff) | |
parent | b6825b5c8e8b58943511f2576475accf1593486e (diff) |
Merge branch 'ew/empty-merge-with-dirty-index'
"git merge -s recursive" did not correctly abort when the index is
dirty, if the merged tree happened to be the same as the current
HEAD, which has been fixed.
* ew/empty-merge-with-dirty-index:
merge-recursive: avoid incorporating uncommitted changes in a merge
move index_has_changes() from builtin/am.c to merge.c for reuse
t6044: recursive can silently incorporate dirty changes in a merge
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/am.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/builtin/am.c b/builtin/am.c index 06b824518f..acfe9d3c8c 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1147,43 +1147,6 @@ static void refresh_and_write_cache(void) } /** - * Returns 1 if the index differs from HEAD, 0 otherwise. When on an unborn - * branch, returns 1 if there are entries in the index, 0 otherwise. If an - * strbuf is provided, the space-separated list of files that differ will be - * appended to it. - */ -static int index_has_changes(struct strbuf *sb) -{ - struct object_id head; - int i; - - if (!get_oid_tree("HEAD", &head)) { - struct diff_options opt; - - diff_setup(&opt); - opt.flags.exit_with_status = 1; - if (!sb) - opt.flags.quick = 1; - do_diff_cache(&head, &opt); - diffcore_std(&opt); - for (i = 0; sb && i < diff_queued_diff.nr; i++) { - if (i) - strbuf_addch(sb, ' '); - strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path); - } - diff_flush(&opt); - return opt.flags.has_changes != 0; - } else { - for (i = 0; sb && i < active_nr; i++) { - if (i) - strbuf_addch(sb, ' '); - strbuf_addstr(sb, active_cache[i]->name); - } - return !!active_nr; - } -} - -/** * Dies with a user-friendly message on how to proceed after resolving the * problem. This message can be overridden with state->resolvemsg. */ |