diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-25 14:05:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-25 14:05:13 -0700 |
| commit | c5434dead6a52a48c520dfa3d8ed24dc3673ab1a (patch) | |
| tree | 079bd704c190d5787568e5daf0eab569d74c7f72 /git-pull-script | |
| parent | ea88ee46de82bf1e398d0cfef05e3dcdf48b1b88 (diff) | |
| download | git-c5434dead6a52a48c520dfa3d8ed24dc3673ab1a.tar.gz git-c5434dead6a52a48c520dfa3d8ed24dc3673ab1a.tar.xz | |
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.
Diffstat (limited to 'git-pull-script')
| -rwxr-xr-x | git-pull-script | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/git-pull-script b/git-pull-script index 0585df61e..49f42b5ab 100755 --- a/git-pull-script +++ b/git-pull-script @@ -1,14 +1,23 @@ #!/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-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)" \ - "$merge_repo" + "$merge_name" |