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 <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Aug 25, 2011 at 17:09 UTC
b9ad500262843c6110968da1f4e7b6717bc71303
1 file changed
+2
log-tree.c
+2
@@ -97,6 +97,8 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in
97
98
if (!prefixcmp(refname, "refs/replace/")) {
99
unsigned char original_sha1[20];
100
+ if (!read_replace_refs)
101
+ return 0;
102
if (get_sha1_hex(refname + 13, original_sha1)) {
103
warning("invalid replace ref %s", refname);
104
return 0;