From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 23 Aug 2013 11:24:16 +0000 (+0100)
Subject: In push, do git fetch as well as archive fetch, or archive fetch can fail.
X-Git-Tag: debian/0.8^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=9d4fe1fe846ac76795a42661aa4bb73335c07aad;hp=0783d2b7923f56e004808cd68da81a6a4178f4fb

In push, do git fetch as well as archive fetch, or archive fetch can fail.
---

diff --git a/debian/changelog b/debian/changelog
index ed269fe7..87d00e13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ dgit (0.8) unstable; urgency=low
   * When creating repos in dgit-repos (using the ssh-cmd method),
     copy _template rather than using mkdir and git init.
     Closes: #720522.
+  * In push, do git fetch as well as archive fetch, or archive
+    fetch can fail.
 
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 23 Aug 2013 12:15:10 +0100
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Fri, 23 Aug 2013 12:24:09 +0100
 
 dgit (0.7) unstable; urgency=low
 
diff --git a/dgit b/dgit
index 8911c8e2..f9c46c03 100755
--- a/dgit
+++ b/dgit
@@ -938,6 +938,9 @@ sub cmd_push {
     } else {
 	badusage "incorrect arguments to dgit push";
     }
+    if (check_for_git()) {
+	git_fetch_us();
+    }
     if (fetch_from_archive()) {
 	is_fast_fwd(lrref(), 'HEAD') or die;
     } else {