refresh_index: rename format variables
When refreshing the index, for modified (or unmerged) files we will print "needs update" (or "needs merge") for plumbing, or line similar to the output from "diff --name-status" for porcelain. The variables holding which type of message to show are named after the plumbing messages. However, as we begin to differentiate more cases at the porcelain level (with the plumbing message staying the same), that naming scheme will become awkward. Instead, name the variables after which case we found (modified or unmerged), not what we will output. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Nov 18, 2011 at 06:11 UTC
4bd4e73093eb741a87b7d80bc84469d880f4e2f3
1 file changed
+6
-6
read-cache.c
+6
-6
@@ -1105,11 +1105,11 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p
1105
int first = 1;
1106
int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
1107
unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
1108
- const char *needs_update_fmt;
1109
- const char *needs_merge_fmt;
1108
+ const char *modified_fmt;
1109
+ const char *unmerged_fmt;
1110
1111
- needs_update_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1112
- needs_merge_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1111
+ modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
1112
+ unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
1113
for (i = 0; i < istate->cache_nr; i++) {
1114
struct cache_entry *ce, *new;
1115
int cache_errno = 0;
@@ -1125,7 +1125,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p
1125
i--;
1126
if (allow_unmerged)
1127
continue;
1128
- show_file(needs_merge_fmt, ce->name, in_porcelain, &first, header_msg);
1128
+ show_file(unmerged_fmt, ce->name, in_porcelain, &first, header_msg);
1129
has_errors = 1;
1130
continue;
1131
}
@@ -1148,7 +1148,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p
1148
}
1149
if (quiet)
1150
continue;
1151
- show_file(needs_update_fmt, ce->name, in_porcelain, &first, header_msg);
1151
+ show_file(modified_fmt, ce->name, in_porcelain, &first, header_msg);
1152
has_errors = 1;
1153
continue;
1154
}