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.
 builtin/reset.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/builtin/reset.c b/builtin/reset.c
index 8e5d097..54e3c5b 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -337,13 +337,11 @@ int cmd_reset(int argc, const char **argv, const char 
                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'."), 
+               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,

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to