entry.c: update cache_changed if refresh_cache is set in checkout_entry()

pclouds · gitster · commit d4a2024aef90 · 2014-06-13T11:49:39.000-07:00
Other fill_stat_cache_info() is on new entries, which should set
CE_ENTRY_ADDED in cache_changed, so we're safe.

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/apply.c b/builtin/apply.c
@@ -3084,13 +3084,15 @@ static void prepare_fn_table(struct patch *patch)
 	}
 }
 
-static int checkout_target(struct cache_entry *ce, struct stat *st)
+static int checkout_target(struct index_state *istate,
+			   struct cache_entry *ce, struct stat *st)
 {
 	struct checkout costate;
 
 	memset(&costate, 0, sizeof(costate));
 	costate.base_dir = "";
 	costate.refresh_cache = 1;
+	costate.istate = istate;
 	if (checkout_entry(ce, &costate, NULL) || lstat(ce->name, st))
 		return error(_("cannot checkout %s"), ce->name);
 	return 0;
@@ -3257,7 +3259,7 @@ static int load_current(struct image *image, struct patch *patch)
 	if (lstat(name, &st)) {
 		if (errno != ENOENT)
 			return error(_("%s: %s"), name, strerror(errno));
-		if (checkout_target(ce, &st))
+		if (checkout_target(&the_index, ce, &st))
 			return -1;
 	}
 	if (verify_index_match(ce, &st))
@@ -3411,7 +3413,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
 		}
 		*ce = active_cache[pos];
 		if (stat_ret < 0) {
-			if (checkout_target(*ce, st))
+			if (checkout_target(&the_index, *ce, st))
 				return -1;
 		}
 		if (!cached && verify_index_match(*ce, st))
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
@@ -135,6 +135,7 @@ static int option_parse_u(const struct option *opt,
 	int *newfd = opt->value;
 
 	state.refresh_cache = 1;
+	state.istate = &the_index;
 	if (*newfd < 0)
 		*newfd = hold_locked_index(&lock_file, 1);
 	return 0;
diff --git a/builtin/checkout.c b/builtin/checkout.c
@@ -336,6 +336,7 @@ static int checkout_paths(const struct checkout_opts *opts,
 	memset(&state, 0, sizeof(state));
 	state.force = 1;
 	state.refresh_cache = 1;
+	state.istate = &the_index;
 	for (pos = 0; pos < active_nr; pos++) {
 		struct cache_entry *ce = active_cache[pos];
 		if (ce->ce_flags & CE_MATCHED) {
diff --git a/cache.h b/cache.h
@@ -1063,6 +1063,7 @@ extern int split_ident_line(struct ident_split *, const char *, int);
 extern int ident_cmp(const struct ident_split *, const struct ident_split *);
 
 struct checkout {
+	struct index_state *istate;
 	const char *base_dir;
 	int base_dir_len;
 	unsigned force:1,
diff --git a/entry.c b/entry.c
@@ -210,9 +210,11 @@ static int write_entry(struct cache_entry *ce,
 
 finish:
 	if (state->refresh_cache) {
+		assert(state->istate);
 		if (!fstat_done)
 			lstat(ce->name, &st);
 		fill_stat_cache_info(ce, &st);
+		state->istate->cache_changed |= CE_ENTRY_CHANGED;
 	}
 	return 0;
 }
diff --git a/unpack-trees.c b/unpack-trees.c
@@ -1029,6 +1029,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 	state.force = 1;
 	state.quiet = 1;
 	state.refresh_cache = 1;
+	state.istate = &o->result;
 
 	memset(&el, 0, sizeof(el));
 	if (!core_apply_sparse_checkout || !o->update)

Original file line number	Diff line number	Diff line change
`@@ -3084,13 +3084,15 @@ static void prepare_fn_table(struct patch *patch)`
`3084`	`3084`	`}`
`3085`	`3085`	`}`
`3086`	`3086`
`3087`		`-static int checkout_target(struct cache_entry ce, struct stat st)`
	`3087`	`+static int checkout_target(struct index_state *istate,`
	`3088`	`+ struct cache_entry ce, struct stat st)`
`3088`	`3089`	`{`
`3089`	`3090`	`struct checkout costate;`
`3090`	`3091`
`3091`	`3092`	`memset(&costate, 0, sizeof(costate));`
`3092`	`3093`	`costate.base_dir = "";`
`3093`	`3094`	`costate.refresh_cache = 1;`
	`3095`	`+ costate.istate = istate;`
`3094`	`3096`	`if (checkout_entry(ce, &costate, NULL) \|\| lstat(ce->name, st))`
`3095`	`3097`	`return error(_("cannot checkout %s"), ce->name);`
`3096`	`3098`	`return 0;`
`@@ -3257,7 +3259,7 @@ static int load_current(struct image image, struct patch patch)`
`3257`	`3259`	`if (lstat(name, &st)) {`
`3258`	`3260`	`if (errno != ENOENT)`
`3259`	`3261`	`return error(_("%s: %s"), name, strerror(errno));`
`3260`		`- if (checkout_target(ce, &st))`
	`3262`	`+ if (checkout_target(&the_index, ce, &st))`
`3261`	`3263`	`return -1;`
`3262`	`3264`	`}`
`3263`	`3265`	`if (verify_index_match(ce, &st))`
`@@ -3411,7 +3413,7 @@ static int check_preimage(struct patch patch, struct cache_entry *ce, struct s`
`3411`	`3413`	`}`
`3412`	`3414`	`*ce = active_cache[pos];`
`3413`	`3415`	`if (stat_ret < 0) {`
`3414`		`- if (checkout_target(*ce, st))`
	`3416`	`+ if (checkout_target(&the_index, *ce, st))`
`3415`	`3417`	`return -1;`
`3416`	`3418`	`}`
`3417`	`3419`	`if (!cached && verify_index_match(*ce, st))`
Original file line number	Diff line number	Diff line change
`@@ -210,9 +210,11 @@ static int write_entry(struct cache_entry *ce,`
`210`	`210`
`211`	`211`	`finish:`
`212`	`212`	`if (state->refresh_cache) {`
	`213`	`+ assert(state->istate);`
`213`	`214`	`if (!fstat_done)`
`214`	`215`	`lstat(ce->name, &st);`
`215`	`216`	`fill_stat_cache_info(ce, &st);`
	`217`	`+ state->istate->cache_changed \|= CE_ENTRY_CHANGED;`
`216`	`218`	`}`
`217`	`219`	`return 0;`
`218`	`220`	`}`