diff options
| author | Elijah Newren <newren@gmail.com> | 2018-06-30 18:24:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-03 13:13:18 -0700 |
| commit | 1b9fbefbe08ff2bbcbb8a6089867b32fca603eac (patch) | |
| tree | 34cb866304417116c47b1ec2a34b8421d331323f /merge-recursive.c | |
| parent | cffbfad50d1f37aea03520dd8d8ea983bc57da02 (diff) | |
| download | git-1b9fbefbe08ff2bbcbb8a6089867b32fca603eac.tar.gz git-1b9fbefbe08ff2bbcbb8a6089867b32fca603eac.tar.xz | |
index_has_changes(): avoid assuming operating on the_index
Modify index_has_changes() to take a struct istate* instead of just
operating on the_index. This is only a partial conversion, though,
because we call do_diff_cache() which implicitly assumes work is to be
done on the_index. Ongoing work is being done elsewhere to do the
remainder of the conversion, and thus is not duplicated here. Instead,
a simple check is put in place until that work is complete.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 869092f7b..32529ca5b 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1983,7 +1983,7 @@ int merge_trees(struct merge_options *o, if (oid_eq(&common->object.oid, &merge->object.oid)) { struct strbuf sb = STRBUF_INIT; - if (!o->call_depth && index_has_changes(&sb)) { + if (!o->call_depth && index_has_changes(&the_index, &sb)) { err(o, _("Dirty index: cannot merge (dirty: %s)"), sb.buf); return 0; |