diff options
| author | Martin von Zweigbergk <martinvonz@gmail.com> | 2013-01-14 21:47:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-15 09:38:07 -0800 |
| commit | 1ca38f85860b33ddc79b1494baf29aecde8616cd (patch) | |
| tree | e006fb78cad200db0da68a3bebc4b4c6445a6788 /builtin/reset.c | |
| parent | b7099a06e8ffe61a06d3e32632e832e59f23bd4d (diff) | |
| download | git-1ca38f85860b33ddc79b1494baf29aecde8616cd.tar.gz | |
reset: avoid redundant error message
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>
Diffstat (limited to 'builtin/reset.c')
| -rw-r--r-- | builtin/reset.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index 7c440add07..97fa9f7859 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -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, |