Discussion:
Bug#945994: dgit-maint-merge(7) should talk about pushing to salsa
Add Reply
Matthew Vernon
2019-12-02 14:30:02 UTC
Reply
Permalink
Package: dgit
Version: 4.3
Severity: wishlist

Hi,

It would be nice if dgit-maint-merge(7) provided more advice on
pushing to salsa, specifically:

The various setup sections do describe e.g.
% git push --follow-tags -u origin master

...and while this is nice, it should (I think) be possible to provide
git config runes so that git push does what you wanted by default -
git-push(1) alludes to this:

When the command line does not specify what to push with <refspec>...
arguments or --all, --mirror, --tags options, the command finds the
default <refspec> by consulting remote.*.push configuration

BUILDING AND UPLOADING should also mention pushing to salsa

[I mentioned this to Ian on IRC, and they weren't sure if
--follow-tags was always the right answer]

Thanks,

Matthew

-- System Information:
Debian Release: buster/sid
APT prefers bionic-updates
APT policy: (500, 'bionic-updates'), (500, 'bionic-security'), (500, 'bionic'), (100, 'bionic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.15.0-34-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages dgit depends on:
ii apt 1.6.12
ii ca-certificates 20180409
ii coreutils 8.28-1ubuntu1
ii curl 7.58.0-2ubuntu3.8
ii devscripts 2.17.12ubuntu1.1
ii dpkg-dev 1.19.0.5ubuntu2.3
ii dput 1.0.1ubuntu1
ii git [git-core] 1:2.17.1-1ubuntu0.4
ii git-buildpackage 0.9.8
ii git-core 1:2.7.4-0ubuntu1.4
ii libdpkg-perl 1.19.0.5ubuntu2.3
ii libjson-perl 2.97001-1
ii liblist-moreutils-perl 0.416-1build3
ii libperl5.26 [libdigest-sha-perl] 5.26.1-6ubuntu0.3
ii libtext-glob-perl 0.10-1
ii libtext-iconv-perl 1.7-5build6
ii libwww-perl 6.31-1ubuntu0.1
ii perl 5.26.1-6ubuntu0.3

Versions of packages dgit recommends:
ii openssh-client [ssh-client] 1:7.6p1-4ubuntu0.3

Versions of packages dgit suggests:
ii sbuild 0.75.0-1ubuntu1

-- no debconf information
--
The Wellcome Sanger Institute is operated by Genome Research
Limited, a charity registered in England with number 1021457 and a
company registered in England with number 2742969, whose registered
office is 215 Euston Road, London, NW1 2BE.
Sean Whitton
2019-12-02 16:00:02 UTC
Reply
Permalink
Hello Matthew,
Post by Matthew Vernon
It would be nice if dgit-maint-merge(7) provided more advice on
The various setup sections do describe e.g.
% git push --follow-tags -u origin master
...and while this is nice, it should (I think) be possible to provide
git config runes so that git push does what you wanted by default -
When the command line does not specify what to push with <refspec>...
arguments or --all, --mirror, --tags options, the command finds the
default <refspec> by consulting remote.*.push configuration
Actually, the '-u' in that command alters your .git/config such that a
subsequent plain `git push` will push master to salsa.

--follow-tags does need a separate git config option, which could be
added, but it might be too much automation. The potential problem is
that you can accidentally push debian/foo tags to a remote other than
salsa, such as upstream's git repo, if you happen to have push access to
that (I've managed to do this before, though I think it was with
--tags). What do you think about this risk?

Were you looking for anything beyond these two things?
Post by Matthew Vernon
BUILDING AND UPLOADING should also mention pushing to salsa
Yes.
--
Sean Whitton
Matthew Vernon
2019-12-02 17:30:02 UTC
Reply
Permalink
Post by Sean Whitton
Post by Matthew Vernon
The various setup sections do describe e.g.
% git push --follow-tags -u origin master
Actually, the '-u' in that command alters your .git/config such that a
subsequent plain `git push` will push master to salsa.
Yes, but unless I am terminally confused about git, if I want to be
pushing two branches (e.g. upstream and master) then this doesn't DWIW?
Post by Sean Whitton
--follow-tags does need a separate git config option, which could be
added, but it might be too much automation. The potential problem is
that you can accidentally push debian/foo tags to a remote other than
salsa, such as upstream's git repo, if you happen to have push access to
that (I've managed to do this before, though I think it was with
--tags). What do you think about this risk?
Ah, yes, that might be a problem. But, for example, I will always want
to push these tags to salsa, so maybe something on a per-remote basis?
Post by Sean Whitton
Were you looking for anything beyond these two things?
No.

Regards,

Matthew

Loading...