diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:15:38 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:15:38 +0900 |
| commit | bc01ef0d3f3f79fc2f1a9e5e1a6ac0049e7a3c26 (patch) | |
| tree | 2f4f641fe1d78571baaa7e90f11d79aeea8aad26 /builtin/pull.c | |
| parent | cab8b4084d97b4c063bd8546fe6d68a49374016f (diff) | |
| download | git-bc01ef0d3f3f79fc2f1a9e5e1a6ac0049e7a3c26.tar.gz git-bc01ef0d3f3f79fc2f1a9e5e1a6ac0049e7a3c26.tar.bz2 git-bc01ef0d3f3f79fc2f1a9e5e1a6ac0049e7a3c26.zip | |
Imported Upstream version 2.7.0upstream/2.7.0
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index bf3fd3f9..5145fc60 100644 --- 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; } |