Skip to content

unpack-trees: fix '--recurse-submodules' when switching from no submodules to nested submodules #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

unpack-trees: fix '--recurse-submodules' when switching from no submodules to nested submodules #555

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a27185
t7112: remove mention of KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED
phil-blain Jan 5, 2020
9004c95
t/lib-submodule-update: remove outdated test description
phil-blain Jan 5, 2020
fa64ff0
t/lib-submodule-update: move a test to the right section
phil-blain Feb 7, 2020
bc7217f
unpack-trees: remove outdated description for verify_clean_submodule
phil-blain Feb 7, 2020
d477401
unpack-trees: check for missing submodule directory in merged_entry
phil-blain Feb 7, 2020
70b2a20
t/lib-submodule-update: add test removing nested submodules
phil-blain Feb 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion t/t7112-reset-submodule.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ test_description='reset can handle submodules'
. ./test-lib.sh
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Philippe Blain via GitGitGadget" <[email protected]> writes:

> From: Philippe Blain <[email protected]>
>
> The known failure mode KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED was
> removed from lib-submodule-update.sh in 218c883783 (submodule: properly
> recurse for read-tree and checkout, 2017-05-02) but at that time this
> change was not ported over to topic sb/reset-recurse-submodules, such
> that when this topic was merged in 5f074ca7e8 (Merge branch
> 'sb/reset-recurse-submodules', 2017-05-29), t7112-reset-submodules.sh
> kept a mention of this removed failure mode.
>
> Remove it now, as it does not mean anything anymore.
>
> Signed-off-by: Philippe Blain <[email protected]>
> ---
>  t/t7112-reset-submodule.sh | 1 -
>  1 file changed, 1 deletion(-)

Thanks for cleaning up.

>
> diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh
> index a1cb9ff858e..67346424a53 100755
> --- a/t/t7112-reset-submodule.sh
> +++ b/t/t7112-reset-submodule.sh
> @@ -5,7 +5,6 @@ test_description='reset can handle submodules'
>  . ./test-lib.sh
>  . "$TEST_DIRECTORY"/lib-submodule-update.sh
>  
> -KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED=1
>  KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
>  KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1

. "$TEST_DIRECTORY"/lib-submodule-update.sh

KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED=1
KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1

Expand Down