diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2013-12-28 12:00:05 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-30 12:33:11 -0800 |
| commit | 663a8566beb5387530641abe71a8d8b2dafd08b3 (patch) | |
| tree | 5d67411eef51e8afa398daefa7ae96615cb7c853 /builtin/replace.c | |
| parent | 34a332221c581585ad06ed43eff12fb7e675cc1d (diff) | |
| download | git-663a8566beb5387530641abe71a8d8b2dafd08b3.tar.gz git-663a8566beb5387530641abe71a8d8b2dafd08b3.tar.xz | |
replace info: rename 'full' to 'long' and clarify in-code symbols
Enum names SHORT/MEDIUM/FULL were too broad to be descriptive. And
they clashed with built-in symbols on platforms like Windows.
Clarify by giving them REPLACE_FORMAT_ prefix.
Rename 'full' format in "git replace --format=<name>" to 'long', to
match others (i.e. 'short' and 'medium').
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/replace.c')
| -rw-r--r-- | builtin/replace.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/builtin/replace.c b/builtin/replace.c index 1672870e8..2336325ce 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -20,11 +20,15 @@ static const char * const git_replace_usage[] = { NULL }; -enum repl_fmt { SHORT, MEDIUM, FULL }; +enum replace_format { + REPLACE_FORMAT_SHORT, + REPLACE_FORMAT_MEDIUM, + REPLACE_FORMAT_LONG +}; struct show_data { const char *pattern; - enum repl_fmt fmt; + enum replace_format format; }; static int show_reference(const char *refname, const unsigned char *sha1, @@ -33,11 +37,11 @@ static int show_reference(const char *refname, const unsigned char *sha1, struct show_data *data = cb_data; if (!fnmatch(data->pattern, refname, 0)) { - if (data->fmt == SHORT) + if (data->format == REPLACE_FORMAT_SHORT) printf("%s\n", refname); - else if (data->fmt == MEDIUM) + else if (data->format == REPLACE_FORMAT_MEDIUM) printf("%s -> %s\n", refname, sha1_to_hex(sha1)); - else { /* data->fmt == FULL */ + else { /* data->format == REPLACE_FORMAT_LONG */ unsigned char object[20]; enum object_type obj_type, repl_type; @@ -64,14 +68,14 @@ static int list_replace_refs(const char *pattern, const char *format) data.pattern = pattern; if (format == NULL || *format == '\0' || !strcmp(format, "short")) - data.fmt = SHORT; + data.format = REPLACE_FORMAT_SHORT; else if (!strcmp(format, "medium")) - data.fmt = MEDIUM; - else if (!strcmp(format, "full")) - data.fmt = FULL; + data.format = REPLACE_FORMAT_MEDIUM; + else if (!strcmp(format, "long")) + data.format = REPLACE_FORMAT_LONG; else die("invalid replace format '%s'\n" - "valid formats are 'short', 'medium' and 'full'\n", + "valid formats are 'short', 'medium' and 'long'\n", format); for_each_replace_ref(show_reference, (void *) &data); |