summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-09-12 19:25:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-13 19:37:35 (GMT)
commit2c63d6eb46da4ef0abc9c040c927818e437d2fcc (patch)
tree101554c37a1be825ce61f13b77a956434ac90788 /builtin
parentf8bc2ac3bf2df76ae864041a5496fab6446ad189 (diff)
downloadgit-2c63d6eb46da4ef0abc9c040c927818e437d2fcc.zip
git-2c63d6eb46da4ef0abc9c040c927818e437d2fcc.tar.gz
git-2c63d6eb46da4ef0abc9c040c927818e437d2fcc.tar.bz2
reset: handle submodule with trailing slash
When using tab-completion, a directory path will often end with a trailing slash which currently confuses "git reset" 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. To do this, we need to move the read_cache() call before the parse_pathspec() call. All of the existing paths through cmd_reset() that do not die early already call read_cache() at some point, so there is no performance impact to doing this in the common case. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/reset.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/builtin/reset.c b/builtin/reset.c
index 5e4c551..800117f 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -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);
}