* [PATCH] Don't require working tree for git-rm
@ 2007-11-03 10:08 Mike Hommey
2007-11-03 11:56 ` Johannes Schindelin
0 siblings, 1 reply; 3+ messages in thread
From: Mike Hommey @ 2007-11-03 10:08 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano
This allows to do git rm --cached -r directory, instead of
git ls-files -z directory | git update-index --remove -z --stdin.
This can be particularly useful for git-filter-branch users.
Signed-off-by: Mike Hommey <mh@glandium.org>
---
git.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git.c b/git.c
index 4e10581..01dcb6a 100644
--- a/git.c
+++ b/git.c
@@ -345,7 +345,7 @@ static void handle_internal_command(int argc, const char **argv)
{ "rev-list", cmd_rev_list, RUN_SETUP },
{ "rev-parse", cmd_rev_parse, RUN_SETUP },
{ "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
- { "rm", cmd_rm, RUN_SETUP | NEED_WORK_TREE },
+ { "rm", cmd_rm, RUN_SETUP },
{ "runstatus", cmd_runstatus, RUN_SETUP | NEED_WORK_TREE },
{ "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER },
{ "show-branch", cmd_show_branch, RUN_SETUP },
--
1.5.3.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Don't require working tree for git-rm
2007-11-03 10:08 [PATCH] Don't require working tree for git-rm Mike Hommey
@ 2007-11-03 11:56 ` Johannes Schindelin
2007-11-03 12:11 ` Mike Hommey
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Schindelin @ 2007-11-03 11:56 UTC (permalink / raw)
To: Mike Hommey; +Cc: git, Junio C Hamano
Hi,
On Sat, 3 Nov 2007, Mike Hommey wrote:
> This allows to do git rm --cached -r directory, instead of
> git ls-files -z directory | git update-index --remove -z --stdin.
> This can be particularly useful for git-filter-branch users.
>
> Signed-off-by: Mike Hommey <mh@glandium.org>
> ---
> git.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/git.c b/git.c
> index 4e10581..01dcb6a 100644
> --- a/git.c
> +++ b/git.c
> @@ -345,7 +345,7 @@ static void handle_internal_command(int argc, const char **argv)
> { "rev-list", cmd_rev_list, RUN_SETUP },
> { "rev-parse", cmd_rev_parse, RUN_SETUP },
> { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
> - { "rm", cmd_rm, RUN_SETUP | NEED_WORK_TREE },
> + { "rm", cmd_rm, RUN_SETUP },
Just removing this is wrong!
You have to test for a working tree if "--cached" was _not_ given.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Don't require working tree for git-rm
2007-11-03 11:56 ` Johannes Schindelin
@ 2007-11-03 12:11 ` Mike Hommey
0 siblings, 0 replies; 3+ messages in thread
From: Mike Hommey @ 2007-11-03 12:11 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git, Junio C Hamano
On Sat, Nov 03, 2007 at 11:56:17AM +0000, Johannes Schindelin wrote:
> Hi,
>
> On Sat, 3 Nov 2007, Mike Hommey wrote:
>
> > This allows to do git rm --cached -r directory, instead of
> > git ls-files -z directory | git update-index --remove -z --stdin.
> > This can be particularly useful for git-filter-branch users.
> >
> > Signed-off-by: Mike Hommey <mh@glandium.org>
> > ---
> > git.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/git.c b/git.c
> > index 4e10581..01dcb6a 100644
> > --- a/git.c
> > +++ b/git.c
> > @@ -345,7 +345,7 @@ static void handle_internal_command(int argc, const char **argv)
> > { "rev-list", cmd_rev_list, RUN_SETUP },
> > { "rev-parse", cmd_rev_parse, RUN_SETUP },
> > { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE },
> > - { "rm", cmd_rm, RUN_SETUP | NEED_WORK_TREE },
> > + { "rm", cmd_rm, RUN_SETUP },
>
> Just removing this is wrong!
>
> You have to test for a working tree if "--cached" was _not_ given.
See the other patch I sent a bit later.
Mike
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-11-03 12:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-03 10:08 [PATCH] Don't require working tree for git-rm Mike Hommey
2007-11-03 11:56 ` Johannes Schindelin
2007-11-03 12:11 ` Mike Hommey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).