diff options
| -rwxr-xr-x | git-pull-script | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-pull-script b/git-pull-script index b873203..4311416 100755 --- a/git-pull-script +++ b/git-pull-script @@ -5,11 +5,13 @@ # merge_repo=$1 +rm -f .git/MERGE_HEAD + echo "Getting object database" rsync -avz --ignore-existing $merge_repo/objects/. .git/objects/. echo "Getting remote head" -rsync -avz $merge_repo/HEAD .git/MERGE_HEAD +rsync -L $merge_repo/HEAD .git/MERGE_HEAD || exit 1 head=$(cat .git/HEAD) merge_head=$(cat .git/MERGE_HEAD) |