From c670678db0befbe56499378e7f14ae1e7daa290f Mon Sep 17 00:00:00 2001
From: Carl Meyer <carl@oddbird.net>
Date: Thu, 14 Jun 2012 13:07:16 -0600
Subject: [PATCH] Update AUTHORS and changelog for git submodules.

---
 AUTHORS.txt           |  1 +
 docs/news.txt         |  3 +++
 tests/test_vcs_git.py | 16 +++++++++-------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index ef089ab1bce..515eb20e2f1 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -28,6 +28,7 @@ Luke Macken
 Masklinn
 Marc Abramowitz
 Marcus Smith
+Markus Hametner
 Matt Maker
 Nick Stenning
 Nowell Strite
diff --git a/docs/news.txt b/docs/news.txt
index 28f71197f18..4ca54ee8f51 100644
--- a/docs/news.txt
+++ b/docs/news.txt
@@ -13,6 +13,9 @@ Beta and final releases planned for the second half of 2012.
 develop (unreleased)
 -------------------
 
+* Pull in submodules for git editable checkouts. Fixes #289 and #421. Thanks
+  Hsiaoming Yang and Markus Hametner.
+
 * Use a temporary directory as the default build location outside of a
   virtualenv. Fixes issues #339 and #381. Thanks TC01.
 
diff --git a/tests/test_vcs_git.py b/tests/test_vcs_git.py
index ac6f69b5ace..206e8051272 100644
--- a/tests/test_vcs_git.py
+++ b/tests/test_vcs_git.py
@@ -2,7 +2,11 @@
 from pip.vcs.git import Git
 from tests.test_pip import (reset_env, run_pip,
                             _create_test_package,)
-from tests.git_submodule_helpers import _create_test_package_submodule, _change_test_package_submodule, _pull_in_submodule_changes_to_module, _create_test_package_with_submodule
+from tests.git_submodule_helpers import (
+    _change_test_package_submodule,
+    _pull_in_submodule_changes_to_module,
+    _create_test_package_with_submodule,
+    )
 
 
 def test_get_tag_revs_should_return_tag_name_and_commit_pair():
@@ -78,13 +82,10 @@ def test_check_rev_options_should_handle_ambiguous_commit(branches_revs_mock,
     assert result == ['123456'], result
 
 
-
-
-
-
 def test_check_submodule_addition():
     """
-        Test if submodules will be pulled in on install, and updated on upgrade
+    Submodules are pulled in on install and updated on upgrade.
+
     """
     env = reset_env()
     module_path, submodule_path = _create_test_package_with_submodule(env)
@@ -95,7 +96,8 @@ def test_check_submodule_addition():
     _change_test_package_submodule(env, submodule_path)
     _pull_in_submodule_changes_to_module(env, module_path)
 
-    update_result = run_pip('install', '-e', 'git+'+module_path+'#egg=version_pkg', '--upgrade', expect_error=True) # expect error because git writes to stdout in some weird cases
+    # expect error because git may write to stderr
+    update_result = run_pip('install', '-e', 'git+'+module_path+'#egg=version_pkg', '--upgrade', expect_error=True)
 
     assert env.venv/'src/version-pkg/testpkg/static/testfile2' in update_result.files_created