diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-06-13 19:19:23 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-13 11:49:10 -0700 |
| commit | 03b86647722f11ccc321cd7279aa49b811d17cc2 (patch) | |
| tree | dc5b717a01867692ce344d1548ad5a82ac1c1881 /builtin/reset.c | |
| parent | 33c297aacc0ce0f945198fbcdf48fbf2fd27d01b (diff) | |
| download | git-03b86647722f11ccc321cd7279aa49b811d17cc2.tar.gz | |
read-cache: new API write_locked_index instead of write_index/write_cache
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 'builtin/reset.c')
| -rw-r--r-- | builtin/reset.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index f4e087596b..0c56d28e16 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -351,7 +351,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) if (reset_type != SOFT) { struct lock_file *lock = xcalloc(1, sizeof(*lock)); - int newfd = hold_locked_index(lock, 1); + hold_locked_index(lock, 1); if (reset_type == MIXED) { int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN; if (read_from_tree(&pathspec, sha1, intent_to_add)) @@ -367,8 +367,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) die(_("Could not reset index file to revision '%s'."), rev); } - if (write_cache(newfd, active_cache, active_nr) || - commit_locked_index(lock)) + if (write_locked_index(&the_index, lock, COMMIT_LOCK)) die(_("Could not write new index file.")); } |