git-send-pack: Fix duplicate refname match

diff --git a/git-repack-script b/git-repack-script
old mode 100644 (file)
new mode 100755 (executable)
index 92281c2..15b7fd6
--- a/git-repack-script
+++ b/git-repack-script
@@ -1,6 +1,6 @@
 #!/bin/sh
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
+. git-sh-setup-script || die "Not a git archive"
+       
 rm -f .tmp-pack-*
 packname=$(git-rev-list --unpacked --objects $(git-rev-parse --all) |
        git-pack-objects --non-empty --incremental .tmp-pack) ||
@@ -9,5 +9,6 @@ if [ -z "$packname" ]; then
        echo Nothing new to pack
        exit 0
 fi
-mv .tmp-pack-$packname.pack "$GIT_OBJECT_DIRECTORY/pack/pack-$packname.pack"
+mkdir -p "$GIT_OBJECT_DIRECTORY/pack" &&
+mv .tmp-pack-$packname.pack "$GIT_OBJECT_DIRECTORY/pack/pack-$packname.pack" &&
 mv .tmp-pack-$packname.idx  "$GIT_OBJECT_DIRECTORY/pack/pack-$packname.idx"