Re: [PATCH v4 00/10] teach replace objects to sha1_object_info_extended()
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:59:31
Christian Couder [off-list ref] writes:
The only changes compared to version 3 are the following:
I'll queue this instead on top, as the series is already in 'next'. Thanks. -- >8 -- From: Christian Couder <redacted> Date: Sat, 28 Dec 2013 12:00:05 +0100 Subject: [PATCH] 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 <redacted> --- Documentation/git-replace.txt | 4 ++-- builtin/replace.c | 24 ++++++++++++++---------- t/t6050-replace.sh | 4 ++-- 3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index 7a07828..0a02f70 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt@@ -72,7 +72,7 @@ OPTIONS --format=<format>:: When listing, use the specified <format>, which can be one of - 'short', 'medium' and 'full'. When omitted, the format + 'short', 'medium' and 'long'. When omitted, the format defaults to 'short'. FORMATS
@@ -84,7 +84,7 @@ The following format are available: <replaced sha1> * 'medium': <replaced sha1> -> <replacement sha1> -* 'full' +* 'long': <replaced sha1> (<replaced type>) -> <replacement sha1> (<replacement type>) CREATING REPLACEMENT OBJECTS
diff --git a/builtin/replace.c b/builtin/replace.c
index 1672870..2336325 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);
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index d0c62f7..719a116 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh@@ -306,7 +306,7 @@ test_expect_success 'test --format medium' ' test_cmp expected actual ' -test_expect_success 'test --format full' ' +test_expect_success 'test --format long' ' { echo "$H1 (commit) -> $BLOB (blob)" && echo "$BLOB (blob) -> $REPLACED (blob)" &&
@@ -314,7 +314,7 @@ test_expect_success 'test --format full' ' echo "$PARA3 (commit) -> $S (commit)" && echo "$MYTAG (tag) -> $HASH1 (commit)" } | sort >expected && - git replace --format=full | sort > actual && + git replace --format=long | sort > actual && test_cmp expected actual '
--
1.8.5.2-311-g6427a96