summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-19 04:34:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-19 04:34:04 (GMT)
commitd152a74e2584dd0e235c9bcc97ef6a9ed239994a (patch)
treea8a6534606e4f64409580b49607cd0a0f9aaada9 /submodule.c
parenta1e9dff182b19a2620aab036c22389d22b9dd0be (diff)
parentc5cbb27cb5f0a94ac5d0882778a00add829ad9d9 (diff)
downloadgit-d152a74e2584dd0e235c9bcc97ef6a9ed239994a.zip
git-d152a74e2584dd0e235c9bcc97ef6a9ed239994a.tar.gz
git-d152a74e2584dd0e235c9bcc97ef6a9ed239994a.tar.bz2
Merge branch 'sm/show-superproject-while-conflicted'
A corner-case bugfix. * sm/show-superproject-while-conflicted: rev-parse: --show-superproject-working-tree should work during a merge
Diffstat (limited to 'submodule.c')
-rw-r--r--submodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c
index 25c6e5d..d9d3046 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1886,7 +1886,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))