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

reset: avoid redundant error message

Browse Source 
If writing or committing the new index file fails, we print "Could not
write new index file." followed by "Could not reset index file to
revision $rev.". The first message seems to imply the second, so print
only the first message.

Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin von Zweigbergk 2013-01-14 21:47:42 -08:00 committed by Junio C Hamano
parent b7099a06e8
commit 1ca38f8586
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/reset.c
View File

@ -338,13 +338,11 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
int err = reset_index(sha1, reset_type, quiet);
if (reset_type == KEEP && !err)
err = reset_index(sha1, MIXED, quiet);
if (!err &&
(write_cache(newfd, active_cache, active_nr) ||
commit_locked_index(lock))) {
err = error(_("Could not write new index file."));
}
if (err)
die(_("Could not reset index file to revision '%s'."), rev);
if (write_cache(newfd, active_cache, active_nr) ||
commit_locked_index(lock))
die(_("Could not write new index file."));
}
/* Any resets update HEAD to the head being switched to,