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

diff --git a/debian/changelog b/debian/changelog
index ed269fe762b8520d533144c8e5a2a73fedc80d13..87d00e13bee9daf0f3cf96edbdd24eccef886a68 100644 (file)
--- 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 8911c8e2a35c1fe0d05df4e98f735744a0c47aaf..f9c46c036cb00c037a6457e87546eac5f6a35c30 100755 (executable)
--- 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 {