mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-05 16:52:59 +01:00
Code Activity

Merge branch 'master' into next

Browse source 
* master:
  fix imap-send for OSX
  Let merge set the default strategy.
This commit is contained in:
Junio C Hamano 2006-03-15 16:15:23 -08:00
commit f2cb4004fd
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
git-pull.sh
View file

@ -71,19 +71,15 @@ case "$merge_head" in
;; ;;
?*' '?*) ?*' '?*)
var=`git repo-config --get pull.octopus` var=`git repo-config --get pull.octopus`
if test '' = "$var" if test -n "$var"
then then
strategy_default_args='-s octopus'
else
strategy_default_args="-s $var" strategy_default_args="-s $var"
fi fi
;; ;;
*) *)
var=`git repo-config --get pull.twohead` var=`git repo-config --get pull.twohead`
if test '' = "$var" if test -n "$var"
then then
strategy_default_args='-s recursive'
else
strategy_default_args="-s $var" strategy_default_args="-s $var"
fi fi
;; ;;

4
imap-send.c
View file

@ -372,7 +372,7 @@ free_generic_messages( message_t *msgs )
} }
static int static int
vasprintf( char **strp, const char *fmt, va_list ap ) git_vasprintf( char **strp, const char *fmt, va_list ap )
{ {
int len; int len;
char tmp[1024]; char tmp[1024];
@ -402,7 +402,7 @@ nfsnprintf( char *buf, int blen, const char *fmt, ... )
static int static int
nfvasprintf( char **str, const char *fmt, va_list va ) 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) if (ret < 0)
die( "Fatal: Out of memory\n"); die( "Fatal: Out of memory\n");
return ret; return ret;