diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:48 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:48 +0300 |
| commit | 9674e7a333150d4f4a4752b25b4066bcd0406ddf (patch) | |
| tree | c64c5d9732346ddf2f6084154e98f8cb0cc8ee6a | |
| parent | 254db3035ccf3413ab997c4baf2d3b8b7bb4c054 (diff) | |
| parent | c5cbb27cb5f0a94ac5d0882778a00add829ad9d9 (diff) | |
Merge branch 'sm/show-superproject-while-conflicted' into maint
A corner-case bugfix.
* sm/show-superproject-while-conflicted:
rev-parse: --show-superproject-working-tree should work during a merge
| -rw-r--r-- | submodule.c | 2 | ||||
| -rwxr-xr-x | t/t1500-rev-parse.sh | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index 4a5212bdfb..f27f14e868 100644 --- a/submodule.c +++ b/submodule.c @@ -1879,7 +1879,7 @@ const char *get_superproject_working_tree(void) * We're only interested in the name after the tab. */ super_sub = strchr(sb.buf, '\t') + 1; - super_sub_len = sb.buf + sb.len - super_sub - 1; + super_sub_len = strlen(super_sub); if (super_sub_len > cwd_len || strcmp(&cwd[cwd_len - super_sub_len], super_sub)) diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh index 5c715fe2cf..01abee533d 100755 --- a/t/t1500-rev-parse.sh +++ b/t/t1500-rev-parse.sh @@ -142,6 +142,22 @@ test_expect_success 'showing the superproject correctly' ' git -C super submodule add ../sub dir/sub && echo $(pwd)/super >expect && git -C super/dir/sub rev-parse --show-superproject-working-tree >out && + test_cmp expect out && + + test_commit -C super submodule_add && + git -C super checkout -b branch1 && + git -C super/dir/sub checkout -b branch1 && + test_commit -C super/dir/sub branch1_commit && + git -C super add dir/sub && + test_commit -C super branch1_commit && + git -C super checkout -b branch2 master && + git -C super/dir/sub checkout -b branch2 master && + test_commit -C super/dir/sub branch2_commit && + git -C super add dir/sub && + test_commit -C super branch2_commit && + test_must_fail git -C super merge branch1 && + + git -C super/dir/sub rev-parse --show-superproject-working-tree >out && test_cmp expect out ' |