From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 26 Jul 2018 06:59:30 +0000 (+0100)
Subject: dgit: Abolish build_source_for_push
X-Git-Tag: archive/debian/6.0~18
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=593dbae1303117fc730c28da7f7e3d767d77f777;ds=sidebyside

dgit: Abolish build_source_for_push

This sub has only one caller and the indirection is not really
helpful IMO.

NFC.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index b3c95c7c..c3638216 100755
--- a/dgit
+++ b/dgit
@@ -4770,7 +4770,10 @@ sub cmd_push_source {
         }
     } else {
         # Building a source package is very fast, so just do it
-        build_source_for_push();
+	build_source();
+	die "er, patches are applied dirtily but shouldn't be.."
+	    if $patches_applied_dirtily;
+	$changesfile = $sourcechanges;
     }
     dopush();
 }
@@ -6409,13 +6412,6 @@ sub cmd_gbp_build {
 }
 sub cmd_git_build { cmd_gbp_build(); } # compatibility with <= 1.0
 
-sub build_source_for_push {
-    build_source();
-    die "er, patches are applied dirtily but shouldn't be.."
-      if $patches_applied_dirtily;
-    $changesfile = $sourcechanges;
-}
-
 sub build_source {
     build_prep_early();
     build_prep();