diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:42:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:42:11 -0800 |
| commit | 902f2f4f0a0bcc6c8d63ad4cd6b75b7eb9d65a72 (patch) | |
| tree | d47607e6111ba79292a3e5dcc69603139d7e0623 /t/t7400-submodule-basic.sh | |
| parent | 971e829cd84cf95203cec44d22d0e009f98ddbf5 (diff) | |
| parent | b928922727d6691a3bdc28160f93f25712c565f6 (diff) | |
| download | git-902f2f4f0a0bcc6c8d63ad4cd6b75b7eb9d65a72.tar.xz | |
Merge branch 'wk/submodule-update-remote'
The beginning of 'integrate with the tip of the remote branch, not
the commit recorded in the superproject gitlink' support.
* wk/submodule-update-remote:
submodule add: If --branch is given, record it in .gitmodules
submodule update: add --remote for submodule's upstream changes
submodule: add get_submodule_config helper funtion
Diffstat (limited to 't/t7400-submodule-basic.sh')
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index de7d45352e..2683cba7e3 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -133,6 +133,7 @@ test_expect_success 'submodule add --branch' ' ( cd addtest && git submodule add -b initial "$submodurl" submod-branch && + test "initial" = "$(git config -f .gitmodules submodule.submod-branch.branch)" && git submodule init ) && |