diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-09 18:41:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-09 18:41:37 (GMT) |
| commit | 5b1c54ac99e6847eaff409cd6fb328fd0f8d9076 (patch) | |
| tree | f8016300d5cd7bbf3cdc062ccaca86238879da6d /merge-recursive.c | |
| parent | b6825b5c8e8b58943511f2576475accf1593486e (diff) | |
| parent | f309e8e768ec5de97e8ab3dcd223f32865176290 (diff) | |
| download | git-5b1c54ac99e6847eaff409cd6fb328fd0f8d9076.zip git-5b1c54ac99e6847eaff409cd6fb328fd0f8d9076.tar.gz git-5b1c54ac99e6847eaff409cd6fb328fd0f8d9076.tar.bz2 | |
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: do not look at the index during recursive merge
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 780f81a..0fc580d 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1954,7 +1954,7 @@ int merge_trees(struct merge_options *o, if (oid_eq(&common->object.oid, &merge->object.oid)) { struct strbuf sb = STRBUF_INIT; - if (index_has_changes(&sb)) { + if (!o->call_depth && index_has_changes(&sb)) { err(o, _("Dirty index: cannot merge (dirty: %s)"), sb.buf); return 0; |