init: show "Reinit" message even in an (existing) empty repository

Earlier, git-init tested for a valid HEAD ref, but if the repository
was empty, there was none.  Instead, test for the existence of
the file $GIT_DIR/HEAD.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-init-db.c b/builtin-init-db.c
index 79eaf8d6edf18675897f6eed571289fce450526a..2854868b4e4185d33024b9fe5d00ad631c18bb36 100644 (file)
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@ -167,9 +167,9 @@ static int create_default_files(const char *git_dir, const char *template_path)
 {
        unsigned len = strlen(git_dir);
        static char path[PATH_MAX];
 {
        unsigned len = strlen(git_dir);
        static char path[PATH_MAX];

-       unsigned char sha1[20];

        struct stat st1;
        char repo_version_string[10];
        struct stat st1;
        char repo_version_string[10];

+       char junk[2];

        int reinit;
        int filemode;
 
        int reinit;
        int filemode;
 


@@ -219,7 +219,8 @@ static int create_default_files(const char *git_dir, const char *template_path)
         * branch, if it does not exist yet.
         */
        strcpy(path + len, "HEAD");
         * branch, if it does not exist yet.
         */
        strcpy(path + len, "HEAD");

-       reinit = !read_ref("HEAD", sha1);
+       reinit = (!access(path, R_OK)
+                 || readlink(path, junk, sizeof(junk)-1) != -1);

        if (!reinit) {
                if (create_symref("HEAD", "refs/heads/master", NULL) < 0)
                        exit(1);
        if (!reinit) {
                if (create_symref("HEAD", "refs/heads/master", NULL) < 0)
                        exit(1);

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index c015405f124f738e66213987c3ba88c7d310caab..b0289e397ab683c8c5a02ce649d7790d6a876d16 100755 (executable)
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -113,4 +113,21 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' '
        fi
 '
 
        fi
 '
 

+test_expect_success 'reinit' '
+
+       (
+               unset GIT_CONFIG GIT_WORK_TREE GIT_CONFIG
+
+               mkdir again &&
+               cd again &&
+               git init >out1 2>err1 &&
+               git init >out2 2>err2
+       ) &&
+       grep "Initialized empty" again/out1 &&
+       grep "Reinitialized existing" again/out2 &&
+       >again/empty &&
+       test_cmp again/empty again/err1 &&
+       test_cmp again/empty again/err2
+'
+

 test_done
 test_done