[PATCH] git-branch: avoid getting confused by empty or nonexisting branches.

diff --git a/receive-pack.c b/receive-pack.c
index 53d00a5e7a275957432ffd999d135bd040f89940..f39703f7af9ae809b144b0f074561756717bf04a 100644 (file)
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -7,7 +7,7 @@ static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
 
 static const char *unpacker = "git-unpack-objects";
 
-static int show_ref(const char *path, unsigned char *sha1)
+static int show_ref(const char *path, const unsigned char *sha1)
 {
        packet_write(1, "%s %s\n", sha1_to_hex(sha1), path);
        return 0;
@@ -25,7 +25,7 @@ struct command {
        char ref_name[0];
 };
 
-struct command *commands = NULL;
+static struct command *commands = NULL;
 
 static int is_all_zeroes(const char *hex)
 {
@@ -70,7 +70,7 @@ static void update(const char *name, unsigned char *old_sha1, unsigned char *new
        if (!has_sha1_file(new_sha1))
                die("unpack should have generated %s, but I can't find it!", new_hex);
 
-       newfd = open(lock_name, O_CREAT | O_EXCL | O_WRONLY, 0644);
+       newfd = open(lock_name, O_CREAT | O_EXCL | O_WRONLY, 0666);
        if (newfd < 0)
                die("unable to create %s (%s)", lock_name, strerror(errno));
 
@@ -197,9 +197,7 @@ int main(int argc, char **argv)
 
        /* chdir to the directory. If that fails, try appending ".git" */
        if (chdir(dir) < 0) {
-               static char path[PATH_MAX];
-               snprintf(path, sizeof(path), "%s.git", dir);
-               if (chdir(path) < 0)
+               if (chdir(mkpath("%s.git", dir)) < 0)
                        die("unable to cd to %s", dir);
        }