diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-22 23:48:38 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-22 23:48:38 +0300 |
commit | b6825b5c8e8b58943511f2576475accf1593486e (patch) | |
tree | de8bc8a4fdf954c8870cb1a1d60f3d38b781d12f /builtin | |
parent | 936d1b989416a95f593bf81ccae8ac62cd83f279 (diff) | |
parent | 65170c07d466b18364e0d2b6a360900c073b600f (diff) |
Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index
* ew/empty-merge-with-dirty-index-maint:
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 3d98e52085..a02d5186cb 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1143,43 +1143,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. */ |