Merge branch 'nd/maint-fix-replace'

* nd/maint-fix-replace:
  parse_object: pass on the original sha1, not the replaced one

diff --git a/object.c b/object.c
index 277b3ddba7dc5387cd97cb35c23d3358727898be..7adfda75f2914863c3c8eec86abffe581be4d480 100644 (file)
--- 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 4185b7ca1d3679b458d16753581fe78e3b68b376..dd917d76da4f30ee8079caa17766c71513670d2e 100755 (executable)
--- 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)" &&