From 55139a910de527575606d9efa0defdbf28c96c65 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 9 Oct 2016 12:11:38 +0100
Subject: Arrange for the special dgit remote to be skipped by git fetch --all
 etc.

Closes:#827892.

Not quite the patch from Sean: we want to do this on every fetch, and
we don't overwrite the user's configuration if for some reason they
have set this (hopefully they haven't...)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'dgit')

diff --git a/dgit b/dgit
index a96f471..34152ee 100755
--- a/dgit
+++ b/dgit
@@ -2136,6 +2136,8 @@ sub mergeinfo_version ($) {
 }
 
 sub fetch_from_archive () {
+    ensure_setup_existing_tree();
+
     # Ensures that lrref() is what is actually in the archive, one way
     # or another, according to us - ie this client's
     # appropritaely-updated archive view.  Also returns the commit id.
@@ -2535,6 +2537,13 @@ sub setup_useremail (;$) {
     $setup->('name', 'DEBFULLNAME');
 }
 
+sub ensure_setup_existing_tree () {
+    my $k = "remote.$remotename.skipdefaultupdate";
+    my $c = git_get_config $k;
+    return if defined $c;
+    set_local_git_config $k, 'true';
+}
+
 sub setup_new_tree () {
     setup_mergechangelogs();
     setup_useremail();
-- 
cgit v1.2.3