diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-12 03:13:31 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 21:13:05 +0100 |
| commit | 150fe065f71778a6591566d6fde65171569a4b7a (patch) | |
| tree | cdc2d2eaca21cb971756601af4cfa67af0545281 /merge-recursive.c | |
| parent | merge-recursive.c: remove implicit dependency on the_repository (diff) | |
| download | git-150fe065f71778a6591566d6fde65171569a4b7a.tar.xz git-150fe065f71778a6591566d6fde65171569a4b7a.zip | |
read-cache.c: remove the_* from index_has_changes()
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@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 a596d95739..df00896b25 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3412,7 +3412,7 @@ int merge_trees(struct merge_options *o, int code, clean; struct strbuf sb = STRBUF_INIT; - if (!o->call_depth && index_has_changes(istate, head, &sb)) { + if (!o->call_depth && repo_index_has_changes(o->repo, head, &sb)) { err(o, _("Your local changes to the following files would be overwritten by merge:\n %s"), sb.buf); return -1; |