"git checkout -- paths..." should error out when paths cannot be written
When "git checkout -- paths..." cannot update work tree for whatever reason, checkout_entry() correctly issued an error message for the path to the end user, but the command ignored the error, causing the entire command to succeed. This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 28, 2008 at 14:48 UTC
d2b3691b61d516a0ad2bf700a2a5d9113ceff0b1
1 file changed
+5
-2
builtin-checkout.c
+5
-2
@@ -84,6 +84,7 @@ static int checkout_paths(struct tree *source_tree, const char **pathspec)
84
unsigned char rev[20];
85
int flag;
86
struct commit *head;
87
+ int errs = 0;
88
89
int newfd;
90
struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
@@ -106,13 +107,14 @@ static int checkout_paths(struct tree *source_tree, const char **pathspec)
107
if (report_path_error(ps_matched, pathspec, 0))
108
return 1;
109
110
+ /* Now we are committed to check them out */
111
memset(&state, 0, sizeof(state));
112
state.force = 1;
113
state.refresh_cache = 1;
114
for (pos = 0; pos < active_nr; pos++) {
115
struct cache_entry *ce = active_cache[pos];
116
if (pathspec_match(pathspec, NULL, ce->name, 0)) {
115
- checkout_entry(ce, &state, NULL);
117
+ errs |= checkout_entry(ce, &state, NULL);
118
}
119
}
120
@@ -123,7 +125,8 @@ static int checkout_paths(struct tree *source_tree, const char **pathspec)
125
resolve_ref("HEAD", rev, 0, &flag);
126
head = lookup_commit_reference_gently(rev, 1);
127
126
- return post_checkout_hook(head, head, 0);
128
+ errs |= post_checkout_hook(head, head, 0);
129
+ return errs;
130
}
131
132
static void show_local_changes(struct object *head)