mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'jk/trailing-slash-in-pathspec'
Code refactoring. * jk/trailing-slash-in-pathspec: reset: handle submodule with trailing slash rm: re-use parse_pathspec's trailing-slash removal
This commit is contained in:
commit
be98d915be
|
@ -143,7 +143,6 @@ static int read_from_tree(const struct pathspec *pathspec,
|
|||
opt.output_format = DIFF_FORMAT_CALLBACK;
|
||||
opt.format_callback = update_index_from_diff;
|
||||
|
||||
read_cache();
|
||||
if (do_diff_cache(tree_sha1, &opt))
|
||||
return 1;
|
||||
diffcore_std(&opt);
|
||||
|
@ -169,7 +168,7 @@ static void set_reflog_message(struct strbuf *sb, const char *action,
|
|||
|
||||
static void die_if_unmerged_cache(int reset_type)
|
||||
{
|
||||
if (is_merge() || read_cache() < 0 || unmerged_cache())
|
||||
if (is_merge() || unmerged_cache())
|
||||
die(_("Cannot do a %s reset in the middle of a merge."),
|
||||
_(reset_type_names[reset_type]));
|
||||
|
||||
|
@ -220,8 +219,13 @@ static void parse_args(struct pathspec *pathspec,
|
|||
}
|
||||
}
|
||||
*rev_ret = rev;
|
||||
|
||||
if (read_cache() < 0)
|
||||
die(_("index file corrupt"));
|
||||
|
||||
parse_pathspec(pathspec, 0,
|
||||
PATHSPEC_PREFER_FULL |
|
||||
PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP |
|
||||
(patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0),
|
||||
prefix, argv);
|
||||
}
|
||||
|
|
20
builtin/rm.c
20
builtin/rm.c
|
@ -298,22 +298,10 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
|
|||
if (read_cache() < 0)
|
||||
die(_("index file corrupt"));
|
||||
|
||||
/*
|
||||
* Drop trailing directory separators from directories so we'll find
|
||||
* submodules in the index.
|
||||
*/
|
||||
for (i = 0; i < argc; i++) {
|
||||
size_t pathlen = strlen(argv[i]);
|
||||
if (pathlen && is_dir_sep(argv[i][pathlen - 1]) &&
|
||||
is_directory(argv[i])) {
|
||||
do {
|
||||
pathlen--;
|
||||
} while (pathlen && is_dir_sep(argv[i][pathlen - 1]));
|
||||
argv[i] = xmemdupz(argv[i], pathlen);
|
||||
}
|
||||
}
|
||||
|
||||
parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD, prefix, argv);
|
||||
parse_pathspec(&pathspec, 0,
|
||||
PATHSPEC_PREFER_CWD |
|
||||
PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
|
||||
prefix, argv);
|
||||
refresh_index(&the_index, REFRESH_QUIET, &pathspec, NULL, NULL);
|
||||
|
||||
seen = xcalloc(pathspec.nr, 1);
|
||||
|
|
|
@ -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
|
||||
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue