From bf637803a799451e7feb596422932dd60f0384e1 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 31 Mar 2009 02:18:36 +0200 Subject: [PATCH 1/3] mailmap: resurrect lower-casing of email addresses Commit 0925ce4(Add map_user() and clear_mailmap() to mailmap) broke the lower-casing of email addresses. This mostly did not matter if your .mailmap has only lower-case email addresses; However, we did not require .mailmap to contain lowercase-only email addresses. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- mailmap.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mailmap.c b/mailmap.c index f12bb45a3f..6be91b60df 100644 --- 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; From fd94836923708581ca3f9b5c42a6d600c2f631dc Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 31 Mar 2009 08:29:23 -0400 Subject: [PATCH 2/3] fix portability problem with IS_RUN_COMMAND_ERR Some old versions of gcc don't seem to like us negating an enum constant. Let's work around it by negating the other half of the comparison instead. Reported by Pierre Poissinger on gcc 2.9. Signed-off-by: Junio C Hamano --- run-command.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-command.h b/run-command.h index 15e870a65e..e345502843 100644 --- 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; From 5bd27ebb18f2dd745d1226b59b9f863c63c15fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Wei=C3=9F?= Date: Tue, 31 Mar 2009 18:57:01 +0200 Subject: [PATCH 3/3] Documentation: Remove an odd "instead" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Holger Weiß Signed-off-by: Junio C Hamano --- Documentation/git-clone.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 0e14e732fd..307f2521b4 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -112,7 +112,7 @@ then the cloned repository will become corrupt. --origin :: -o :: Instead of using the remote name 'origin' to keep track - of the upstream repository, use instead. + of the upstream repository, use . --upload-pack :: -u ::