| Re: [jgit-dev] How to fetch a specific commit with JGit |
|
Here is the proof. The following script [1] sets up a server and tries to fetch from it. When uploadpack.allowreachablesha1inwant is not set on server side the
the fetch of a sha1 fails. If it is set on server-side the the fetch with native git succeeds but the fetch with JGit still fails. And setting it on client side doesn’t help JGit. It’s all about the FetchProcess.expandSingle() method where client side JGit
doesn’t like to fetch something from the server what the server has not advertised. + rm -fr 'writingClient*/' 'readingClient*/' server/ + mkdir server + git init --bare server/repo.git Initialized empty Git repository in /private/tmp/x2/server/repo.git/ + git clone git://127.0.0.1/repo.git writingClient + git daemon --base-path=server --export-all --enable=receive-pack Cloning into 'writingClient'... warning: You appear to have cloned an empty repository. + cd writingClient + touch a + git add a + git commit -m add_a [master (root-commit) 0014c4f] add_a 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 a + git push origin HEAD:master Counting objects: 3, done. Writing objects: 100% (3/3), 206 bytes | 0 bytes/s, done. Total 3 (delta 0), reused 0 (delta 0) To git://127.0.0.1/repo.git * [new branch] HEAD -> master + cd .. + git clone git://127.0.0.1/repo.git readingClientNative Cloning into 'readingClientNative'... remote: Counting objects: 3, done. remote: Total 3 (delta 0), reused 0 (delta 0) Receiving objects: 100% (3/3), done. + git clone git://127.0.0.1/repo.git readingClientJGit Cloning into 'readingClientJGit'... remote: Counting objects: 3, done. remote: Total 3 (delta 0), reused 0 (delta 0) Receiving objects: 100% (3/3), done. + cd writingClient + touch b + git add b + git commit -m add_b [master e82c7a8] add_b 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 b ++ git rev-parse HEAD + COMMITID=e82c7a814fb7e1254ea82b701c2471b8d3bff7d9 + echo 2 + git commit -a -m mod_b [master e528936] mod_b 1 file changed, 1 insertion(+) + git push origin HEAD:master Counting objects: 5, done. Delta compression using up to 8 threads. Compressing objects: 100% (4/4), done. Writing objects: 100% (5/5), 465 bytes | 0 bytes/s, done. Total 5 (delta 0), reused 0 (delta 0) To git://127.0.0.1/repo.git 0014c4f..e528936 HEAD -> master + cd ../readingClientNative + git fetch origin e82c7a814fb7e1254ea82b701c2471b8d3bff7d9:new + git -C ../server/repo.git config uploadpack.allowreachablesha1inwant true + git fetch origin e82c7a814fb7e1254ea82b701c2471b8d3bff7d9:new remote: Counting objects: 2, done. remote: Compressing objects: 100% (2/2), done. remote: Total 2 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (2/2), done. From git://127.0.0.1/repo * [new ref] e82c7a814fb7e1254ea82b701c2471b8d3bff7d9 -> new + cd ../readingClientJGit + jgit fetch origin e82c7a814fb7e1254ea82b701c2471b8d3bff7d9:new org.eclipse.jgit.api.errors.TransportException: Remote does not have e82c7a814fb7e1254ea82b701c2471b8d3bff7d9 available for fetch. at org.eclipse.jgit.api.FetchCommand.call(FetchCommand.java:135) at org.eclipse.jgit.pgm.Fetch.run(Fetch.java:128) at org.eclipse.jgit.pgm.TextBuiltin.execute(TextBuiltin.java:199) at org.eclipse.jgit.pgm.Main.execute(Main.java:250) at org.eclipse.jgit.pgm.Main.run(Main.java:142) at org.eclipse.jgit.pgm.Main.main(Main.java:114) Caused by: org.eclipse.jgit.errors.TransportException: Remote does not have e82c7a814fb7e1254ea82b701c2471b8d3bff7d9 available for fetch. at org.eclipse.jgit.transport.FetchProcess.expandSingle(FetchProcess.java:365) at org.eclipse.jgit.transport.FetchProcess.executeImp(FetchProcess.java:149) at org.eclipse.jgit.transport.FetchProcess.execute(FetchProcess.java:122) at org.eclipse.jgit.transport.Transport.fetch(Transport.java:1201) at org.eclipse.jgit.api.FetchCommand.call(FetchCommand.java:128) ... 5 more + git config uploadpack.allowreachablesha1inwant true + jgit fetch origin e82c7a814fb7e1254ea82b701c2471b8d3bff7d9:new org.eclipse.jgit.api.errors.TransportException: Remote does not have e82c7a814fb7e1254ea82b701c2471b8d3bff7d9 available for fetch. at org.eclipse.jgit.api.FetchCommand.call(FetchCommand.java:135) at org.eclipse.jgit.pgm.Fetch.run(Fetch.java:128) at org.eclipse.jgit.pgm.TextBuiltin.execute(TextBuiltin.java:199) at org.eclipse.jgit.pgm.Main.execute(Main.java:250) at org.eclipse.jgit.pgm.Main.run(Main.java:142) at org.eclipse.jgit.pgm.Main.main(Main.java:114) Caused by: org.eclipse.jgit.errors.TransportException: Remote does not have e82c7a814fb7e1254ea82b701c2471b8d3bff7d9 available for fetch. at org.eclipse.jgit.transport.FetchProcess.expandSingle(FetchProcess.java:365) at org.eclipse.jgit.transport.FetchProcess.executeImp(FetchProcess.java:149) at org.eclipse.jgit.transport.FetchProcess.execute(FetchProcess.java:122) at org.eclipse.jgit.transport.Transport.fetch(Transport.java:1201) at org.eclipse.jgit.api.FetchCommand.call(FetchCommand.java:128) ... 5 more + cd .. + kill %1 [1] https://gist.github.com/chalstrick/942a1ebc0be01d4e350cdc9c1ba9e45c From:
"Halstrick, Christian" <christian.halstrick@xxxxxxx> I think that “allowreachablesha1inwant” is a server side configuration parameter. And I think Alaa has only control over the client side, right? The parameter
configures a JGit based server to answer correctly when a git client triggers a “git fetch origin <sha1>:…” command. This parameter doesn’t help on the client side.
We have to teach JGit client side to be not so strict when matching what the client wants to what the server advertises. During a fetch the Git server will send
back it’s advertised refs (tags and branches) and JGits client side FetchProcess explicitly checks that the objects the clients wants are among the objects pointed to by the servers advertised refs. From:
Alaa Nassef <alan.125@xxxxxxxxx> Unfortunately, that didn't work. Tried to set config as both boolean and String, and tried
allowreachablesha1inwant as well as allowReachableSHA1InWant but got no difference. Thanks a lot
for your time anyway On Mon, Feb 13, 2017 at 5:44 PM, Matthias Sohn <matthias.sohn@xxxxxxxxx> wrote:
|