summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-07-16 15:03:27 +0200
committerJunio C Hamano <gitster@pobox.com>2011-07-19 11:17:47 -0700
commitb4b872994b59be397519ff76354ba4002e74de48 (patch)
treefc1cb1b29ac002713eea1b1e9d6b5b67313b436a
parent3ea7d09461e4e1b95f6a55f04b2eb66d929464bd (diff)
downloadgit-b4b872994b59be397519ff76354ba4002e74de48.tar.gz
git_remote_helpers: push all refs during a non-local export
When a remote helper exports to a non-local git repo, the steps are roughly: 1. fast-export into a local staging area; the set of interesting refs is defined by what is in the fast-export stream 2. git push from the staging area to the non-local repo In the second step, we should explicitly push all refs, not just matching ones. This will let us push refs that do not yet exist in the remote repo. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--git_remote_helpers/git/non_local.py2
-rwxr-xr-xt/t5800-remote-helpers.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/git_remote_helpers/git/non_local.py b/git_remote_helpers/git/non_local.py
index f27389bb94..c53e07445a 100644
--- a/git_remote_helpers/git/non_local.py
+++ b/git_remote_helpers/git/non_local.py
@@ -63,7 +63,7 @@ class NonLocalGit(object):
if not os.path.exists(path):
die("could not find repo at %s", path)
- args = ["git", "--git-dir=" + path, "push", "--quiet", self.repo.gitpath]
+ args = ["git", "--git-dir=" + path, "push", "--quiet", self.repo.gitpath, "--all"]
child = subprocess.Popen(args)
if child.wait() != 0:
raise CalledProcessError
diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh
index ceb0010574..12f471c070 100755
--- a/t/t5800-remote-helpers.sh
+++ b/t/t5800-remote-helpers.sh
@@ -115,7 +115,7 @@ test_expect_success 'push when remote has extra refs' '
compare_refs clone master server master
'
-test_expect_failure 'push new branch by name' '
+test_expect_success 'push new branch by name' '
(cd clone &&
git checkout -b new-name &&
echo content >>file &&