From e7575cd1b2f7d9f16a4b663d6b06293a89013ab6 Mon Sep 17 00:00:00 2001 From: Anrs Hu Date: Wed, 29 May 2013 19:22:48 +0800 Subject: [PATCH 1/2] bugfix for git 1.8.3, in git 1.8.3 the default branch name is "detached from REVISION" when you `git checkout -q `. If doesn't skip it then `git rev-parse ...` will raise a error while invoking Git._get_revision_from_rev_parse method. --- pip/vcs/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip/vcs/git.py b/pip/vcs/git.py index abb57ac7a..7a8cefef4 100644 --- a/pip/vcs/git.py +++ b/pip/vcs/git.py @@ -142,7 +142,7 @@ class Git(VersionControl): branches = self._get_all_branch_names(location) branch_revs = {} for line in branches.splitlines(): - if '(no branch)' in line: + if '(no branch)' in line or '(detached from ' in line: continue line = line.split('->')[0].strip() # actual branch case From c6fab6ac5424b18f5cbae9a0ca1aeedfe053a36a Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Wed, 29 May 2013 17:02:52 -0600 Subject: [PATCH 2/2] Update changelog and AUTHORS for Git fix. --- AUTHORS.txt | 1 + CHANGES.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/AUTHORS.txt b/AUTHORS.txt index 1f337fd41..24fcd5ec9 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -2,6 +2,7 @@ Alex Grönholm Alex Morega Alexandre Conrad Andrey Bulgakov +Anrs Hu Antti Kaihola Armin Ronacher Aziz Köksal diff --git a/CHANGES.txt b/CHANGES.txt index 73580cc63..db6d7c64b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,6 +4,8 @@ Changelog 1.3.2 (unreleased) ------------------ +* Fixed git backend with git 1.8.3. (Pull #996) + * Fixed the proxy support, which was broken in pip-1.3. (Pull #840) 1.3.1 (2013-03-08)