[PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?
- From
Stefan Beller <sbeller@google.com>
- Date
- Dec 19, 2017, 18:02 UTC
- Message-ID
- <20171219180230.254881-1-sbeller@google.com>
- In-Reply-To
- <CAFBGMVPBwxeSXCTcoBdxDbYtJo-38w=tf4T6-rNWuys=3drP+A@mail.gmail.com>
I tried reproducing the issue (based on the `next` branch, not 2.15, but I do not recall any changes in the submodule area lately), and could not come up with a reproduction recipe, but here is what I got so far, maybe you can take it from here (i.e. either make the test case more like your environment such that it fails, or rather bisect git to tell us the offending commit) ?
Signed-off-by: Stefan Beller <sbeller@google.com> --- t/t7406-submodule-update.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 6f083c4d68..d957305c38 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -978,4 +978,20 @@ test_expect_success 'git clone passes the parallel jobs config on to submodules' rm -rf super4 ' +test_expect_success 'git submodule update works with submodules with name/path difference' ' + test_create_repo super6 && + ( + cd super6 && + git submodule add ../submodule sub1 && + git submodule add --name testingname ../submodule sub2 && + git commit -m initial && + git -C sub1 checkout HEAD^ && + git -C sub2 checkout HEAD^ && + + git submodule update >actual && + grep sub1 actual && + grep sub2 actual + ) +' + test_done
-- 2.15.1.620.gb9897f4670-goog