diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-03-12 03:29:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-12 03:29:11 -0800 |
| commit | 28f7533f706d29b21fef199b9ad154df069fc624 (patch) | |
| tree | f610beb391ebe1e31827156e65612d96034714e6 | |
| parent | Merge branch 'jc/diff' into next (diff) | |
| parent | imap-send: Add missing #include for macosx (diff) | |
| download | tgif-28f7533f706d29b21fef199b9ad154df069fc624.tar.xz | |
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
| -rwxr-xr-x | git-annotate.perl | 2 | ||||
| -rwxr-xr-x | git-diff.sh | 4 | ||||
| -rw-r--r-- | imap-send.c | 3 |
3 files changed, 5 insertions, 4 deletions
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. '; 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' " ;; diff --git a/imap-send.c b/imap-send.c index fddaac00c0..1b38b3af67 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 ); } |