From 769a4fa463bb36ba78eb318f25e0e211f4fae949 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 11 Dec 2013 08:46:12 +0100 Subject: builtin/replace: unset read_replace_refs When checking to see if some objects are of the same type and when displaying the type of objects, git replace uses the sha1_object_info() function. Unfortunately this function by default respects replace refs, so instead of the type of a replaced object, it gives the type of the replacement object which might be different. To fix this bug, and because git replace should work at a level before replacement takes place, let's unset the read_replace_refs global variable at the beginning of cmd_replace(). Suggested-by: Jeff King Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- builtin/replace.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'builtin/replace.c') diff --git a/builtin/replace.c b/builtin/replace.c index 9f3619a1bf..1672870e81 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -174,6 +174,8 @@ int cmd_replace(int argc, const char **argv, const char *prefix) OPT_END() }; + read_replace_refs = 0; + argc = parse_options(argc, argv, prefix, options, git_replace_usage, 0); if (list && delete) -- cgit v1.3