summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2019-09-05 09:08:48 -0700
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-09-05 18:15:20 +0100
commit612beece6df32e68c70d04284280601f7a7825ca (patch)
treeb63127bda4ed2b2255687c139a0395607dc19d44
parentc274564cf3847ca3039dc80548097569bba193c6 (diff)
dgit-maint-{merge,debrebase}(7): Use git fetch --all --tags
`git remote update` doesn't fetch tags unless remote branches include the commits at which those tags point. Thus, if upstream pushes their release tag but fails to push their master branch, `git remote update` will not fetch the release tag. I've been in this situation more than once when following the workflows detailed in these manpages, so let's just recommend a command which will definitely try to fetch the latest release tag. Closes: #939504 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--dgit-maint-debrebase.7.pod2
-rw-r--r--dgit-maint-merge.7.pod2
2 files changed, 2 insertions, 2 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index 9c9598b..27c97aa 100644
--- a/dgit-maint-debrebase.7.pod
+++ b/dgit-maint-debrebase.7.pod
@@ -353,7 +353,7 @@ release, and importing that release using git-debrebase(1).
=over 4
- % git remote update
+ % git fetch --all --tags
=back
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 0ccd8c7..37a0261 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -362,7 +362,7 @@ to git), you can just run dpkg-buildpackage(1) or debuild(1) instead.
=over 4
- % git remote update
+ % git fetch --all --tags
=back