projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-svn: add --shared and --template= options to pass to init-db
[git.git]
/
git-pull.sh
diff --git
a/git-pull.sh
b/git-pull.sh
index
3a13984
..
4611ae6
100755
(executable)
--- a/
git-pull.sh
+++ b/
git-pull.sh
@@
-4,19
+4,10
@@
#
# 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.
+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
. git-sh-setup
-usage () {
- echo >&2 "usage: $0"' [-n] [--no-commit] [--no-summary] [--help]
- [-s strategy]...
- [<fetch-options>]
- <repo> <head>...
-
-Fetch one or more remote refs and merge it/them into the current HEAD.
-'
- exit 1
-}
-
strategy_args= no_summary= no_commit=
while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
do
strategy_args= no_summary= no_commit=
while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
do
@@
-64,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' \
@@
-79,21
+78,17
@@
case "$merge_head" in
exit 0
;;
?*' '?*)
exit 0
;;
?*' '?*)
- var=`git-
var -l | sed -ne 's/^pull\.octopus=/-s /p'
`
- 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=$var
+ strategy_default_args="-s $var"
fi
;;
*)
fi
;;
*)
- var=`git-var -l | sed -ne 's/^pull\.twohead=/-s /p'`
- if test '' = "$var"
- then
- strategy_default_args='-s recursive'
- else
- strategy_default_args=$var
+ var=`git-repo-config --get pull.twohead`
+ if test -n "$var"
+ then
+ strategy_default_args="-s $var"
fi
;;
esac
fi
;;
esac