diff options
| author | Jeff King <peff@peff.net> | 2012-11-09 12:51:15 -0500 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-11-09 12:51:15 -0500 |
| commit | b0b00a3ee43b4813eb85728a482500f6422499fd (patch) | |
| tree | 7afa582b33da2c45d046f3dd8ff7df30b336cf37 | |
| parent | 19fb61369583410a4f79dbc065b4dc8125236c0b (diff) | |
| parent | e15bec0ec3b763449e418c12a5f2e128560c556d (diff) | |
| download | git-b0b00a3ee43b4813eb85728a482500f6422499fd.tar.gz git-b0b00a3ee43b4813eb85728a482500f6422499fd.tar.xz | |
Merge branch 'ph/maint-submodule-status-fix'
Cleans up some leftover bits from an earlier submodule change.
* ph/maint-submodule-status-fix:
submodule status: remove unused orig_* variables
t7407: Fix recursive submodule test
| -rwxr-xr-x | git-submodule.sh | 4 | ||||
| -rwxr-xr-x | t/t7407-submodule-foreach.sh | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 3d1617fa9..819eb5674 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -950,7 +950,6 @@ cmd_summary() { cmd_status() { # parse $args after "submodule ... status". - orig_flags= while test $# -ne 0 do case "$1" in @@ -974,7 +973,6 @@ cmd_status() break ;; esac - orig_flags="$orig_flags $(git rev-parse --sq-quote "$1")" shift done @@ -1014,7 +1012,7 @@ cmd_status() prefix="$displaypath/" clear_local_git_env cd "$sm_path" && - eval cmd_status "$orig_args" + eval cmd_status ) || die "$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")" fi diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh index 9b69fe2e1..107b4b7c4 100755 --- a/t/t7407-submodule-foreach.sh +++ b/t/t7407-submodule-foreach.sh @@ -226,14 +226,14 @@ test_expect_success 'test "status --recursive"' ' test_cmp expect actual ' -sed -e "/nested1 /s/.*/+$nested1sha1 nested1 (file2~1)/;/sub[1-3]/d" < expect > expect2 +sed -e "/nested2 /s/.*/+$nested2sha1 nested1\/nested2 (file2~1)/;/sub[1-3]/d" < expect > expect2 mv -f expect2 expect test_expect_success 'ensure "status --cached --recursive" preserves the --cached flag' ' ( cd clone3 && ( - cd nested1 && + cd nested1/nested2 && test_commit file2 ) && git submodule status --cached --recursive -- nested1 > ../actual |