Merge branch 'nd/git-common-dir-fix' into maint

diff --git a/builtin/pull.c b/builtin/pull.c
index bf3fd3f9c8d80ff84ace4150214118355585e917..5145fc60a0377a7fb799555892909f979aca9076 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -743,7 +743,7 @@ static int get_octopus_merge_base(unsigned char *merge_base,
        if (!result)
                return 1;
 
-       hashcpy(merge_base, result->item->object.sha1);
+       hashcpy(merge_base, result->item->object.oid.hash);
        return 0;
 }