diff options
author | Elijah Newren <newren@gmail.com> | 2017-12-21 22:19:06 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-22 23:20:29 +0300 |
commit | b101793c431b858e49b909bb309a87145fb7348c (patch) | |
tree | a5f796c240fb006d4adb2ff7c63a636888c73b85 /builtin/am.c | |
parent | eab3f2850e7cc63a8087fbeae608a1b72ea70c7b (diff) |
move index_has_changes() from builtin/am.c to merge.c for reuse
index_has_changes() is a function we want to reuse outside of just am,
making it also available for merge-recursive and merge-ort.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/am.c')
-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 d7513f53759..71619f01aab 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); - DIFF_OPT_SET(&opt, EXIT_WITH_STATUS); - if (!sb) - DIFF_OPT_SET(&opt, QUICK); - 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 DIFF_OPT_TST(&opt, 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. */ |