projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A Perforce importer for git.
[git.git]
/
git-pull.sh
diff --git
a/git-pull.sh
b/git-pull.sh
index
0991d5f
..
4611ae6
100755
(executable)
--- a/
git-pull.sh
+++ b/
git-pull.sh
@@
-55,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' \
@@
-70,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