mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 13:57:54 +01:00
Code Activity

git-pull-script: pretty-print the merge head information

Browse source 
This also drops the common ".git" part from the end of the repo
name, and if a non-default head reference is given, makes a nicer
commit message about it.
This commit is contained in:
Linus Torvalds 2005-05-25 14:05:13 -07:00
parent ea88ee46de
commit c5434dead6
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
git-pull-script
View file

@ -1,14 +1,23 @@
#!/bin/sh #!/bin/sh
# #
merge_repo=$1 merge_repo=$1
merge_name=${2:-HEAD}
merge_name=$(echo "$1" | sed 's:\.git/*$::')
merge_head=HEAD
if [ "$2" ]
then
merge_name="'$2' branch from
$merge_name"
merge_head="refs/heads/$2"
fi
: ${GIT_DIR=.git} : ${GIT_DIR=.git}
: ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"} : ${GIT_OBJECT_DIRECTORY="${SHA1_FILE_DIRECTORY-"$GIT_DIR/objects"}"}
git-fetch-script "$merge_repo" "$merge_name" git-fetch-script "$merge_repo" "$merge_head"
git-resolve-script \ git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \ "$(cat "$GIT_DIR"/HEAD)" \
"$(cat "$GIT_DIR"/MERGE_HEAD)" \ "$(cat "$GIT_DIR"/MERGE_HEAD)" \
"$merge_repo" "$merge_name"