@matheusbsbs / matheus-bagliano / commits / ef0a89a604
Fork 0

Provide more meaningful output from 'git init-db'.

Back in the old days of Git when people messed around with their GIT_DIR environment variable more often it was nice to know whether or not git-init-db created a .git directory or used GIT_DIR. As most users at that time were rather technical UNIXy folk the message "defaulting to local storage area" made sense to some and seemed reasonable. But it doesn't really convey any meaning to the new Git user, as they don't know what a 'local storage area is' nor do they know enough about Git to care. It also really doesn't tell the experienced Git user a whole lot about the command they just ran, especially if they might be reinitializing an existing repository (e.g. to update hooks). So now we print out what we did ("Initialized empty" or "Reinitialized existing"), what type of repository ("" or "shared"), and what location the repository will be in ("$GIT_DIR"). Suggested in part by Andy Parkins in his Git 'niggles' list (<200612132237.10051.andyparkins@gmail.com>). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Shawn O. Pearce committed Dec 15, 2006 at 00:44 UTC ef0a89a604acb7fc2e3c08566641b95b23d87fd6
4 files changed +17 -10
Documentation/core-tutorial.txt
+1 -1
@@ -57,7 +57,7 @@ $ git-init-db
57 to which git will reply
58
59 ----------------
60 -defaulting to local storage area
60 +Initialized empty Git repository in .git/
61 ----------------
62
63 which is just git's way of saying that you haven't been doing anything
Documentation/tutorial-2.txt
+1 -1
@@ -18,7 +18,7 @@ Let's start a new project and create a small amount of history:
18 $ mkdir test-project
19 $ cd test-project
20 $ git init-db
21 -defaulting to local storage area
21 +Initialized empty Git repository in .git/
22 $ echo 'hello world' > file.txt
23 $ git add .
24 $ git commit -a -m "initial commit"
Documentation/tutorial.txt
+1 -1
@@ -38,7 +38,7 @@ $ git init-db
38 Git will reply
39
40 ------------------------------------------------
41 -defaulting to local storage area
41 +Initialized empty Git repository in .git/
42 ------------------------------------------------
43
44 You've now initialized the working directory--you may notice a new
builtin-init-db.c
+14 -7
@@ -164,13 +164,14 @@ static void copy_templates(const char *git_dir, int len, const char *template_di
164 closedir(dir);
165 }
166
167 -static void create_default_files(const char *git_dir, const char *template_path)
167 +static int create_default_files(const char *git_dir, const char *template_path)
168 {
169 unsigned len = strlen(git_dir);
170 static char path[PATH_MAX];
171 unsigned char sha1[20];
172 struct stat st1;
173 char repo_version_string[10];
174 + int reinit;
175
176 if (len > sizeof(path)-50)
177 die("insane git directory %s", git_dir);
@@ -218,7 +219,8 @@ static void create_default_files(const char *git_dir, const char *template_path)
219 * branch, if it does not exist yet.
220 */
221 strcpy(path + len, "HEAD");
221 - if (read_ref("HEAD", sha1) < 0) {
222 + reinit = !read_ref("HEAD", sha1);
223 + if (!reinit) {
224 if (create_symref("HEAD", "refs/heads/master") < 0)
225 exit(1);
226 }
@@ -239,6 +241,8 @@ static void create_default_files(const char *git_dir, const char *template_path)
241 git_config_set("core.filemode",
242 filemode ? "true" : "false");
243 }
244 +
245 + return reinit;
246 }
247
248 static const char init_db_usage[] =
@@ -256,7 +260,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
260 const char *sha1_dir;
261 const char *template_dir = NULL;
262 char *path;
259 - int len, i;
263 + int len, i, reinit;
264
265 for (i = 1; i < argc; i++, argv++) {
266 const char *arg = argv[1];
@@ -274,10 +278,8 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
278 * Set up the default .git directory contents
279 */
280 git_dir = getenv(GIT_DIR_ENVIRONMENT);
277 - if (!git_dir) {
281 + if (!git_dir)
282 git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
279 - fprintf(stderr, "defaulting to local storage area\n");
280 - }
283 safe_create_dir(git_dir, 0);
284
285 /* Check to see if the repository version is right.
@@ -287,7 +289,7 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
289 */
290 check_repository_format();
291
290 - create_default_files(git_dir, template_dir);
292 + reinit = create_default_files(git_dir, template_dir);
293
294 /*
295 * And set up the object store.
@@ -314,5 +316,10 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
316 git_config_set("receive.denyNonFastforwards", "true");
317 }
318
319 + printf("%s%s Git repository in %s/\n",
320 + reinit ? "Reinitialized existing" : "Initialized empty",
321 + shared_repository ? " shared" : "",
322 + git_dir);
323 +
324 return 0;
325 }