Browse Source

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

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.
maint
Linus Torvalds 20 years ago
parent
commit
c5434dead6
  1. 15
      git-pull-script

15
git-pull-script

@ -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"

Loading…
Cancel
Save