From 5a453a69bd237e3921a6db60f675bdaefb741014 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 18 Jul 2015 18:32:49 +0100
Subject: [PATCH] Make dgit-ssh-dispatch not spew (harmless) warnings if caller
 tries for a shell session (ie SSH_ORIGINAL_COMMAND not set).

---
 debian/changelog        | 4 +++-
 infra/dgit-ssh-dispatch | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b5ae3267..606a3dd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ dgit (0.31~~) unstable; urgency=low
   Infrastructure:
   * Provide for mirroring git updates to a different server.
   * Provide cgit-regen-config command for cgi-grnet-01.
+  * Make dgit-ssh-dispatch not spew (harmless) warnings if caller
+    tries for a shell session (ie SSH_ORIGINAL_COMMAND not set).
 
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 11 Jul 2015 14:30:19 +0100
+ --
 
 dgit (0.30) unstable; urgency=high
 
diff --git a/infra/dgit-ssh-dispatch b/infra/dgit-ssh-dispatch
index ed9a23d5..9c023d80 100755
--- a/infra/dgit-ssh-dispatch
+++ b/infra/dgit-ssh-dispatch
@@ -119,7 +119,7 @@ sub serve_up ($) {
 }
 
 sub dispatch () {
-    local ($_) = $ENV{'SSH_ORIGINAL_COMMAND'};
+    local ($_) = $ENV{'SSH_ORIGINAL_COMMAND'} // '';
 
     if (m#^: dgit ($lre) git-check ($lre) ;#) {
 	selectpackage $1,$2, sub { prl "divert @_"; finish; };
-- 
2.30.2