From: Junio C Hamano <junkio@cox.net>
Date: Sun, 12 Mar 2006 11:29:11 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~35
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=28f7533f706d29b21fef199b9ad154df069fc624;hp=514236aa5ab380cf7f585cb9195abdbb8080aac5;p=git.git

Merge branch 'master' into next

* master:
  imap-send: Add missing #include for macosx
  git-diff: -p disables rename detection.
  imap-send: cleanup execl() call to use NULL sentinel instead of 0
  annotate.perl triggers rpm bug
---

diff --git a/git-annotate.perl b/git-annotate.perl
index feea0a2d..9df72a16 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.
 ';
diff --git a/git-diff.sh b/git-diff.sh
index dc4d1b3c..dc0dd312 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' " ;;
diff --git a/imap-send.c b/imap-send.c
index fddaac00..1b38b3af 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -28,6 +28,7 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
+#include <sys/socket.h>
 #include <netdb.h>
 
 typedef struct store_conf {
@@ -945,7 +946,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 );
 		}