[pkg-perl-tools] 01/01: Option -g now even no more creates debian/upstream/metadata

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository pkg-perl-tools.

commit c564b1a310f4b42fac49295b95fed6d68d66929c
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat May 21 17:08:00 2016 +0200

    Option -g now even no more creates debian/upstream/metadata
    
    This caused issues with follow-up pulls when the
    ebian/upstream/metadata file has been created on the initial checkout.
---
 debian/changelog      |  3 +++
 scripts/upstream-repo | 24 ++++++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4acb556..5e09ec1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ pkg-perl-tools (0.30) UNRELEASED; urgency=medium
   * Add alexm to debian/copyright for scripts/forward.
   * Switch some more URLs in debian/* to HTTPS.
 
+  [ Axel Beckert ]
+  * Option -g now even no more creates debian/upstream/metadata.
+
  -- gregor herrmann <gregoa at debian.org>  Fri, 20 May 2016 14:25:58 +0200
 
 pkg-perl-tools (0.29) unstable; urgency=medium
diff --git a/scripts/upstream-repo b/scripts/upstream-repo
index f3d6d06..4fd3fb5 100755
--- a/scripts/upstream-repo
+++ b/scripts/upstream-repo
@@ -43,16 +43,14 @@ if ! git remote show | grep -qx upstream-repo ; then
 	REPO=$(perl -MDebian::Copyright -E '$c = Debian::Copyright->new(); $c->read("debian/copyright"); say $c->header()->Source' | grep -oE "git(?:+ssh)?:.+$" || true)
 
 	# case 2: Repository in d/upstream
-	if [ -z "$REPO" -a ! -e debian/upstream/metadata ] ; then
+	if [ -z "$REPO" -a ! -e debian/upstream/metadata -a "$NOGIT" -eq "0" ] ; then
 		warn "No 'debian/upstream/metadata' file found, trying to create it ..."
 		dpt debian-upstream || true
-		if [ -e debian/upstream/metadata -a "$NOGIT" -eq "0" ] ; then
-			git add debian/upstream/metadata
-			git commit -m "Add debian/upstream/metadata"
-			dch --no-auto-nmu --mainttrailer --release-heuristic=changelog "Add debian/upstream/metadata"
-			git add debian/changelog
-			git commit -m "Update debian/changelog" -m "Gbp-Dch: Ignore"
-		fi
+		git add debian/upstream/metadata
+		git commit -m "Add debian/upstream/metadata"
+		dch --no-auto-nmu --mainttrailer --release-heuristic=changelog "Add debian/upstream/metadata"
+		git add debian/changelog
+		git commit -m "Update debian/changelog" -m "Gbp-Dch: Ignore"
 	fi
 	if [ -z "$REPO" -a -e debian/upstream/metadata ] ; then
 		# XXX use something better than awk to parse this YAML file?
@@ -100,8 +98,14 @@ doesn't exist, the latter is created with L<dpt-debian-upstream(1)>.
 
 =item B<-g>
 
-Don't run C<git add debian/upstream/metadata; git commit> after creating
-F<debian/upstream/metadata> via B<dpt debian-upstream>.
+Don't create F<debian/upstream/metadata>.
+
+Used for initial cloning, e.g. with B<mr up>: We want the upstream
+repo being added if debian/upstream/metadata exists.
+
+The letter B<g> is used for historical reasons because initially this
+option only suppressed the automatic committing to the B<g>it
+repository.
 
 =back
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pkg-perl-tools.git