undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/trailing-slash-in-pathspec'

Browse Source 
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:
Junio C Hamano 2013-10-17 15:55:13 -07:00
commit be98d915be
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/reset.c
View File

@ -143,7 +143,6 @@ static int read_from_tree(const struct pathspec *pathspec,
opt.output_format = DIFF_FORMAT_CALLBACK; opt.output_format = DIFF_FORMAT_CALLBACK;
opt.format_callback = update_index_from_diff; opt.format_callback = update_index_from_diff;
read_cache();
if (do_diff_cache(tree_sha1, &opt)) if (do_diff_cache(tree_sha1, &opt))
return 1; return 1;
diffcore_std(&opt); 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) 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."), die(_("Cannot do a %s reset in the middle of a merge."),
_(reset_type_names[reset_type])); _(reset_type_names[reset_type]));
@ -220,8 +219,13 @@ static void parse_args(struct pathspec *pathspec,
} }
} }
*rev_ret = rev; *rev_ret = rev;
if (read_cache() < 0)
die(_("index file corrupt"));
parse_pathspec(pathspec, 0, parse_pathspec(pathspec, 0,
PATHSPEC_PREFER_FULL | PATHSPEC_PREFER_FULL |
PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP |
(patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0), (patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0),
prefix, argv); prefix, argv);
} }

20
builtin/rm.c
View File

@ -298,22 +298,10 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
if (read_cache() < 0) if (read_cache() < 0)
die(_("index file corrupt")); die(_("index file corrupt"));
/* parse_pathspec(&pathspec, 0,
* Drop trailing directory separators from directories so we'll find PATHSPEC_PREFER_CWD |
* submodules in the index. PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
*/ prefix, argv);
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);
refresh_index(&the_index, REFRESH_QUIET, &pathspec, NULL, NULL); refresh_index(&the_index, REFRESH_QUIET, &pathspec, NULL, NULL);
seen = xcalloc(pathspec.nr, 1); seen = xcalloc(pathspec.nr, 1);

6
t/t7400-submodule-basic.sh
View File

@ -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 reset --hard &&
git commit -m "commit subproject" init && git commit -m "commit subproject" init &&
@ -495,7 +495,9 @@ test_expect_success 'gracefully add submodule with a trailing slash' '
git add init/ && git add init/ &&
test_must_fail git diff --exit-code --cached init && test_must_fail git diff --exit-code --cached init &&
test $commit = $(git ls-files --stage | 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
' '