diff options
| author | Jonathan Nieder <jrn@google.com> | 2018-06-20 21:23:49 -0700 |
|---|---|---|
| committer | Jonathan Nieder <jrn@google.com> | 2018-06-20 21:24:05 -0700 |
| commit | 82ae431e45cc673aab147dde3e25402d5c9fe1b4 (patch) | |
| tree | abe243fc4f7947844d93fc4dc98d161d4e9709fe | |
| parent | 2e76daec146cdba5d8db44f3fbc81472773232fd (diff) | |
| parent | 7df024b2761d5604ca8a63e0cc2324ce2f477c6f (diff) | |
| download | jgit-82ae431e45cc673aab147dde3e25402d5c9fe1b4.tar.gz jgit-82ae431e45cc673aab147dde3e25402d5c9fe1b4.zip | |
Merge branch 'stable-5.0'
* stable-5.0:
Respect "unshallow" lines in protocol v2
Temporarily @Ignore flaky CommitCommandTest methods
Change-Id: I14bd522d2f6bafb1b41e3c730d6dbef827e3e88a
Signed-off-by: Jonathan Nieder <jrn@google.com>
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index f70ead9294..7de0506bb3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -1082,7 +1082,7 @@ public class UploadPack { includeTag ? db.getRefDatabase().getRefsByPrefix(R_TAGS) : null, - new ArrayList<ObjectId>()); + unshallowCommits); } pckOut.end(); } |