Merge branch 'maint'

* maint:
Documentation: Remove an odd "instead"
fix portability problem with IS_RUN_COMMAND_ERR
mailmap: resurrect lower-casing of email addresses

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 95f08b911464b348525e4c65cca32946c583e762..4072f40d7ae5417c51d1cddcf587b674aa1dc0e5 100644 (file)
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -117,7 +117,7 @@ then the cloned repository will become corrupt.
 --origin <name>::
 -o <name>::
        Instead of using the remote name 'origin' to keep track
-       of the upstream repository, use <name> instead.
+       of the upstream repository, use <name>.
 
 --upload-pack <upload-pack>::
 -u <upload-pack>::

diff --git a/mailmap.c b/mailmap.c
index 654c6295cb10eaf5e0b8af1d4e185f8d1ff7663b..bb1f2fb711a588d2af0d61decbd4b3eb2f2aebbe 100644 (file)
--- a/mailmap.c
+++ b/mailmap.c
@@ -50,6 +50,15 @@ static void add_mapping(struct string_list *map,
 {
        struct mailmap_entry *me;
        int index;
+       char *p;
+
+       if (old_email)
+               for (p = old_email; *p; p++)
+                       *p = tolower(*p);
+       if (new_email)
+               for (p = new_email; *p; p++)
+                       *p = tolower(*p);
+
        if (old_email == NULL) {
                old_email = new_email;
                new_email = NULL;

diff --git a/run-command.h b/run-command.h
index 15e870a65eb037cd49d1e01251711915da06d260..e3455028435eab958d5f86a3e86249f1704b9c1b 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -10,7 +10,7 @@ enum {
        ERR_RUN_COMMAND_WAITPID_SIGNAL,
        ERR_RUN_COMMAND_WAITPID_NOEXIT,
 };
-#define IS_RUN_COMMAND_ERR(x) ((x) <= -ERR_RUN_COMMAND_FORK)
+#define IS_RUN_COMMAND_ERR(x) (-(x) >= ERR_RUN_COMMAND_FORK)
 
 struct child_process {
        const char **argv;