Merge branch 'master' into next

* master:
  fix imap-send for OSX
  Let merge set the default strategy.

diff --git a/git-pull.sh b/git-pull.sh
index 6caf1aa..17fda26 100755 (executable)
--- 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 1b38b3a..e33c78b 100644 (file)
--- 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;