undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* 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
This commit is contained in:
Junio C Hamano 2006-03-12 03:29:11 -08:00
commit 28f7533f70
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-annotate.perl
View File

@ -20,7 +20,7 @@ sub usage() {
-r, --rename -r, --rename
Follow renames (Defaults on). Follow renames (Defaults on).
-S, --rev-file revs-file -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 -h, --help
This message. This message.
'; ';

4
git-diff.sh
View File

@ -38,9 +38,9 @@ case " $flags " in
flags="$flags'$cc_or_p' " ;; flags="$flags'$cc_or_p' " ;;
esac 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 case " $flags " in
*" '-"[BCM]* | *" '--find-copies-harder' "*) *" '-"[BCMrp]* | *" '--find-copies-harder' "*)
;; # something like -M50. ;; # something like -M50.
*) *)
flags="$flags'-M' " ;; flags="$flags'-M' " ;;

3
imap-send.c
View File

@ -28,6 +28,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <sys/socket.h>
#include <netdb.h> #include <netdb.h>
typedef struct store_conf { typedef struct store_conf {
@ -945,7 +946,7 @@ imap_open_store( imap_server_conf_t *srvc )
_exit( 127 ); _exit( 127 );
close( a[0] ); close( a[0] );
close( a[1] ); close( a[1] );
execl( "/bin/sh", "sh", "-c", srvc->tunnel, 0 ); execl( "/bin/sh", "sh", "-c", srvc->tunnel, NULL );
_exit( 127 ); _exit( 127 );
} }