[PATCH 1/4] refresh_index: rename format variables
- From
Jeff King <peff@peff.net>
- Date
- Nov 14, 2011, 22:51 UTC
- Message-ID
- <20111114225153.GA3993@sigill.intra.peff.net>
- In-Reply-To
- <20111114225056.GA27370@sigill.intra.peff.net>
When refreshing the index, for modified (or unmerged) files we will print "needs update" (or "needs merge") for plumbing, or a "diff --name-status"-ish line 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 stayin 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> --- read-cache.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/read-cache.c b/read-cache.c index 5790a91..eb3aae3 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1102,11 +1102,11 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p int first = 1; int in_porcelain = (flags & REFRESH_IN_PORCELAIN); unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0; - const char *needs_update_fmt; - const char *needs_merge_fmt; + const char *modified_fmt; + const char *unmerged_fmt; - needs_update_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n"); - needs_merge_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n"); + modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n"); + unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n"); for (i = 0; i < istate->cache_nr; i++) { struct cache_entry *ce, *new; int cache_errno = 0; @@ -1122,7 +1122,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p i--; if (allow_unmerged) continue; - show_file(needs_merge_fmt, ce->name, in_porcelain, &first, header_msg); + show_file(unmerged_fmt, ce->name, in_porcelain, &first, header_msg); has_errors = 1; continue; } @@ -1145,7 +1145,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p } if (quiet) continue; - show_file(needs_update_fmt, ce->name, in_porcelain, &first, header_msg); + show_file(modified_fmt, ce->name, in_porcelain, &first, header_msg); has_errors = 1; continue; }
-- 1.7.7.3.8.g38efa