diff options
| author | Jameson Miller <jamill@microsoft.com> | 2018-07-02 21:49:30 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-03 19:58:15 +0200 |
| commit | 825ed4d9a044380ac093563e6bd74311ea4488ef (patch) | |
| tree | fcfb270dee1a6d626b4f2d37cbc45ee3534b4b64 /merge-recursive.c | |
| parent | read-cache: teach refresh_cache_entry to take istate (diff) | |
| download | git-825ed4d9a044380ac093563e6bd74311ea4488ef.tar.xz git-825ed4d9a044380ac093563e6bd74311ea4488ef.zip | |
read-cache: teach make_cache_entry to take object_id
Teach make_cache_entry function to take object_id instead of a SHA-1.
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 11a767cc72..8b30cc7e35 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -315,7 +315,7 @@ static int add_cacheinfo(struct merge_options *o, struct cache_entry *ce; int ret; - ce = make_cache_entry(mode, oid ? oid->hash : null_sha1, path, stage, 0); + ce = make_cache_entry(mode, oid ? oid : &null_oid, path, stage, 0); if (!ce) return err(o, _("add_cacheinfo failed for path '%s'; merge aborting."), path); |