diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2009-08-21 08:57:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-22 03:45:40 (GMT) |
| commit | 43673fddd3c8a0e2cadc8ba724552531fac55464 (patch) | |
| tree | ad664bf510f9207345692ad28e58710581ab504d | |
| parent | 044239b0a1fbdcccefafe1dab5f9c21e5a2a9150 (diff) | |
| download | git-43673fddd3c8a0e2cadc8ba724552531fac55464.zip git-43673fddd3c8a0e2cadc8ba724552531fac55464.tar.gz git-43673fddd3c8a0e2cadc8ba724552531fac55464.tar.bz2 | |
Rename REFRESH_SAY_CHANGED to REFRESH_IN_PORCELAIN.
The change in the output is going to become more general than just saying
"changed", so let's make the variable name more general too.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-add.c | 2 | ||||
| -rw-r--r-- | builtin-reset.c | 4 | ||||
| -rw-r--r-- | cache.h | 2 | ||||
| -rw-r--r-- | read-cache.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/builtin-add.c b/builtin-add.c index 581a2a1..a325bc9 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -105,7 +105,7 @@ static void refresh(int verbose, const char **pathspec) for (specs = 0; pathspec[specs]; specs++) /* nothing */; seen = xcalloc(specs, 1); - refresh_index(&the_index, verbose ? REFRESH_SAY_CHANGED : REFRESH_QUIET, + refresh_index(&the_index, verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET, pathspec, seen); for (i = 0; i < specs; i++) { if (!seen[i]) diff --git a/builtin-reset.c b/builtin-reset.c index 5fa1789..ddf68d5 100644 --- a/builtin-reset.c +++ b/builtin-reset.c @@ -261,7 +261,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) die("Cannot do %s reset with paths.", reset_type_names[reset_type]); return read_from_tree(prefix, argv + i, sha1, - quiet ? REFRESH_QUIET : REFRESH_SAY_CHANGED); + quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN); } if (reset_type == NONE) reset_type = MIXED; /* by default */ @@ -302,7 +302,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) break; case MIXED: /* Report what has not been updated. */ update_index_refresh(0, NULL, - quiet ? REFRESH_QUIET : REFRESH_SAY_CHANGED); + quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN); break; } @@ -476,7 +476,7 @@ extern int check_path(const char *path, int len, struct stat *st); #define REFRESH_QUIET 0x0004 /* be quiet about it */ #define REFRESH_IGNORE_MISSING 0x0008 /* ignore non-existent */ #define REFRESH_IGNORE_SUBMODULES 0x0010 /* ignore submodules */ -#define REFRESH_SAY_CHANGED 0x0020 /* say "changed" not "needs update" */ +#define REFRESH_IN_PORCELAIN 0x0020 /* user friendly output, not "needs update" */ extern int refresh_index(struct index_state *, unsigned int flags, const char **pathspec, char *seen); struct lock_file { diff --git a/read-cache.c b/read-cache.c index 4e3e272..f1aff81 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1077,7 +1077,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0; const char *needs_update_message; - needs_update_message = ((flags & REFRESH_SAY_CHANGED) + needs_update_message = ((flags & REFRESH_IN_PORCELAIN) ? "locally modified" : "needs update"); for (i = 0; i < istate->cache_nr; i++) { struct cache_entry *ce, *new; |