RE: [PATCH v3 06/10] remote-hg: disable forced push by default
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- May 14, 2013, 20:23 UTC
- Message-ID
- <51929d2c37125_13a8f89e181936@nysa.mail>
- In-Reply-To
- <1368486720-2716-7-git-send-email-felipe.contreras@gmail.com>
And here is the important fix. We are essentially reverting back to the old v1.8.2 behavior, to minimize the possibility of regressions, but in a way the user can configure.
The cleanups before made it so this patch eas easy and simple.
And the fix before this makes it so the new default force_push=False still is able to push new branches, so we don't disable other v1.8.3 features.
Felipe Contreras wrote:
Show 25 quoted lines
> In certain situations we might end up pushing garbage revisions (e.g. in
> a rebase), and the patches to deal with that haven't been merged yet.
>
> So let's disable forced pushes by default.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
> contrib/remote-helpers/git-remote-hg | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
> index 3cf9b4c..53412dd 100755
> --- a/contrib/remote-helpers/git-remote-hg
> +++ b/contrib/remote-helpers/git-remote-hg
> @@ -914,7 +914,7 @@ def main(args):
>
> hg_git_compat = get_config_bool('remote-hg.hg-git-compat')
> track_branches = get_config_bool('remote-hg.track-branches', True)
> - force_push = get_config_bool('remote-hg.force-push', True)
> + force_push = get_config_bool('remote-hg.force-push')
>
> if hg_git_compat:
> mode = 'hg'
> --
> 1.8.3.rc1.579.g184e698-- Felipe Contreras