[PATCH v2 09/10] builtin/replace: unset read_replace_refs
- From
Christian Couder <chriscool@tuxfamily.org>
- Date
- Dec 7, 2013, 16:21 UTC
- Message-ID
- <20131207162106.21478.98950.chriscool@tuxfamily.org>
- In-Reply-To
- <20131207160514.21478.72966.chriscool@tuxfamily.org>
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 <peff@peff.net> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- builtin/replace.c | 2 ++ t/t6050-replace.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/replace.c b/builtin/replace.c index 9f3619a..1672870 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) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 3627b4c..f15b805 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -296,7 +296,7 @@ test_expect_success 'test --format medium' ' test_cmp expected actual ' -test_expect_failure 'test --format full' ' +test_expect_success 'test --format full' ' { echo "$H1 (commit) -> $BLOB (blob)" && echo "$BLOB (blob) -> $REPLACED (blob)" &&
-- 1.8.5.1.102.g090758b