From 72b082a5103ecf790383c66f3e2570028562afee Mon Sep 17 00:00:00 2001
From: Jack Zhou <jack.zhou@hulu.com>
Date: Tue, 18 Jun 2013 16:46:46 -0700
Subject: [PATCH] Change [DETACHED HEAD] message to a short hash of the
 detached head.

---
 powerline/lib/vcs/git.py |  2 +-
 tests/test_lib.py        | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/powerline/lib/vcs/git.py b/powerline/lib/vcs/git.py
index 09c029c6..a8514ad8 100644
--- a/powerline/lib/vcs/git.py
+++ b/powerline/lib/vcs/git.py
@@ -17,7 +17,7 @@ def branch_name_from_config_file(directory, config_file):
 	m = _ref_pat.match(raw)
 	if m is not None:
 		return m.group(1).decode('utf-8', 'replace')
-	return '[DETACHED HEAD]'
+	return raw[:7]
 
 def get_branch_name(base_dir):
 	head = os.path.join(base_dir, '.git', 'HEAD')
diff --git a/tests/test_lib.py b/tests/test_lib.py
index c3f89525..18326d72 100644
--- a/tests/test_lib.py
+++ b/tests/test_lib.py
@@ -5,6 +5,7 @@ from powerline.lib.vcs import guess
 from subprocess import call, PIPE
 import os
 import sys
+import re
 from functools import partial
 from tests import TestCase, SkipTest
 
@@ -130,10 +131,17 @@ class TestVCS(TestCase):
 		while time.time() - st < 1:
 			# Give inotify time to deliver events
 			ans = repo.branch()
-			if ans == q:
-				break
+			if hasattr(q, '__call__'):
+				if q(ans):
+					break
+			else:
+				if ans == q:
+					break
 			time.sleep(0.01)
-		self.assertEqual(ans, q)
+		if hasattr(q, '__call__'):
+			self.assertTrue(q(ans))
+		else:
+			self.assertEqual(ans, q)
 
 	def test_git(self):
 		repo = guess(path=GIT_REPO)
@@ -167,7 +175,7 @@ class TestVCS(TestCase):
 		call(['git', 'checkout', '-q', 'branch2'], cwd=GIT_REPO)
 		self.do_branch_rename_test(repo, 'branch2')
 		call(['git', 'checkout', '-q', '--detach', 'branch1'], cwd=GIT_REPO)
-		self.do_branch_rename_test(repo, '[DETACHED HEAD]')
+		self.do_branch_rename_test(repo, lambda b: re.match(r'^[a-f0-9]+$', b))
 
 	if use_mercurial:
 		def test_mercurial(self):