From 38b8cc309c7960a312f375b60dad41ef17ba2739 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Apr 2015 16:01:04 +0100
Subject: LANG, LC_*: Consistently set required LC_* env vars

---
 dgit                         | 2 +-
 tests/tests/drs-push-rejects | 2 +-
 tests/tests/push-newpackage  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dgit b/dgit
index e5c8eab..3a79bb6 100755
--- a/dgit
+++ b/dgit
@@ -935,7 +935,7 @@ sub sshpsql ($$$) {
     my @rows;
     my @cmd = (access_cfg_ssh, $userhost,
 	       access_runeinfo("ssh-psql $runeinfo").
-	       " export LANG=C;".
+	       " export LC_MESSAGES=C; export LC_CTYPE=C;".
 	       " ".shellquote qw(psql -A), $dbname, qw(-c), $sql);
     printcmd(\*DEBUG,$debugprefix."|",@cmd) if $debug>0;
     open P, "-|", @cmd or die $!;
diff --git a/tests/tests/drs-push-rejects b/tests/tests/drs-push-rejects
index f6f8882..df90d22 100755
--- a/tests/tests/drs-push-rejects
+++ b/tests/tests/drs-push-rejects
@@ -86,7 +86,7 @@ for h in object type tag; do
     cat badtag.asc >>badtag
 
     set +e
-    LC_ALL=C git hash-object -w -t tag badtag >badtag.hash 2>badtag.err
+    LC_MESSAGES=C git hash-object -w -t tag badtag >badtag.hash 2>badtag.err
     rc=$?
     set -e
 
diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage
index 5d23faa..2bfa5d5 100755
--- a/tests/tests/push-newpackage
+++ b/tests/tests/push-newpackage
@@ -8,7 +8,7 @@ cd $p
 t-refs-same-start
 t-ref-head
 
-LANG=C t-dgit push 2>&1 \
+LC_MESSAGES=C t-dgit push 2>&1 \
 	| tee /dev/stderr \
 	| grep 'package appears to be new in this suite' >/dev/null
 
-- 
cgit v1.2.3