summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--object.c2
-rwxr-xr-xt/t6050-replace.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/object.c b/object.c
index 277b3ddba7..7adfda75f2 100644
--- a/object.c
+++ b/object.c
@@ -199,7 +199,7 @@ struct object *parse_object(const unsigned char *sha1)
return NULL;
}
- obj = parse_object_buffer(repl, type, size, buffer, &eaten);
+ obj = parse_object_buffer(sha1, type, size, buffer, &eaten);
if (!eaten)
free(buffer);
return obj;
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 4185b7ca1d..dd917d76da 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -209,7 +209,7 @@ test_expect_success 'fetch branch with replacement' '
test_expect_success 'bisect and replacements' '
git bisect start $HASH7 $HASH1 &&
- test "$S" = "$(git rev-parse --verify HEAD)" &&
+ test "$PARA3" = "$(git rev-parse --verify HEAD)" &&
git bisect reset &&
GIT_NO_REPLACE_OBJECTS=1 git bisect start $HASH7 $HASH1 &&
test "$HASH4" = "$(git rev-parse --verify HEAD)" &&