[PATCH v3 3/4] commit.c: replace some literal strings with constants

[Jay Soffian <jaysoffian@gmail.com>]

A typo in any of these would be bad, so let's use
constants for them

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
I converted these per
http://article.gmane.org/gmane.comp.version-control.git/167015

Maybe this should be the last patch in the series; it's questionable to
me whether it's even worth doing.

 builtin/commit.c |   48 +++++++++++++++++++++++++++---------------------
 1 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/builtin/commit.c b/builtin/commit.c
index 0def540..5b32743 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -54,10 +54,16 @@ static const char empty_amend_advice[] =
 "it empty. You can repeat your command with --allow-empty, or you can\n"
 "remove the commit entirely with \"git reset HEAD^\".\n";
 
+static const char commit_editmsg[] = "COMMIT_EDITMSG";
+static const char cherry_pick_head[] = "CHERRY_PICK_HEAD";
+static const char merge_head[] = "MERGE_HEAD";
+static const char merge_msg[] = "MERGE_MSG";
+static const char merge_mode[] = "MERGE_MODE";
+static const char squash_msg[] = "SQUASH_MSG";
+
 static unsigned char head_sha1[20];
 
 static char *use_message_buffer;
-static const char commit_editmsg[] = "COMMIT_EDITMSG";
 static struct lock_file index_lock; /* real index */
 static struct lock_file false_lock; /* used only for partial commits */
 static enum {
@@ -626,13 +632,13 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 		format_commit_message(commit, "fixup! %s\n\n",
 				      &sb, &ctx);
 		hook_arg1 = "message";
-	} else if (!stat(git_path("MERGE_MSG"), &statbuf)) {
-		if (strbuf_read_file(&sb, git_path("MERGE_MSG"), 0) < 0)
-			die_errno("could not read MERGE_MSG");
+	} else if (!stat(git_path(merge_msg), &statbuf)) {
+		if (strbuf_read_file(&sb, git_path(merge_msg), 0) < 0)
+			die_errno("could not read %s", merge_msg);
 		hook_arg1 = "merge";
-	} else if (!stat(git_path("SQUASH_MSG"), &statbuf)) {
-		if (strbuf_read_file(&sb, git_path("SQUASH_MSG"), 0) < 0)
-			die_errno("could not read SQUASH_MSG");
+	} else if (!stat(git_path(squash_msg), &statbuf)) {
+		if (strbuf_read_file(&sb, git_path(squash_msg), 0) < 0)
+			die_errno("could not read %s", squash_msg);
 		hook_arg1 = "squash";
 	} else if (template_file && !stat(template_file, &statbuf)) {
 		if (strbuf_read_file(&sb, template_file, 0) < 0)
@@ -702,7 +708,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 				"#	%s\n"
 				"# and try again.\n"
 				"#\n",
-				git_path("MERGE_HEAD"));
+				git_path(merge_head));
 
 		fprintf(fp,
 			"\n"
@@ -1117,7 +1123,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 	wt_status_prepare(&s);
 	gitmodules_config();
 	git_config(git_status_config, &s);
-	in_merge = file_exists(git_path("MERGE_HEAD"));
+	in_merge = file_exists(git_path(merge_head));
 	argc = parse_options(argc, argv, prefix,
 			     builtin_status_options,
 			     builtin_status_usage, 0);
@@ -1302,7 +1308,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 
 	wt_status_prepare(&s);
 	git_config(git_commit_config, &s);
-	in_merge = file_exists(git_path("MERGE_HEAD"));
+	in_merge = file_exists(git_path(merge_head));
 	s.in_merge = in_merge;
 
 	if (s.use_color == -1)
@@ -1347,21 +1353,21 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		if (!reflog_msg)
 			reflog_msg = "commit (merge)";
 		pptr = &commit_list_insert(lookup_commit(head_sha1), pptr)->next;
-		fp = fopen(git_path("MERGE_HEAD"), "r");
+		fp = fopen(git_path(merge_head), "r");
 		if (fp == NULL)
 			die_errno("could not open '%s' for reading",
-				  git_path("MERGE_HEAD"));
+				  git_path(merge_head));
 		while (strbuf_getline(&m, fp, '\n') != EOF) {
 			unsigned char sha1[20];
 			if (get_sha1_hex(m.buf, sha1) < 0)
-				die("Corrupt MERGE_HEAD file (%s)", m.buf);
+				die("Corrupt %s file (%s)", merge_head, m.buf);
 			pptr = &commit_list_insert(lookup_commit(sha1), pptr)->next;
 		}
 		fclose(fp);
 		strbuf_release(&m);
-		if (!stat(git_path("MERGE_MODE"), &statbuf)) {
-			if (strbuf_read_file(&sb, git_path("MERGE_MODE"), 0) < 0)
-				die_errno("could not read MERGE_MODE");
+		if (!stat(git_path(merge_mode), &statbuf)) {
+			if (strbuf_read_file(&sb, git_path(merge_mode), 0) < 0)
+				die_errno("could not read %s", merge_mode);
 			if (!strcmp(sb.buf, "no-ff"))
 				allow_fast_forward = 0;
 		}
@@ -1424,11 +1430,11 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		die("cannot update HEAD ref");
 	}
 
-	unlink(git_path("CHERRY_PICK_HEAD"));
-	unlink(git_path("MERGE_HEAD"));
-	unlink(git_path("MERGE_MSG"));
-	unlink(git_path("MERGE_MODE"));
-	unlink(git_path("SQUASH_MSG"));
+	unlink(git_path(cherry_pick_head));
+	unlink(git_path(merge_head));
+	unlink(git_path(merge_msg));
+	unlink(git_path(merge_mode));
+	unlink(git_path(squash_msg));
 
 	if (commit_index_files())
 		die ("Repository has been updated, but unable to write\n"
-- 
1.7.4.1.30.g7fe09