remote.c: remove useless if-before-free test

[git.git] / builtin-reset.c

diff --git a/builtin-reset.c b/builtin-reset.c
index f34acb1915a7bdbe41113febc90283bc94d0dc1f..c24c21909194014b467c86fd3598796e7db576b3 100644 (file)
--- a/builtin-reset.c
+++ b/builtin-reset.c
@@ -20,8 +20,8 @@
 #include "parse-options.h"
 
 static const char * const git_reset_usage[] = {
-       "git-reset [--mixed | --soft | --hard] [-q] [<commit>]",
-       "git-reset [--mixed] <commit> [--] <paths>...",
+       "git reset [--mixed | --soft | --hard] [-q] [<commit>]",
+       "git reset [--mixed] <commit> [--] <paths>...",
        NULL
 };
 
@@ -85,7 +85,7 @@ static void print_new_head_line(struct commit *commit)
                printf("\n");
 }
 
-static int update_index_refresh(int fd, struct lock_file *index_lock)
+static int update_index_refresh(int fd, struct lock_file *index_lock, int flags)
 {
        int result;
 
@@ -96,7 +96,8 @@ static int update_index_refresh(int fd, struct lock_file *index_lock)
 
        if (read_cache() < 0)
                return error("Could not read index");
-       result = refresh_cache(0) ? 1 : 0;
+
+       result = refresh_cache(flags) ? 1 : 0;
        if (write_cache(fd, active_cache, active_nr) ||
                        commit_locked_index(index_lock))
                return error ("Could not refresh index");
@@ -128,7 +129,7 @@ static void update_index_from_diff(struct diff_queue_struct *q,
 }
 
 static int read_from_tree(const char *prefix, const char **argv,
-               unsigned char *tree_sha1)
+               unsigned char *tree_sha1, int refresh_flags)
 {
        struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
        int index_fd, index_was_discarded = 0;
@@ -152,7 +153,7 @@ static int read_from_tree(const char *prefix, const char **argv,
        if (!index_was_discarded)
                /* The index is still clobbered from do_diff_cache() */
                discard_cache();
-       return update_index_refresh(index_fd, lock);
+       return update_index_refresh(index_fd, lock, refresh_flags);
 }
 
 static void prepend_reflog_action(const char *action, char *buf, size_t size)
@@ -194,8 +195,40 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
        reflog_action = args_to_str(argv);
        setenv("GIT_REFLOG_ACTION", reflog_action, 0);
 
-       if (i < argc && strcmp(argv[i], "--"))
-               rev = argv[i++];
+       /*
+        * Possible arguments are:
+        *
+        * git reset [-opts] <rev> <paths>...
+        * git reset [-opts] <rev> -- <paths>...
+        * git reset [-opts] -- <paths>...
+        * git reset [-opts] <paths>...
+        *
+        * At this point, argv[i] points immediately after [-opts].
+        */
+
+       if (i < argc) {
+               if (!strcmp(argv[i], "--")) {
+                       i++; /* reset to HEAD, possibly with paths */
+               } else if (i + 1 < argc && !strcmp(argv[i+1], "--")) {
+                       rev = argv[i];
+                       i += 2;
+               }
+               /*
+                * Otherwise, argv[i] could be either <rev> or <paths> and
+                * has to be unambigous.
+                */
+               else if (!get_sha1(argv[i], sha1)) {
+                       /*
+                        * Ok, argv[i] looks like a rev; it should not
+                        * be a filename.
+                        */
+                       verify_non_filename(prefix, argv[i]);
+                       rev = argv[i++];
+               } else {
+                       /* Otherwise we treat this as a filename */
+                       verify_filename(prefix, argv[i]);
+               }
+       }
 
        if (get_sha1(rev, sha1))
                die("Failed to resolve '%s' as a valid ref.", rev);
@@ -205,9 +238,6 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
                die("Could not parse object '%s'.", rev);
        hashcpy(sha1, commit->object.sha1);
 
-       if (i < argc && !strcmp(argv[i], "--"))
-               i++;
-
        /* git reset tree [--] paths... can be used to
         * load chosen paths from the tree into the index without
         * affecting the working tree nor HEAD. */
@@ -217,7 +247,8 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
                else if (reset_type != NONE)
                        die("Cannot do %s reset with paths.",
                                        reset_type_names[reset_type]);
-               return read_from_tree(prefix, argv + i, sha1);
+               return read_from_tree(prefix, argv + i, sha1,
+                               quiet ? REFRESH_QUIET : REFRESH_SAY_CHANGED);
        }
        if (reset_type == NONE)
                reset_type = MIXED; /* by default */
@@ -257,7 +288,8 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
        case SOFT: /* Nothing else to do. */
                break;
        case MIXED: /* Report what has not been updated. */
-               update_index_refresh(0, NULL);
+               update_index_refresh(0, NULL,
+                               quiet ? REFRESH_QUIET : REFRESH_SAY_CHANGED);
                break;
        }