From 8a1d8da0cc4501872244b2b90058421738cd882a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 20 Oct 2010 14:04:26 -0400
Subject: Deal with strange systems that include the domain name in the
 hostname, by stripping it. Closes: #600026

---
 commit.d/50vcs-commit | 1 +
 debian/changelog      | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/commit.d/50vcs-commit b/commit.d/50vcs-commit
index 7fb4809..6e509e6 100755
--- a/commit.d/50vcs-commit
+++ b/commit.d/50vcs-commit
@@ -22,6 +22,7 @@ else
 fi
 
 hostname=`hostname`
+hostname="${hostname%%.*}"
 dnsdomainname=`dnsdomainname 2>/dev/null || true`
 if [ -n "$dnsdomainname" ]; then
 	hostname="$hostname.$dnsdomainname"
diff --git a/debian/changelog b/debian/changelog
index f800d72..81f2d62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ etckeeper (0.50) UNRELEASED; urgency=low
     git. Fixes #549354 for git, but not for other VCSs.
   * Set GIT_COMMITTER_EMAIL to root@$hostname to avoid git prompting
     the user to configure it in .gitconfig. Closes: #599749
+  * Deal with strange systems that include the domain name in the hostname,
+    by stripping it. Closes: #600026
 
  -- Joey Hess <joeyh@debian.org>  Wed, 22 Sep 2010 17:45:57 -0400
 
-- 
cgit v1.2.3