From: Michael J Gruber Date: Thu, 25 Aug 2011 15:09:30 +0000 (+0200) Subject: log: Do not decorate replacements with --no-replace-objects X-Git-Tag: v1.7.7-rc1~34^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b9ad500262843c6110968da1f4e7b6717bc71303;p=git.git log: Do not decorate replacements with --no-replace-objects 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 Signed-off-by: Junio C Hamano --- diff --git a/log-tree.c b/log-tree.c index 74fc20da4..c40fa50c6 100644 --- a/log-tree.c +++ b/log-tree.c @@ -97,6 +97,8 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in if (!prefixcmp(refname, "refs/replace/")) { unsigned char original_sha1[20]; + if (!read_replace_refs) + return 0; if (get_sha1_hex(refname + 13, original_sha1)) { warning("invalid replace ref %s", refname); return 0;