RE: [PATCH v3 03/10] remote-hg: enable track-branches in hg-git mode
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:57:15
No regression here either, we simply give more power to the user. Felipe Contreras wrote:
quoted hunk ↗ jump to hunk
The user can turn this off. Signed-off-by: Felipe Contreras <redacted> --- contrib/remote-helpers/git-remote-hg | 1 - contrib/remote-helpers/test-hg-hg-git.sh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 9d6940b..de3a96e 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg@@ -909,7 +909,6 @@ def main(args): if get_config('remote-hg.hg-git-compat') == 'true\n': hg_git_compat = True - track_branches = False if get_config('remote-hg.track-branches') == 'false\n': track_branches = False if get_config('remote-hg.force-push') == 'false\n':diff --git a/contrib/remote-helpers/test-hg-hg-git.sh b/contrib/remote-helpers/test-hg-hg-git.sh index 0c36573..7f579c8 100755 --- a/contrib/remote-helpers/test-hg-hg-git.sh +++ b/contrib/remote-helpers/test-hg-hg-git.sh@@ -102,6 +102,7 @@ setup () { ) >> "$HOME"/.hgrc && git config --global receive.denycurrentbranch warn git config --global remote-hg.hg-git-compat true + git config --global remote-hg.track-branches false HGEDITOR=/usr/bin/true-- 1.8.3.rc1.579.g184e698
-- Felipe Contreras