[PATCH] log: Do not decorate replacements with --no-replace-objects
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Aug 25, 2011, 13:44 UTC
- Message-ID
- <ad41e81daa6f9fc4654ae4c312f293202519a5d0.1314279822.git.git@drmicha.warpmail.net>
5267d29 (log: decorate "replaced" on to replaced commits, 2011-08-19) introduced textual decorations for replaced commits, based on the detection of refs/replace.
Make it so that additionally the use of --no-replace-objects is detected: I.e. replaced commits are only decorated as replaced when they are actually replaced.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> --- Sorry for being late to the party. Trying to keep up. --- log-tree.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/log-tree.c b/log-tree.c index 74fc20d..2066bb7 100644 --- a/log-tree.c +++ b/log-tree.c @@ -95,7 +95,7 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in struct object *obj; enum decoration_type type = DECORATION_NONE; - if (!prefixcmp(refname, "refs/replace/")) { + if (read_replace_refs && !prefixcmp(refname, "refs/replace/")) { unsigned char original_sha1[20]; if (get_sha1_hex(refname + 13, original_sha1)) { warning("invalid replace ref %s", refname);
-- 1.7.6.845.gc3c05