diff options
Diffstat (limited to 'git-pull-script')
| -rwxr-xr-x | git-pull-script | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-pull-script b/git-pull-script index 4220e18732..e7e82f49d2 100755 --- a/git-pull-script +++ b/git-pull-script @@ -4,6 +4,7 @@ # just hard-codes it. # merge_repo=$1 +merge_name=${2:-HEAD} rm -f .git/MERGE_HEAD .git/ORIG_HEAD cp .git/HEAD .git/ORIG_HEAD @@ -11,8 +12,8 @@ cp .git/HEAD .git/ORIG_HEAD echo "Getting object database" rsync -avz --ignore-existing $merge_repo/objects/. ${SHA1_FILE_DIRECTORY:-.git/objects}/. -echo "Getting remote head" -rsync -L $merge_repo/HEAD .git/MERGE_HEAD || exit 1 +echo "Getting remote $merge_name" +rsync -L $merge_repo/$merge_name .git/MERGE_HEAD || exit 1 head=$(cat .git/HEAD) merge_head=$(cat .git/MERGE_HEAD) @@ -54,3 +55,4 @@ result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $me echo "Committed merge $result_commit" echo $result_commit > .git/HEAD git-checkout-cache -f -a && git-update-cache --refresh +git-diff-tree -p ORIG_HEAD HEAD | diffstat -p1 |