diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-07-26 21:37:43 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2015-07-26 22:54:29 +0100 |
commit | d33fa1545969c40c257a02c3a442b1e47d291b16 (patch) | |
tree | f99f4a54ee3b4f04e3dacd63f4b32c888bd4b563 /dgit | |
parent | b1772b364e75b32c413db7060a0adf8b124c84db (diff) |
Make configuration able to prevent dpkg-mergechangelogs setup.
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1638,7 +1638,10 @@ sub set_local_git_config ($$) { runcmd @git, qw(config), $k, $v; } -sub setup_mergechangelogs () { +sub setup_mergechangelogs (;$) { + my ($always) = @_; + return unless $always || access_cfg_bool(1, 'setup-mergechangelogs'); + my $driver = 'dpkg-mergechangelogs'; my $cb = "merge.$driver"; my $attrs = '.git/info/attributes'; @@ -3021,7 +3024,7 @@ sub cmd_clone_dgit_repos_server { sub cmd_setup_mergechangelogs { badusage "no arguments allowed to dgit setup-mergechangelogs" if @ARGV; - setup_mergechangelogs(); + setup_mergechangelogs(1); } #---------- argument parsing and main program ---------- |