commit: factor status configuration is a helper function
cmd_commit and cmd_status use very similar code to initialize the wt_status structure. Factor this code into a function to ensure future changes will keep both versions consistent. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Sep 12, 2013 at 12:50 UTC
5c25dfaa794c7bbfa1b4d234b10f94ee371b1db0
1 file changed
+10
-8
builtin/commit.c
+10
-8
@@ -163,6 +163,14 @@ static void determine_whence(struct wt_status *s)
163
s->whence = whence;
164
}
165
166
+static void status_init_config(struct wt_status *s, config_fn_t fn)
167
+{
168
+ wt_status_prepare(s);
169
+ gitmodules_config();
170
+ git_config(fn, s);
171
+ determine_whence(s);
172
+}
173
+
174
static void rollback_index_files(void)
175
{
176
switch (commit_style) {
@@ -1246,10 +1254,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
1254
if (argc == 2 && !strcmp(argv[1], "-h"))
1255
usage_with_options(builtin_status_usage, builtin_status_options);
1256
1249
- wt_status_prepare(&s);
1250
- gitmodules_config();
1251
- git_config(git_status_config, &s);
1252
- determine_whence(&s);
1257
+ status_init_config(&s, git_status_config);
1258
argc = parse_options(argc, argv, prefix,
1259
builtin_status_options,
1260
builtin_status_usage, 0);
@@ -1492,11 +1497,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
1497
if (argc == 2 && !strcmp(argv[1], "-h"))
1498
usage_with_options(builtin_commit_usage, builtin_commit_options);
1499
1495
- wt_status_prepare(&s);
1496
- gitmodules_config();
1497
- git_config(git_commit_config, &s);
1500
+ status_init_config(&s, git_commit_config);
1501
status_format = STATUS_FORMAT_NONE; /* Ignore status.short */
1499
- determine_whence(&s);
1502
s.colopts = 0;
1503
1504
if (get_sha1("HEAD", sha1))