diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-03-15 16:15:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-15 16:15:23 -0800 |
| commit | f2cb4004fd5b3ec4b11ad8ee6a374a55e9292732 (patch) | |
| tree | ec498f9c82262b683ec473aad5144bfc6f332a3c | |
| parent | Merge branch 'lt/diff' into next (diff) | |
| parent | fix imap-send for OSX (diff) | |
| download | tgif-f2cb4004fd5b3ec4b11ad8ee6a374a55e9292732.tar.xz | |
Merge branch 'master' into next
* master:
fix imap-send for OSX
Let merge set the default strategy.
| -rwxr-xr-x | git-pull.sh | 10 | ||||
| -rw-r--r-- | imap-send.c | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/git-pull.sh b/git-pull.sh index 6caf1aad47..17fda26721 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -71,19 +71,15 @@ case "$merge_head" in ;; ?*' '?*) var=`git repo-config --get pull.octopus` - if test '' = "$var" + if test -n "$var" then - strategy_default_args='-s octopus' - else strategy_default_args="-s $var" fi ;; *) var=`git repo-config --get pull.twohead` - if test '' = "$var" - then - strategy_default_args='-s recursive' - else + if test -n "$var" + then strategy_default_args="-s $var" fi ;; diff --git a/imap-send.c b/imap-send.c index 1b38b3af67..e33c78bff2 100644 --- a/imap-send.c +++ b/imap-send.c @@ -372,7 +372,7 @@ free_generic_messages( message_t *msgs ) } static int -vasprintf( char **strp, const char *fmt, va_list ap ) +git_vasprintf( char **strp, const char *fmt, va_list ap ) { int len; char tmp[1024]; @@ -402,7 +402,7 @@ nfsnprintf( char *buf, int blen, const char *fmt, ... ) static int nfvasprintf( char **str, const char *fmt, va_list va ) { - int ret = vasprintf( str, fmt, va ); + int ret = git_vasprintf( str, fmt, va ); if (ret < 0) die( "Fatal: Out of memory\n"); return ret; |