[PATCH] init: show "Reinit" message even in an (existing) empty repository
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:44:25
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] init: show "Reinit" message even in an (existing) empty repository · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] init: show "Reinit" message even in an (existing) empty repository · Johannes Schindelin <hidden>
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 <redacted> --- I realised this while testing the core.initHook patch. builtin-init-db.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/builtin-init-db.c b/builtin-init-db.c
index 1975910..ceb4727 100644
--- a/builtin-init-db.c
+++ b/builtin-init-db.c@@ -168,10 +168,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 char sha1[20]; struct stat st1; char repo_version_string[10];
int reinit; int filemode; if (len > sizeof(path)-50)
@@ -220,7 +219,7 @@ static int create_default_files(const char *git_dir, const char *template_path) * branch, if it does not exist yet. */ strcpy(path + len, "HEAD"); - reinit = !read_ref("HEAD", sha1); + reinit = !access(path, R_OK); if (!reinit) { if (create_symref("HEAD", "refs/heads/master", NULL) < 0) exit(1);
--
1.5.5.rc1.178.gd799d