Skip to content

Commit

Permalink
git-reset: do not be confused if there is nothing to reset
Browse files Browse the repository at this point in the history
The purpose of the function update_index_from_diff() (which is the
callback function we give do_diff_cache()) is to update those index
entries which differ from the given commit.

Since do_diff_cache() plays games with the in-memory index, this function
discarded the cache and reread it.

Then, back in the function read_from_tree() we wrote the index.

Of course, this broke down when there were no changes and
update_index_from_diff() was not called, and therefore the mangled index
was not discarded.

The solution is to move the index writing into the function
update_index_from_diff().

Noticed by Björn Steinbrink.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Nov 4, 2007
1 parent 19391c3 commit 2e7a978
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 6 deletions.
24 changes: 18 additions & 6 deletions builtin-reset.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,17 @@ static int update_index_refresh(void)
return run_command_v_opt(argv_update_index, RUN_GIT_CMD);
}

struct update_cb_data {
int index_fd;
struct lock_file *lock;
int exit_code;
};

static void update_index_from_diff(struct diff_queue_struct *q,
struct diff_options *opt, void *data)
{
int i;
struct update_cb_data *cb = data;

/* do_diff_cache() mangled the index */
discard_cache();
Expand All @@ -133,29 +140,34 @@ static void update_index_from_diff(struct diff_queue_struct *q,
} else
remove_file_from_cache(one->path);
}

cb->exit_code = write_cache(cb->index_fd, active_cache, active_nr) ||
close(cb->index_fd) ||
commit_locked_index(cb->lock);
}

static int read_from_tree(const char *prefix, const char **argv,
unsigned char *tree_sha1)
{
struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
int index_fd;
struct diff_options opt;
struct update_cb_data cb;

memset(&opt, 0, sizeof(opt));
diff_tree_setup_paths(get_pathspec(prefix, (const char **)argv), &opt);
opt.output_format = DIFF_FORMAT_CALLBACK;
opt.format_callback = update_index_from_diff;
opt.format_callback_data = &cb;

index_fd = hold_locked_index(lock, 1);
cb.lock = xcalloc(1, sizeof(struct lock_file));
cb.index_fd = hold_locked_index(cb.lock, 1);
cb.exit_code = 0;
read_cache();
if (do_diff_cache(tree_sha1, &opt))
return 1;
diffcore_std(&opt);
diff_flush(&opt);
return write_cache(index_fd, active_cache, active_nr) ||
close(index_fd) ||
commit_locked_index(lock);

return cb.exit_code;
}

static void prepend_reflog_action(const char *action, char *buf, size_t size)
Expand Down
7 changes: 7 additions & 0 deletions t/t7102-reset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -402,4 +402,11 @@ test_expect_success 'test resetting the index at give paths' '
'

test_expect_success 'resetting an unmodified path is a no-op' '
git reset --hard &&
git reset -- file1 &&
git diff-files --exit-code &&
git diff-index --cached --exit-code HEAD
'

test_done

0 comments on commit 2e7a978

Please sign in to comment.