Re: [PATCH 1/2] reset: handle submodule with trailing slash
- From
John Keeping <john@keeping.me.uk>
- Date
- Sep 11, 2013, 08:20 UTC
- Message-ID
- <20130911082042.GR2582@serenity.lan>
- In-Reply-To
- <52300838.5040703@kdbg.org>
On Wed, Sep 11, 2013 at 08:05:44AM +0200, Johannes Sixt wrote:
Show 26 quoted lines
> 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 <john@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.I think that needs to look like this on top - there's also a read_cache_unmerged() around line 68 but I don't think we can remove that one.
-- >8 --
diff --git a/builtin/reset.c b/builtin/reset.c index 9efac0f..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]));