From be767c91724275c4534965c0d25c452b76057602 Mon Sep 17 00:00:00 2001 From: sean Date: Sat, 11 Mar 2006 02:39:28 -0500 Subject: [PATCH 1/4] annotate.perl triggers rpm bug RPM, at least on Fedora boxes, automatically creates a dependency for any perl "use" lines, and one of the help text lines unfortunately begins like this: -S, --rev-file revs-file use revs from revs-file instead of calling git-rev-list RPM gets confused and creates a false dependecy for the nonexistent perl package "revs". Obviously this creates a problem when someone goes to install the git-core rpm. Since other help sentences all start with capital letter, make this one match them by upcasing "Use". As a side effect, RPM stops getting confused. Signed-off-by: Junio C Hamano --- git-annotate.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-annotate.perl b/git-annotate.perl index feea0a2d81..9df72a1662 100755 --- a/git-annotate.perl +++ b/git-annotate.perl @@ -20,7 +20,7 @@ sub usage() { -r, --rename Follow renames (Defaults on). -S, --rev-file revs-file - use revs from revs-file instead of calling git-rev-list + Use revs from revs-file instead of calling git-rev-list -h, --help This message. '; From 8e7f9035b8271469747e3745aa7e095e12f74e5e Mon Sep 17 00:00:00 2001 From: Marco Roeland Date: Sat, 11 Mar 2006 09:55:50 +0100 Subject: [PATCH 2/4] imap-send: cleanup execl() call to use NULL sentinel instead of 0 Some versions of gcc check that calls to the exec() family have the proper sentinel for variadic calls. This should be (char *) NULL according to the man page. Although for all other purposes the 0 is equivalent, gcc nevertheless does emit a warning for 0 and not for NULL. This also makes the usage consistent throughout git. The whitespace in function calls throughout imap-send.c has its own style, so I left it that way. Signed-off-by: Junio C Hamano --- imap-send.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imap-send.c b/imap-send.c index fddaac00c0..203284d8f0 100644 --- a/imap-send.c +++ b/imap-send.c @@ -945,7 +945,7 @@ imap_open_store( imap_server_conf_t *srvc ) _exit( 127 ); close( a[0] ); close( a[1] ); - execl( "/bin/sh", "sh", "-c", srvc->tunnel, 0 ); + execl( "/bin/sh", "sh", "-c", srvc->tunnel, NULL ); _exit( 127 ); } From 42efbf6d8a5b4902c55a2f6e96034625c056ba1f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 11 Mar 2006 17:44:10 -0800 Subject: [PATCH 3/4] git-diff: -p disables rename detection. --- git-diff.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-diff.sh b/git-diff.sh index dc4d1b3cfd..dc0dd312bf 100755 --- a/git-diff.sh +++ b/git-diff.sh @@ -38,9 +38,9 @@ case " $flags " in flags="$flags'$cc_or_p' " ;; esac -# If we do not have -B nor -C, default to -M. +# If we do not have -B, -C, -r, nor -p, default to -M. case " $flags " in -*" '-"[BCM]* | *" '--find-copies-harder' "*) +*" '-"[BCMrp]* | *" '--find-copies-harder' "*) ;; # something like -M50. *) flags="$flags'-M' " ;; From 2d33501689989616a2dc003ca80fafa60b1ed5da Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 12 Mar 2006 11:55:53 +0100 Subject: [PATCH 4/4] imap-send: Add missing #include for macosx There is a compile error without that. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- imap-send.c | 1 + 1 file changed, 1 insertion(+) diff --git a/imap-send.c b/imap-send.c index 203284d8f0..1b38b3af67 100644 --- a/imap-send.c +++ b/imap-send.c @@ -28,6 +28,7 @@ #include #include #include +#include #include typedef struct store_conf {