kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

builtin-reset: avoid forking "update-index --refresh" 

Instead of forking update-index, call refresh_cache() directly.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2007-11-03 15:21:21 +00:00 committed by Junio C Hamano
parent cdf4a751fa
commit 620a6cd42e
2 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
builtin-reset.c
View File

@ -95,26 +95,34 @@ static void print_new_head_line(struct commit *commit)
printf("\n");
}

static int update_index_refresh(void)
static int update_index_refresh(int fd, struct lock_file *index_lock)
{
const char *argv_update_index[] = {"update-index", "--refresh", NULL};
return run_command_v_opt(argv_update_index, RUN_GIT_CMD);
}
int result;

struct update_cb_data {
int index_fd;
struct lock_file *lock;
int exit_code;
};
if (!index_lock) {
index_lock = xcalloc(1, sizeof(struct lock_file));
fd = hold_locked_index(index_lock, 1);
}

if (read_cache() < 0)
return error("Could not read index");
result = refresh_cache(0) ? 1 : 0;
if (write_cache(fd, active_cache, active_nr) ||
close(fd) ||
commit_locked_index(index_lock))
return error ("Could not refresh index");
return result;
}

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;
int *discard_flag = data;

/* do_diff_cache() mangled the index */
discard_cache();
*discard_flag = 1;
read_cache();

for (i = 0; i < q->nr; i++) {
@ -128,34 +136,33 @@ 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, index_was_discarded = 0;
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;
opt.format_callback_data = &index_was_discarded;

cb.lock = xcalloc(1, sizeof(struct lock_file));
cb.index_fd = hold_locked_index(cb.lock, 1);
cb.exit_code = 0;
index_fd = hold_locked_index(lock, 1);
index_was_discarded = 0;
read_cache();
if (do_diff_cache(tree_sha1, &opt))
return 1;
diffcore_std(&opt);
diff_flush(&opt);

return cb.exit_code;
if (!index_was_discarded)
/* The index is still clobbered from do_diff_cache() */
discard_cache();
return update_index_refresh(index_fd, lock);
}

static void prepend_reflog_action(const char *action, char *buf, size_t size)
@ -225,9 +232,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
else if (reset_type != NONE)
die("Cannot do %s reset with paths.",
reset_type_names[reset_type]);
if (read_from_tree(prefix, argv + i, sha1))
return 1;
return update_index_refresh() ? 1 : 0;
return read_from_tree(prefix, argv + i, sha1);
}
if (reset_type == NONE)
reset_type = MIXED; /* by default */
@ -264,7 +269,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
case SOFT: /* Nothing else to do. */
break;
case MIXED: /* Report what has not been updated. */
update_index_refresh();
update_index_refresh(0, NULL);
break;
}


10
t/t7102-reset.sh
View File

@ -418,4 +418,14 @@ test_expect_success 'resetting an unmodified path is a no-op' '
git diff-index --cached --exit-code HEAD
'

cat > expect << EOF
file2: needs update
EOF

test_expect_success '--mixed refreshes the index' '
echo 123 >> file2 &&
git reset --mixed HEAD > output &&
git diff --exit-code expect output
'

test_done