projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix up progress report for off-by-one error
[git.git]
/
git-pull-script
diff --git
a/git-pull-script
b/git-pull-script
index
dbef56c
..
8e309fc
100755
(executable)
--- a/
git-pull-script
+++ b/
git-pull-script
@@
-1,21
+1,25
@@
#!/bin/sh
#
#!/bin/sh
#
+. git-sh-setup-script || die "Not a git archive"
+
merge_repo=$1
merge_name=$(echo "$1" | sed 's:\.git/*$::')
merge_head=HEAD
merge_repo=$1
merge_name=$(echo "$1" | sed 's:\.git/*$::')
merge_head=HEAD
+type=head
+if [ "$2" = "tag" ]; then
+ type=tag
+ shift
+fi
if [ "$2" ]
then
if [ "$2" ]
then
- merge_name="
'$2' branch
of $merge_name"
- merge_head="refs/
head
s/$2"
+ merge_name="
$type '$2'
of $merge_name"
+ merge_head="refs/
${type}
s/$2"
fi
fi
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
-
git-fetch-script "$merge_repo" "$merge_head" || exit 1
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
git-fetch-script "$merge_repo" "$merge_head" || exit 1
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
- "$(cat "$GIT_DIR"/
MERGE
_HEAD)" \
- "$merge_name"
+ "$(cat "$GIT_DIR"/
FETCH
_HEAD)" \
+ "
Merge
$merge_name"