From: Michael J Gruber Date: Thu, 25 Aug 2011 15:09:30 GMT Subject: [PATCHv2] log: Do not decorate replacements with --no-replace-objects Message-ID: <739ff64bdbd0c099b3baf0755c0350de82c1ec0a.1314284204.git.git@drmicha.warpmail.net> In-Reply-To: <4E566586.5010901@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 --- Sorry for being late to the party. Trying to keep up. --- log-tree.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/log-tree.c b/log-tree.c index 74fc20d..f65f6b6 100644 --- a/log-tree.c +++ b/log-tree.c @@ -96,6 +96,8 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in enum decoration_type type = DECORATION_NONE; if (!prefixcmp(refname, "refs/replace/")) { + if (!read_replace_refs) + return 0; unsigned char original_sha1[20]; if (get_sha1_hex(refname + 13, original_sha1)) { warning("invalid replace ref %s", refname); -- 1.7.6.845.gc3c05