update-index -g

I often find myself typing this but the common abbreviation "g" for
"again" has not been supported so far for some unknown reason.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 3ae6e74573d1b5f651f8dabc6c9569b05e049b10..41bb7e12e3d89e4876a60ea7733cffcaf09cd6ed 100644 (file)
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -15,7 +15,7 @@ SYNOPSIS
             [--cacheinfo <mode> <object> <file>]\*
             [--chmod=(+|-)x]
             [--assume-unchanged | --no-assume-unchanged]
             [--cacheinfo <mode> <object> <file>]\*
             [--chmod=(+|-)x]
             [--assume-unchanged | --no-assume-unchanged]

-            [--really-refresh] [--unresolve] [--again]
+            [--really-refresh] [--unresolve] [--again | -g]

             [--info-only] [--index-info]
             [-z] [--stdin]
             [--verbose]
             [--info-only] [--index-info]
             [-z] [--stdin]
             [--verbose]


@@ -80,7 +80,7 @@ OPTIONS
        filesystem that has very slow lstat(2) system call
        (e.g. cifs).
 
        filesystem that has very slow lstat(2) system call
        (e.g. cifs).
 

---again::
+--again, -g::

        Runs `git-update-index` itself on the paths whose index
        entries are different from those from the `HEAD` commit.
 
        Runs `git-update-index` itself on the paths whose index
        entries are different from those from the `HEAD` commit.
 

diff --git a/builtin-update-index.c b/builtin-update-index.c
index 5dd91af180df0f832ecc747050ad5306efe9c8b6..75c0abb96c237ad5d9dce0263990b71d5805898e 100644 (file)
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -306,7 +306,7 @@ static void read_index_info(int line_termination)
 }
 
 static const char update_index_usage[] =
 }
 
 static const char update_index_usage[] =

-"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again] [--ignore-missing] [-z] [--verbose] [--] <file>...";
+"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--again | -g] [--ignore-missing] [-z] [--verbose] [--] <file>...";

 
 static unsigned char head_sha1[20];
 static unsigned char merge_head_sha1[20];
 
 static unsigned char head_sha1[20];
 static unsigned char merge_head_sha1[20];


@@ -595,7 +595,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
                                        active_cache_changed = 0;
                                goto finish;
                        }
                                        active_cache_changed = 0;
                                goto finish;
                        }

-                       if (!strcmp(path, "--again")) {
+                       if (!strcmp(path, "--again") || !strcmp(path, "-g")) {

                                has_errors = do_reupdate(argc - i, argv + i,
                                                         prefix, prefix_length);
                                if (has_errors)
                                has_errors = do_reupdate(argc - i, argv + i,
                                                         prefix, prefix_length);
                                if (has_errors)