summaryrefslogtreecommitdiff
path: root/git_review
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2021-04-09 13:16:52 -0700
committerClark Boylan <clark.boylan@gmail.com>2021-04-12 11:38:23 -0700
commit39cd763d5d3ae310b00e54f6fc24eba993ed57f5 (patch)
tree2be7a830b936c452aedadedbbca7d10b6a7e1210 /git_review
parent18189abf59723b8f754b6e0fea72e9de18d2067f (diff)
downloadgit-review-39cd763d5d3ae310b00e54f6fc24eba993ed57f5.tar.gz
Add option for disabling thin pushes
There is a long standing issue with C Git pushing to Gerrit and Jgit where the occasional push will fail because the negotiated packs are missing a tree object. This happens very occasionally but when it does it would be nice to be able to point users at an easy workaround. Pushing with --no-thin is that workaround. Note that --no-thin is much less efficient so shouldn't be used by default. This old bug, https://bugs.launchpad.net/git-review/+bug/1332549, has details but it seems to affect current C git and Gerrit+Jgit. Change-Id: Id6ba52a656a14c921acab1b14ef668e6251245da
Diffstat (limited to 'git_review')
-rw-r--r--git_review/cmd.py11
-rw-r--r--git_review/tests/test_git_review.py9
2 files changed, 18 insertions, 2 deletions
diff --git a/git_review/cmd.py b/git_review/cmd.py
index b3e7e38..a97a20c 100644
--- a/git_review/cmd.py
+++ b/git_review/cmd.py
@@ -1538,6 +1538,9 @@ additional information:
parser.add_argument("-l", "--list", dest="list", action="count",
help="List available reviews for the current project, "
"if passed more than once, will show more information")
+ parser.add_argument("--no-thin", dest="no_thin", action="store_true",
+ help="git push with --no-thin. This may workaround "
+ "issues with pushing in some circumstances.")
parser.add_argument("-y", "--yes", dest="yes", action="store_true",
help="Indicate that you do, in fact, understand if "
"you are submitting more than one patch")
@@ -1701,10 +1704,14 @@ additional information:
sys.exit(1)
assert_one_change(remote, branch, yes, have_hook)
+ no_thin = ''
+ if options.no_thin:
+ no_thin = '--no-thin'
+
ref = "for"
- cmd = ("git push --no-follow-tags %s HEAD:refs/%s/%s" %
- (remote, ref, branch))
+ cmd = ("git push --no-follow-tags %s %s HEAD:refs/%s/%s" %
+ (no_thin, remote, ref, branch))
push_options = []
if options.topic is not None:
topic = options.topic
diff --git a/git_review/tests/test_git_review.py b/git_review/tests/test_git_review.py
index 7bf89af..d988e1d 100644
--- a/git_review/tests/test_git_review.py
+++ b/git_review/tests/test_git_review.py
@@ -501,6 +501,15 @@ class GitReviewTestCase(tests.BaseGitReviewTestCase):
def test_git_review_F_R(self):
self.assertRaises(Exception, self._run_git_review, '-F', '-R')
+ def test_git_review_no_thin(self):
+ """Test git-review --no-thin."""
+ self._run_git_review('-s')
+
+ # Push with --no-thin set. We can't really introspect the packs
+ # that were sent so we infer success as the command not failing.
+ self._simple_change('test file modified', 'test commit message')
+ self._run_git_review('--no-thin')
+
def test_config_instead_of_honored(self):
self.set_remote('test_project_url')