From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 28 Sep 2016 23:33:03 +0000 (+0100)
Subject: New import: mktree_in_ud_from_only_subdir: New $raw parameter (nfc)
X-Git-Tag: archive/debian/2.0~101
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=68935a4a1859107483111d4db9e69798c5bf2714

New import: mktree_in_ud_from_only_subdir: New $raw parameter (nfc)

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

diff --git a/dgit b/dgit
index cdf2e93b..b1883614 100755
--- a/dgit
+++ b/dgit
@@ -1374,7 +1374,9 @@ sub remove_stray_gits () {
     $!=0; $?=0; close GITS or failedcmd @gitscmd;
 }
 
-sub mktree_in_ud_from_only_subdir () {
+sub mktree_in_ud_from_only_subdir (;$) {
+    my ($raw) = @_;
+
     # changes into the subdir
     my (@dirs) = <*/.>;
     die "@dirs ?" unless @dirs==1;
@@ -1384,10 +1386,13 @@ sub mktree_in_ud_from_only_subdir () {
 
     remove_stray_gits();
     mktree_in_ud_here();
-    my ($format, $fopts) = get_source_format();
-    if (madformat($format)) {
-	rmtree '.pc';
+    if (!$raw) {
+	my ($format, $fopts) = get_source_format();
+	if (madformat($format)) {
+	    rmtree '.pc';
+	}
     }
+
     runcmd @git, qw(add -Af);
     my $tree=git_write_tree();
     return ($tree,$dir);