projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-rev-parse: flush "default" head when encountering something unexpected
[git.git]
/
git-pull-script
diff --git
a/git-pull-script
b/git-pull-script
index
0585df6
..
dbef56c
100755
(executable)
--- a/
git-pull-script
+++ b/
git-pull-script
@@
-1,14
+1,21
@@
#!/bin/sh
#
merge_repo=$1
#!/bin/sh
#
merge_repo=$1
-merge_name=${2:-HEAD}
+
+merge_name=$(echo "$1" | sed 's:\.git/*$::')
+merge_head=HEAD
+if [ "$2" ]
+then
+ merge_name="'$2' branch of $merge_name"
+ merge_head="refs/heads/$2"
+fi
: ${GIT_DIR=.git}
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
: ${GIT_DIR=.git}
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
-git-fetch-script "$merge_repo" "$merge_
name"
+git-fetch-script "$merge_repo" "$merge_
head" || exit 1
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
"$(cat "$GIT_DIR"/MERGE_HEAD)" \
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
"$(cat "$GIT_DIR"/MERGE_HEAD)" \
- "$merge_
repo
"
+ "$merge_
name
"