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>
Matthieu Moy committed
Aug 21, 2009 at 10:57 UTC
43673fddd3c8a0e2cadc8ba724552531fac55464
4 files changed
+5
-5
builtin-add.c
+1
-1
@@ -105,7 +105,7 @@ static void refresh(int verbose, const char **pathspec)
105
for (specs = 0; pathspec[specs]; specs++)
106
/* nothing */;
107
seen = xcalloc(specs, 1);
108
- refresh_index(&the_index, verbose ? REFRESH_SAY_CHANGED : REFRESH_QUIET,
108
+ refresh_index(&the_index, verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET,
109
pathspec, seen);
110
for (i = 0; i < specs; i++) {
111
if (!seen[i])
builtin-reset.c
+2
-2
@@ -261,7 +261,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
261
die("Cannot do %s reset with paths.",
262
reset_type_names[reset_type]);
263
return read_from_tree(prefix, argv + i, sha1,
264
- quiet ? REFRESH_QUIET : REFRESH_SAY_CHANGED);
264
+ quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN);
265
}
266
if (reset_type == NONE)
267
reset_type = MIXED; /* by default */
@@ -302,7 +302,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
302
break;
303
case MIXED: /* Report what has not been updated. */
304
update_index_refresh(0, NULL,
305
- quiet ? REFRESH_QUIET : REFRESH_SAY_CHANGED);
305
+ quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN);
306
break;
307
}
308
cache.h
+1
-1
@@ -476,7 +476,7 @@ extern int check_path(const char *path, int len, struct stat *st);
476
#define REFRESH_QUIET 0x0004 /* be quiet about it */
477
#define REFRESH_IGNORE_MISSING 0x0008 /* ignore non-existent */
478
#define REFRESH_IGNORE_SUBMODULES 0x0010 /* ignore submodules */
479
-#define REFRESH_SAY_CHANGED 0x0020 /* say "changed" not "needs update" */
479
+#define REFRESH_IN_PORCELAIN 0x0020 /* user friendly output, not "needs update" */
480
extern int refresh_index(struct index_state *, unsigned int flags, const char **pathspec, char *seen);
481
482
struct lock_file {
read-cache.c
+1
-1
@@ -1077,7 +1077,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p
1077
unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
1078
const char *needs_update_message;
1079
1080
- needs_update_message = ((flags & REFRESH_SAY_CHANGED)
1080
+ needs_update_message = ((flags & REFRESH_IN_PORCELAIN)
1081
? "locally modified" : "needs update");
1082
for (i = 0; i < istate->cache_nr; i++) {
1083
struct cache_entry *ce, *new;