projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http-push: don't assume char is signed
[git.git]
/
git-pull.sh
diff --git
a/git-pull.sh
b/git-pull.sh
index
6caf1aa
..
29c14e1
100755
(executable)
--- a/
git-pull.sh
+++ b/
git-pull.sh
@@
-70,20
+70,16
@@
case "$merge_head" in
exit 0
;;
?*' '?*)
exit 0
;;
?*' '?*)
- var=`git
repo-config --get pull.octopus`
- if test
'' =
"$var"
+ var=`git
-
repo-config --get pull.octopus`
+ if test
-n
"$var"
then
then
- strategy_default_args='-s octopus'
- else
strategy_default_args="-s $var"
fi
;;
*)
strategy_default_args="-s $var"
fi
;;
*)
- var=`git repo-config --get pull.twohead`
- if test '' = "$var"
- then
- strategy_default_args='-s recursive'
- else
+ var=`git-repo-config --get pull.twohead`
+ if test -n "$var"
+ then
strategy_default_args="-s $var"
fi
;;
strategy_default_args="-s $var"
fi
;;