Am 10.09.2013 21:13, schrieb John Keeping:
> When using tab-completion, a directory path will often end with a
> trailing slash which currently confuses "git rm" when dealing with
> submodules. Now that we have parse_pathspec we can easily handle this
> by simply adding the PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP flag.
>
> Signed-off-by: John Keeping <j...@keeping.me.uk>
> ---
> builtin/reset.c | 5 +++++
> t/t7400-submodule-basic.sh | 6 ++++--
> 2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/reset.c b/builtin/reset.c
> index 5e4c551..9efac0f 100644
> --- a/builtin/reset.c
> +++ b/builtin/reset.c
> @@ -220,8 +220,13 @@ static void parse_args(struct pathspec *pathspec,
> }
> }
> *rev_ret = rev;
> +
> + if (read_cache() < 0)
> + die(_("index file corrupt"));
When the index is now read here, I would have expected hunk in this
patch that removes a read_cache() invocation.
> +
> parse_pathspec(pathspec, 0,
> PATHSPEC_PREFER_FULL |
> + PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP |
> (patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0),
> prefix, argv);
> }
> diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
> index 4192fe0..c268d3c 100755
> --- a/t/t7400-submodule-basic.sh
> +++ b/t/t7400-submodule-basic.sh
> @@ -481,7 +481,7 @@ test_expect_success 'do not add files from a submodule' '
>
> '
>
> -test_expect_success 'gracefully add submodule with a trailing slash' '
> +test_expect_success 'gracefully add/reset submodule with a trailing slash' '
>
> git reset --hard &&
> git commit -m "commit subproject" init &&
> @@ -495,7 +495,9 @@ test_expect_success 'gracefully add submodule with a
> trailing slash' '
> git add init/ &&
> test_must_fail git diff --exit-code --cached init &&
> test $commit = $(git ls-files --stage |
> - sed -n "s/^160000 \([^ ]*\).*/\1/p")
> + sed -n "s/^160000 \([^ ]*\).*/\1/p") &&
> + git reset init/ &&
> + git diff --exit-code --cached init
>
> '
>
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
