Synonyms: -i == --regexp-ignore-case, -E == --extended-regexp

These options to log family were too long to type.  Give them
shorter synonyms.

Fix the parsing of the long options while at it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 08e7573b9e1beffceef9d44b047cba3466653b22..0430139093ddfc3bf9742eab279acc7afaa8951b 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -27,7 +27,8 @@ SYNOPSIS
             [ \--cherry-pick ]
             [ \--encoding[=<encoding>] ]
             [ \--(author|committer|grep)=<pattern> ]
             [ \--cherry-pick ]
             [ \--encoding[=<encoding>] ]
             [ \--(author|committer|grep)=<pattern> ]

-            [ \--regexp-ignore-case ] [ \--extended-regexp ]
+            [ \--regexp-ignore-case | \-i ]
+            [ \--extended-regexp | \-E ]

             [ \--date={local|relative|default|iso|rfc|short} ]
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
             [ \--pretty | \--header ]
             [ \--date={local|relative|default|iso|rfc|short} ]
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
             [ \--pretty | \--header ]


@@ -227,11 +228,11 @@ limiting may be applied.
        Limit the commits output to ones with log message that
        matches the specified pattern (regular expression).
 
        Limit the commits output to ones with log message that
        matches the specified pattern (regular expression).
 

---regexp-ignore-case::
+-i, --regexp-ignore-case::

 
        Match the regexp limiting patterns without regard to letters case.
 
 
        Match the regexp limiting patterns without regard to letters case.
 

---extended-regexp::
+-E, --extended-regexp::

 
        Consider the limiting patterns to be extended regular expressions
        instead of the default basic regular expressions.
 
        Consider the limiting patterns to be extended regular expressions
        instead of the default basic regular expressions.

diff --git a/revision.c b/revision.c
index 7036cf2246e8bd0c169716a12c9b9f2ecffdec8d..00b75bc10b53b0c64b14fc1d9111d5f4e1db3af5 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1165,11 +1165,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                                add_message_grep(revs, arg+7);
                                continue;
                        }
                                add_message_grep(revs, arg+7);
                                continue;
                        }

-                       if (!prefixcmp(arg, "--extended-regexp")) {
+                       if (!strcmp(arg, "--extended-regexp") ||
+                           !strcmp(arg, "-E")) {

                                regflags |= REG_EXTENDED;
                                continue;
                        }
                                regflags |= REG_EXTENDED;
                                continue;
                        }

-                       if (!prefixcmp(arg, "--regexp-ignore-case")) {
+                       if (!strcmp(arg, "--regexp-ignore-case") ||
+                           !strcmp(arg, "-i")) {

                                regflags |= REG_ICASE;
                                continue;
                        }
                                regflags |= REG_ICASE;
                                continue;
                        }