| Message ID | 20190604021330.16130-3-felipe.contreras@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix fetch regression with transport helpers | expand |
On Mon, Jun 03, 2019 at 09:13:27PM -0500, Felipe Contreras wrote: > This used to work, but commit e198b3a740 broke it. > > e198b3a740 (fetch: replace string-list used as a look-up table with a hashmap) > > Probably all remote helpers that use the import method are affected, but > we didn't catch the issue. Thanks for beefing up the tests. It's rather unfortunate that we missed such a severe regression. > +test_expect_failure 'fetch tag' ' > + (cd server && > + git tag v1.0 > + ) && > + (cd local && > + git fetch > + ) && > + compare_refs local v1.0 server v1.0 > +' This single-commands might be more readable using "git -C", but this matches the existing style in the test script, so I'm OK with it either way. > diff --git a/t/t5801/git-remote-testgit b/t/t5801/git-remote-testgit > index f2b551dfaf..6b9f0b5dc7 100755 > --- a/t/t5801/git-remote-testgit > +++ b/t/t5801/git-remote-testgit > @@ -12,9 +12,14 @@ url=$2 > > dir="$GIT_DIR/testgit/$alias" > > -refspec="refs/heads/*:refs/testgit/$alias/heads/*" > +h_refspec="refs/heads/*:refs/testgit/$alias/heads/*" > +t_refspec="refs/tags/*:refs/testgit/$alias/tags/*" > > -test -n "$GIT_REMOTE_TESTGIT_NOREFSPEC" && refspec="" > +if test -n "$GIT_REMOTE_TESTGIT_NOREFSPEC" > +then > + h_refspec="" > + t_refspec="" > +fi And the simplification from the prior step pays off. Looks good. The rest of it seems pretty sensible (modulo the caveat that I don't know remote-testgit well enough to detect anything subtle). -Peff
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index 48bed7c2fe..238774bc17 100755 --- a/t/t5801-remote-helpers.sh +++ b/t/t5801-remote-helpers.sh @@ -303,4 +303,14 @@ test_expect_success 'fetch url' ' compare_refs server HEAD local FETCH_HEAD ' +test_expect_failure 'fetch tag' ' + (cd server && + git tag v1.0 + ) && + (cd local && + git fetch + ) && + compare_refs local v1.0 server v1.0 +' + test_done diff --git a/t/t5801/git-remote-testgit b/t/t5801/git-remote-testgit index f2b551dfaf..6b9f0b5dc7 100755 --- a/t/t5801/git-remote-testgit +++ b/t/t5801/git-remote-testgit @@ -12,9 +12,14 @@ url=$2 dir="$GIT_DIR/testgit/$alias" -refspec="refs/heads/*:refs/testgit/$alias/heads/*" +h_refspec="refs/heads/*:refs/testgit/$alias/heads/*" +t_refspec="refs/tags/*:refs/testgit/$alias/tags/*" -test -n "$GIT_REMOTE_TESTGIT_NOREFSPEC" && refspec="" +if test -n "$GIT_REMOTE_TESTGIT_NOREFSPEC" +then + h_refspec="" + t_refspec="" +fi GIT_DIR="$url/.git" export GIT_DIR @@ -37,7 +42,8 @@ do capabilities) echo 'import' echo 'export' - test -n "$refspec" && echo "refspec $refspec" + test -n "$h_refspec" && echo "refspec $h_refspec" + test -n "$t_refspec" && echo "refspec $t_refspec" if test -n "$gitmarks" then echo "*import-marks $gitmarks" @@ -49,7 +55,7 @@ do echo ;; list) - git for-each-ref --format='? %(refname)' 'refs/heads/' + git for-each-ref --format='? %(refname)' 'refs/heads/' 'refs/tags/' head=$(git symbolic-ref HEAD) echo "@$head HEAD" echo @@ -78,7 +84,8 @@ do echo "feature done" git fast-export \ - ${refspec:+"--refspec=$refspec"} \ + ${h_refspec:+"--refspec=$h_refspec"} \ + ${t_refspec:+"--refspec=$t_refspec"} \ ${testgitmarks:+"--import-marks=$testgitmarks"} \ ${testgitmarks:+"--export-marks=$testgitmarks"} \ $refs
This used to work, but commit e198b3a740 broke it. e198b3a740 (fetch: replace string-list used as a look-up table with a hashmap) Probably all remote helpers that use the import method are affected, but we didn't catch the issue. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- t/t5801-remote-helpers.sh | 10 ++++++++++ t/t5801/git-remote-testgit | 17 ++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-)