From d90b01f1085865ba2a6e2b31de82a9c6933d8d31 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 26 May 2013 20:49:16 -0400
Subject: XMPP: Fix a file descriptor leak.

---
 Assistant/XMPP/Git.hs | 1 +
 debian/changelog      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Assistant/XMPP/Git.hs b/Assistant/XMPP/Git.hs
index 01585a711..b42a2d533 100644
--- a/Assistant/XMPP/Git.hs
+++ b/Assistant/XMPP/Git.hs
@@ -137,6 +137,7 @@ xmppPush cid gitpush = do
 	liftIO $ do
 		mapM_ killThread [t1, t2]
 		mapM_ hClose [inh, outh, controlh]
+		closeFd writecontrol
 	
 	return r
   where
diff --git a/debian/changelog b/debian/changelog
index 29c4d5d6c..6fa8151ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ git-annex (4.20130522) UNRELEASED; urgency=low
   * content: New command line way to view and configure a repository's
     preferred content settings.
   * sync: Fix double merge conflict resolution handling.
+  * XMPP: Fix a file descriptor leak.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 21 May 2013 18:22:46 -0400
 
-- 
cgit v1.2.3