undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return error when not checking out an entry due to dirtiness.

Browse Source 
Without -f flag, 'git-checkout-index foo.c' issued an error message
when foo.c already existed in the working tree and did not match index.
However it did not return an error from the underlying checkout_entry()
function and resulted in a successful exit(0).

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-10-03 12:44:48 -07:00
parent 64a2228b02
commit 4b12dae69a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
checkout-index.c
View File

@ -63,15 +63,20 @@ static int checkout_file(const char *name)
static int checkout_all(void) static int checkout_all(void)
{ {
int i; int i, errs = 0;
for (i = 0; i < active_nr ; i++) { for (i = 0; i < active_nr ; i++) {
struct cache_entry *ce = active_cache[i]; struct cache_entry *ce = active_cache[i];
if (ce_stage(ce)) if (ce_stage(ce))
continue; continue;
if (checkout_entry(ce, &state) < 0) if (checkout_entry(ce, &state) < 0)
return -1; errs++;
} }
if (errs)
/* we have already done our error reporting.
* exit with the same code as die().
*/
exit(128);
return 0; return 0;
} }

2
entry.c
View File

@ -132,7 +132,7 @@ int checkout_entry(struct cache_entry *ce, struct checkout *state)
if (!state->force) { if (!state->force) {
if (!state->quiet) if (!state->quiet)
fprintf(stderr, "git-checkout-index: %s already exists\n", path); fprintf(stderr, "git-checkout-index: %s already exists\n", path);
return 0; return -1;
} }
/* /*