projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
builtin-grep: pass ignore case option to external grep
[git.git]
/
git-pull.sh
diff --git
a/git-pull.sh
b/git-pull.sh
index
e23d4f5
..
4611ae6
100755
(executable)
--- a/
git-pull.sh
+++ b/
git-pull.sh
@@
-4,11
+4,9
@@
#
# Fetch one or more remote refs and merge it/them into the current HEAD.
#
# Fetch one or more remote refs and merge it/them into the current HEAD.
-. git-sh-setup || die "Not a git archive"
-
-usage () {
- die "git pull [-n] [--no-commit] [-s strategy]... <repo> <head>..."
-}
+USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <repo> <head>...'
+LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
+. git-sh-setup
strategy_args= no_summary= no_commit=
while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
strategy_args= no_summary= no_commit=
while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
@@
-33,6
+31,9
@@
do
esac
strategy_args="${strategy_args}-s $strategy "
;;
esac
strategy_args="${strategy_args}-s $strategy "
;;
+ -h|--h|--he|--hel|--help)
+ usage
+ ;;
-*)
# Pass thru anything that is meant for fetch.
break
-*)
# Pass thru anything that is meant for fetch.
break
@@
-54,9
+55,17
@@
then
# First update the working tree to match $curr_head.
echo >&2 "Warning: fetch updated the current branch head."
# First update the working tree to match $curr_head.
echo >&2 "Warning: fetch updated the current branch head."
- echo >&2 "Warning: fast forwarding your working tree."
+ echo >&2 "Warning: fast forwarding your working tree from"
+ echo >&2 "Warning: $orig_head commit."
+ git-update-index --refresh 2>/dev/null
git-read-tree -u -m "$orig_head" "$curr_head" ||
git-read-tree -u -m "$orig_head" "$curr_head" ||
- die "You need to first update your working tree."
+ die 'Cannot fast-forward your working tree.
+After making sure that you saved anything precious from
+$ git diff '$orig_head'
+output, run
+$ git reset --hard
+to recover.'
+
fi
merge_head=$(sed -e '/ not-for-merge /d' \
fi
merge_head=$(sed -e '/ not-for-merge /d' \
@@
-69,10
+78,18
@@
case "$merge_head" in
exit 0
;;
?*' '?*)
exit 0
;;
?*' '?*)
- strategy_default_args='-s octopus'
+ var=`git-repo-config --get pull.octopus`
+ if test -n "$var"
+ then
+ strategy_default_args="-s $var"
+ fi
;;
*)
;;
*)
- strategy_default_args='-s resolve'
+ var=`git-repo-config --get pull.twohead`
+ if test -n "$var"
+ then
+ strategy_default_args="-s $var"
+ fi
;;
esac
;;
esac