215a7ad1ef
As promised, this is the "big tool rename" patch. The primary differences
since 0.99.6 are:
(1) git-*-script are no more. The commands installed do not
have any such suffix so users do not have to remember if
something is implemented as a shell script or not.
(2) Many command names with 'cache' in them are renamed with
'index' if that is what they mean.
There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support is expected to be removed in the near
future.
Signed-off-by: Junio C Hamano <junkio@cox.net>
45 lines
1.2 KiB
Bash
Executable File
45 lines
1.2 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
# Fetch one or more remote refs and merge it/them into the current HEAD.
|
|
|
|
. git-sh-setup || die "Not a git archive"
|
|
|
|
orig_head=$(cat "$GIT_DIR/HEAD") || die "Pulling into a black hole?"
|
|
git-fetch --update-head-ok "$@" || exit 1
|
|
|
|
curr_head=$(cat "$GIT_DIR/HEAD")
|
|
if test "$curr_head" != "$orig_head"
|
|
then
|
|
# The fetch involved updating the current branch.
|
|
|
|
# The working tree and the index file is still based on the
|
|
# $orig_head commit, but we are merging into $curr_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."
|
|
git-read-tree -u -m "$orig_head" "$curr_head" ||
|
|
die "You need to first update your working tree."
|
|
fi
|
|
|
|
merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
|
|
merge_name=$(sed -e 's/^[0-9a-f]* //' "$GIT_DIR"/FETCH_HEAD |
|
|
tr '\012' ' ')
|
|
|
|
case "$merge_head" in
|
|
'')
|
|
echo >&2 "No changes."
|
|
exit 0
|
|
;;
|
|
*' '?*)
|
|
echo >&2 "Pulling more than one heads; making an Octopus."
|
|
exec git-octopus
|
|
;;
|
|
esac
|
|
|
|
git-resolve \
|
|
"$(cat "$GIT_DIR"/HEAD)" \
|
|
$merge_head "Merge $merge_name"
|