diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:39:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-08 21:39:38 -0700 |
| commit | 49981d8a250837019b4a14f44d471fc6ff7e334f (patch) | |
| tree | c3394268eaaade296d7de692fe7e76bacb3be97b /builtin/reset.c | |
| parent | 0202c411edc25940cc381bf317badcdf67670be4 (diff) | |
| parent | 6ebdac1bab966b720d776aa43ca188fe378b1f4b (diff) | |
| download | git-49981d8a250837019b4a14f44d471fc6ff7e334f.tar.gz git-49981d8a250837019b4a14f44d471fc6ff7e334f.tar.xz | |
Start maintenance track for 2.10.x series
Diffstat (limited to 'builtin/reset.c')
| -rw-r--r-- | builtin/reset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index e8c576703..9020ec66c 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -121,7 +121,7 @@ static void update_index_from_diff(struct diff_queue_struct *q, for (i = 0; i < q->nr; i++) { struct diff_filespec *one = q->queue[i]->one; - int is_missing = !(one->mode && !is_null_sha1(one->sha1)); + int is_missing = !(one->mode && !is_null_oid(&one->oid)); struct cache_entry *ce; if (is_missing && !intent_to_add) { @@ -129,7 +129,7 @@ static void update_index_from_diff(struct diff_queue_struct *q, continue; } - ce = make_cache_entry(one->mode, one->sha1, one->path, + ce = make_cache_entry(one->mode, one->oid.hash, one->path, 0, 0); if (!ce) die(_("make_cache_entry failed for path '%s'"), @@ -158,7 +158,7 @@ static int read_from_tree(const struct pathspec *pathspec, return 1; diffcore_std(&opt); diff_flush(&opt); - free_pathspec(&opt.pathspec); + clear_pathspec(&opt.pathspec); return 0; } |