diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-06-13 12:19:23 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-13 18:49:10 (GMT) |
| commit | 03b86647722f11ccc321cd7279aa49b811d17cc2 (patch) | |
| tree | dc5b717a01867692ce344d1548ad5a82ac1c1881 /sequencer.c | |
| parent | 33c297aacc0ce0f945198fbcdf48fbf2fd27d01b (diff) | |
| download | git-03b86647722f11ccc321cd7279aa49b811d17cc2.zip git-03b86647722f11ccc321cd7279aa49b811d17cc2.tar.gz git-03b86647722f11ccc321cd7279aa49b811d17cc2.tar.bz2 | |
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 'sequencer.c')
| -rw-r--r-- | sequencer.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sequencer.c b/sequencer.c index 7b886a6..5ebc461 100644 --- a/sequencer.c +++ b/sequencer.c @@ -294,11 +294,11 @@ static int do_recursive_merge(struct commit *base, struct commit *next, { struct merge_options o; struct tree *result, *next_tree, *base_tree, *head_tree; - int clean, index_fd; + int clean; const char **xopt; static struct lock_file index_lock; - index_fd = hold_locked_index(&index_lock, 1); + hold_locked_index(&index_lock, 1); read_cache(); @@ -319,8 +319,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next, next_tree, base_tree, &result); if (active_cache_changed && - (write_cache(index_fd, active_cache, active_nr) || - commit_locked_index(&index_lock))) + write_locked_index(&the_index, &index_lock, COMMIT_LOCK)) /* TRANSLATORS: %s will be "revert" or "cherry-pick" */ die(_("%s: Unable to write new index file"), action_name(opts)); rollback_lock_file(&index_lock); @@ -680,8 +679,7 @@ static void read_and_refresh_cache(struct replay_opts *opts) die(_("git %s: failed to read the index"), action_name(opts)); refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL); if (the_index.cache_changed && index_fd >= 0) { - if (write_index(&the_index, index_fd) || - commit_locked_index(&index_lock)) + if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK)) die(_("git %s: failed to refresh the index"), action_name(opts)); } rollback_lock_file(&index_lock); |