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.

diff --git a/git-pull-script b/git-pull-script
index 0585df61e241b302cf007cd75dd6e9fd3b78596a..49f42b5ab2896356952aee9eb2b771f422011f02 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -1,14 +1,23 @@
 #!/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 from
+
+       $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"

 
 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"