Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
/*
|
|
|
|
* "git rm" builtin command
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds 2006
|
|
|
|
*/
|
|
|
|
#include "cache.h"
|
|
|
|
#include "builtin.h"
|
|
|
|
#include "dir.h"
|
2006-05-23 08:31:38 +00:00
|
|
|
#include "cache-tree.h"
|
2006-12-25 11:11:00 +00:00
|
|
|
#include "tree-walk.h"
|
2007-10-05 19:09:19 +00:00
|
|
|
#include "parse-options.h"
|
2012-09-26 18:21:13 +00:00
|
|
|
#include "submodule.h"
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
|
2007-10-05 19:09:19 +00:00
|
|
|
static const char * const builtin_rm_usage[] = {
|
2012-08-20 12:32:42 +00:00
|
|
|
N_("git rm [options] [--] <file>..."),
|
2007-10-05 19:09:19 +00:00
|
|
|
NULL
|
|
|
|
};
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
|
|
|
|
static struct {
|
|
|
|
int nr, alloc;
|
2012-09-26 18:21:13 +00:00
|
|
|
struct {
|
|
|
|
const char *name;
|
|
|
|
char is_submodule;
|
|
|
|
} *entry;
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
} list;
|
|
|
|
|
2012-09-26 18:21:13 +00:00
|
|
|
static int get_ours_cache_pos(const char *path, int pos)
|
|
|
|
{
|
|
|
|
int i = -pos - 1;
|
|
|
|
|
|
|
|
while ((i < active_nr) && !strcmp(active_cache[i]->name, path)) {
|
|
|
|
if (ce_stage(active_cache[i]) == 2)
|
|
|
|
return i;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int check_submodules_use_gitfiles(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int errs = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < list.nr; i++) {
|
|
|
|
const char *name = list.entry[i].name;
|
|
|
|
int pos;
|
|
|
|
struct cache_entry *ce;
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
pos = cache_name_pos(name, strlen(name));
|
|
|
|
if (pos < 0) {
|
|
|
|
pos = get_ours_cache_pos(name, pos);
|
|
|
|
if (pos < 0)
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
ce = active_cache[pos];
|
|
|
|
|
|
|
|
if (!S_ISGITLINK(ce->ce_mode) ||
|
|
|
|
(lstat(ce->name, &st) < 0) ||
|
|
|
|
is_empty_dir(name))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!submodule_uses_gitfile(name))
|
|
|
|
errs = error(_("submodule '%s' (or one of its nested "
|
|
|
|
"submodules) uses a .git directory\n"
|
|
|
|
"(use 'rm -rf' if you really want to remove "
|
|
|
|
"it including all of its history)"), name);
|
|
|
|
}
|
|
|
|
|
|
|
|
return errs;
|
|
|
|
}
|
|
|
|
|
2007-07-13 17:41:38 +00:00
|
|
|
static int check_local_mod(unsigned char *head, int index_only)
|
2006-12-25 11:11:00 +00:00
|
|
|
{
|
2008-11-29 02:41:21 +00:00
|
|
|
/*
|
|
|
|
* Items in list are already sorted in the cache order,
|
2006-12-25 11:11:00 +00:00
|
|
|
* so we could do this a lot more efficiently by using
|
|
|
|
* tree_desc based traversal if we wanted to, but I am
|
|
|
|
* lazy, and who cares if removal of files is a tad
|
|
|
|
* slower than the theoretical maximum speed?
|
|
|
|
*/
|
|
|
|
int i, no_head;
|
|
|
|
int errs = 0;
|
|
|
|
|
|
|
|
no_head = is_null_sha1(head);
|
|
|
|
for (i = 0; i < list.nr; i++) {
|
|
|
|
struct stat st;
|
|
|
|
int pos;
|
|
|
|
struct cache_entry *ce;
|
2012-09-26 18:21:13 +00:00
|
|
|
const char *name = list.entry[i].name;
|
2006-12-25 11:11:00 +00:00
|
|
|
unsigned char sha1[20];
|
|
|
|
unsigned mode;
|
2007-07-13 17:41:38 +00:00
|
|
|
int local_changes = 0;
|
|
|
|
int staged_changes = 0;
|
2006-12-25 11:11:00 +00:00
|
|
|
|
|
|
|
pos = cache_name_pos(name, strlen(name));
|
2012-09-26 18:21:13 +00:00
|
|
|
if (pos < 0) {
|
|
|
|
/*
|
|
|
|
* Skip unmerged entries except for populated submodules
|
|
|
|
* that could lose history when removed.
|
|
|
|
*/
|
|
|
|
pos = get_ours_cache_pos(name, pos);
|
|
|
|
if (pos < 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!S_ISGITLINK(active_cache[pos]->ce_mode) ||
|
|
|
|
is_empty_dir(name))
|
|
|
|
continue;
|
|
|
|
}
|
2006-12-25 11:11:00 +00:00
|
|
|
ce = active_cache[pos];
|
|
|
|
|
|
|
|
if (lstat(ce->name, &st) < 0) {
|
|
|
|
if (errno != ENOENT)
|
2009-03-24 01:09:14 +00:00
|
|
|
warning("'%s': %s", ce->name, strerror(errno));
|
2006-12-25 11:11:00 +00:00
|
|
|
/* It already vanished from the working tree */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if (S_ISDIR(st.st_mode)) {
|
|
|
|
/* if a file was removed and it is now a
|
|
|
|
* directory, that is the same as ENOENT as
|
|
|
|
* far as git is concerned; we do not track
|
2012-09-26 18:21:13 +00:00
|
|
|
* directories unless they are submodules.
|
2006-12-25 11:11:00 +00:00
|
|
|
*/
|
2012-09-26 18:21:13 +00:00
|
|
|
if (!S_ISGITLINK(ce->ce_mode))
|
|
|
|
continue;
|
2006-12-25 11:11:00 +00:00
|
|
|
}
|
2008-11-29 02:41:21 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* "rm" of a path that has changes need to be treated
|
|
|
|
* carefully not to allow losing local changes
|
|
|
|
* accidentally. A local change could be (1) file in
|
|
|
|
* work tree is different since the index; and/or (2)
|
|
|
|
* the user staged a content that is different from
|
|
|
|
* the current commit in the index.
|
|
|
|
*
|
|
|
|
* In such a case, you would need to --force the
|
|
|
|
* removal. However, "rm --cached" (remove only from
|
|
|
|
* the index) is safe if the index matches the file in
|
|
|
|
* the work tree or the HEAD commit, as it means that
|
|
|
|
* the content being removed is available elsewhere.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Is the index different from the file in the work tree?
|
2012-09-26 18:21:13 +00:00
|
|
|
* If it's a submodule, is its work tree modified?
|
2008-11-29 02:41:21 +00:00
|
|
|
*/
|
2012-09-26 18:21:13 +00:00
|
|
|
if (ce_match_stat(ce, &st, 0) ||
|
|
|
|
(S_ISGITLINK(ce->ce_mode) &&
|
|
|
|
!ok_to_remove_submodule(ce->name)))
|
2007-07-13 17:41:38 +00:00
|
|
|
local_changes = 1;
|
2008-11-29 02:41:21 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Is the index different from the HEAD commit? By
|
|
|
|
* definition, before the very initial commit,
|
|
|
|
* anything staged in the index is treated by the same
|
|
|
|
* way as changed from the HEAD.
|
|
|
|
*/
|
2007-03-26 18:55:39 +00:00
|
|
|
if (no_head
|
|
|
|
|| get_tree_entry(head, name, sha1, &mode)
|
|
|
|
|| ce->ce_mode != create_ce_mode(mode)
|
|
|
|
|| hashcmp(ce->sha1, sha1))
|
2007-07-13 17:41:38 +00:00
|
|
|
staged_changes = 1;
|
|
|
|
|
2008-11-29 02:41:21 +00:00
|
|
|
/*
|
|
|
|
* If the index does not match the file in the work
|
|
|
|
* tree and if it does not match the HEAD commit
|
|
|
|
* either, (1) "git rm" without --cached definitely
|
|
|
|
* will lose information; (2) "git rm --cached" will
|
|
|
|
* lose information unless it is about removing an
|
|
|
|
* "intent to add" entry.
|
|
|
|
*/
|
|
|
|
if (local_changes && staged_changes) {
|
2008-11-29 03:55:25 +00:00
|
|
|
if (!index_only || !(ce->ce_flags & CE_INTENT_TO_ADD))
|
2011-02-22 23:42:05 +00:00
|
|
|
errs = error(_("'%s' has staged content different "
|
2008-11-29 02:41:21 +00:00
|
|
|
"from both the file and the HEAD\n"
|
2011-02-22 23:42:05 +00:00
|
|
|
"(use -f to force removal)"), name);
|
2008-11-29 02:41:21 +00:00
|
|
|
}
|
2007-07-13 17:41:38 +00:00
|
|
|
else if (!index_only) {
|
|
|
|
if (staged_changes)
|
2011-02-22 23:42:05 +00:00
|
|
|
errs = error(_("'%s' has changes staged in the index\n"
|
2007-07-13 17:41:38 +00:00
|
|
|
"(use --cached to keep the file, "
|
2011-02-22 23:42:05 +00:00
|
|
|
"or -f to force removal)"), name);
|
2012-09-26 18:21:13 +00:00
|
|
|
if (local_changes) {
|
|
|
|
if (S_ISGITLINK(ce->ce_mode) &&
|
|
|
|
!submodule_uses_gitfile(name)) {
|
|
|
|
errs = error(_("submodule '%s' (or one of its nested "
|
|
|
|
"submodules) uses a .git directory\n"
|
|
|
|
"(use 'rm -rf' if you really want to remove "
|
|
|
|
"it including all of its history)"), name);
|
|
|
|
} else
|
|
|
|
errs = error(_("'%s' has local modifications\n"
|
|
|
|
"(use --cached to keep the file, "
|
|
|
|
"or -f to force removal)"), name);
|
|
|
|
}
|
2007-07-13 17:41:38 +00:00
|
|
|
}
|
2006-12-25 11:11:00 +00:00
|
|
|
}
|
|
|
|
return errs;
|
|
|
|
}
|
|
|
|
|
2006-06-06 19:51:49 +00:00
|
|
|
static struct lock_file lock_file;
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
|
2007-10-05 19:09:19 +00:00
|
|
|
static int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0;
|
|
|
|
static int ignore_unmatch = 0;
|
|
|
|
|
|
|
|
static struct option builtin_rm_options[] = {
|
2012-08-20 12:32:42 +00:00
|
|
|
OPT__DRY_RUN(&show_only, N_("dry run")),
|
|
|
|
OPT__QUIET(&quiet, N_("do not list removed files")),
|
|
|
|
OPT_BOOLEAN( 0 , "cached", &index_only, N_("only remove from the index")),
|
|
|
|
OPT__FORCE(&force, N_("override the up-to-date check")),
|
|
|
|
OPT_BOOLEAN('r', NULL, &recursive, N_("allow recursive removal")),
|
2007-10-05 19:09:19 +00:00
|
|
|
OPT_BOOLEAN( 0 , "ignore-unmatch", &ignore_unmatch,
|
2012-08-20 12:32:42 +00:00
|
|
|
N_("exit with a zero status even if nothing matched")),
|
2007-10-05 19:09:19 +00:00
|
|
|
OPT_END(),
|
|
|
|
};
|
|
|
|
|
2006-07-29 05:44:25 +00:00
|
|
|
int cmd_rm(int argc, const char **argv, const char *prefix)
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
{
|
|
|
|
int i, newfd;
|
|
|
|
const char **pathspec;
|
|
|
|
char *seen;
|
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
git_config(git_default_config, NULL);
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
|
2009-05-23 18:53:12 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, builtin_rm_options,
|
|
|
|
builtin_rm_usage, 0);
|
2007-10-05 19:09:19 +00:00
|
|
|
if (!argc)
|
|
|
|
usage_with_options(builtin_rm_usage, builtin_rm_options);
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
|
2007-11-03 11:23:13 +00:00
|
|
|
if (!index_only)
|
|
|
|
setup_work_tree();
|
|
|
|
|
2008-07-19 16:24:46 +00:00
|
|
|
newfd = hold_locked_index(&lock_file, 1);
|
|
|
|
|
|
|
|
if (read_cache() < 0)
|
2011-02-22 23:42:05 +00:00
|
|
|
die(_("index file corrupt"));
|
2008-07-19 16:24:46 +00:00
|
|
|
|
2012-11-22 22:32:26 +00:00
|
|
|
/*
|
|
|
|
* 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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-10-05 19:09:19 +00:00
|
|
|
pathspec = get_pathspec(prefix, argv);
|
2010-01-17 08:43:13 +00:00
|
|
|
refresh_index(&the_index, REFRESH_QUIET, pathspec, NULL, NULL);
|
|
|
|
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
seen = NULL;
|
2006-06-09 04:11:25 +00:00
|
|
|
for (i = 0; pathspec[i] ; i++)
|
|
|
|
/* nothing */;
|
2006-07-25 07:30:18 +00:00
|
|
|
seen = xcalloc(i, 1);
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
|
|
|
|
for (i = 0; i < active_nr; i++) {
|
|
|
|
struct cache_entry *ce = active_cache[i];
|
|
|
|
if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen))
|
|
|
|
continue;
|
2012-09-26 18:21:13 +00:00
|
|
|
ALLOC_GROW(list.entry, list.nr + 1, list.alloc);
|
|
|
|
list.entry[list.nr].name = ce->name;
|
|
|
|
list.entry[list.nr++].is_submodule = S_ISGITLINK(ce->ce_mode);
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (pathspec) {
|
|
|
|
const char *match;
|
2007-04-16 07:53:24 +00:00
|
|
|
int seen_any = 0;
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
for (i = 0; (match = pathspec[i]) != NULL ; i++) {
|
2007-04-16 07:53:24 +00:00
|
|
|
if (!seen[i]) {
|
|
|
|
if (!ignore_unmatch) {
|
2011-02-22 23:42:05 +00:00
|
|
|
die(_("pathspec '%s' did not match any files"),
|
2007-04-16 07:53:24 +00:00
|
|
|
match);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
seen_any = 1;
|
|
|
|
}
|
2006-12-25 11:11:00 +00:00
|
|
|
if (!recursive && seen[i] == MATCHED_RECURSIVELY)
|
2011-02-22 23:42:05 +00:00
|
|
|
die(_("not removing '%s' recursively without -r"),
|
2006-12-25 11:11:00 +00:00
|
|
|
*match ? match : ".");
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
}
|
2007-04-16 07:53:24 +00:00
|
|
|
|
|
|
|
if (! seen_any)
|
|
|
|
exit(0);
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
}
|
|
|
|
|
2006-12-25 11:11:00 +00:00
|
|
|
/*
|
|
|
|
* If not forced, the file, the index and the HEAD (if exists)
|
|
|
|
* must match; but the file can already been removed, since
|
|
|
|
* this sequence is a natural "novice" way:
|
|
|
|
*
|
2007-04-16 08:17:32 +00:00
|
|
|
* rm F; git rm F
|
2006-12-25 11:11:00 +00:00
|
|
|
*
|
|
|
|
* Further, if HEAD commit exists, "diff-index --cached" must
|
|
|
|
* report no changes unless forced.
|
|
|
|
*/
|
|
|
|
if (!force) {
|
|
|
|
unsigned char sha1[20];
|
|
|
|
if (get_sha1("HEAD", sha1))
|
|
|
|
hashclr(sha1);
|
2007-07-13 17:41:38 +00:00
|
|
|
if (check_local_mod(sha1, index_only))
|
2006-12-25 11:11:00 +00:00
|
|
|
exit(1);
|
2012-09-26 18:21:13 +00:00
|
|
|
} else if (!index_only) {
|
|
|
|
if (check_submodules_use_gitfiles())
|
|
|
|
exit(1);
|
2006-12-25 11:11:00 +00:00
|
|
|
}
|
|
|
|
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
/*
|
|
|
|
* First remove the names from the index: we won't commit
|
2006-12-25 11:11:00 +00:00
|
|
|
* the index unless all of them succeed.
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
*/
|
|
|
|
for (i = 0; i < list.nr; i++) {
|
2012-09-26 18:21:13 +00:00
|
|
|
const char *path = list.entry[i].name;
|
2007-04-16 07:46:48 +00:00
|
|
|
if (!quiet)
|
|
|
|
printf("rm '%s'\n", path);
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
|
|
|
|
if (remove_file_from_cache(path))
|
2011-02-22 23:42:05 +00:00
|
|
|
die(_("git rm: unable to remove %s"), path);
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
}
|
|
|
|
|
2006-06-09 04:11:25 +00:00
|
|
|
if (show_only)
|
|
|
|
return 0;
|
|
|
|
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
/*
|
2007-01-11 22:58:47 +00:00
|
|
|
* Then, unless we used "--cached", remove the filenames from
|
2006-12-25 11:11:00 +00:00
|
|
|
* the workspace. If we fail to remove the first one, we
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
* abort the "git rm" (but once we've successfully removed
|
|
|
|
* any file at all, we'll go ahead and commit to it all:
|
2006-07-10 05:50:18 +00:00
|
|
|
* by then we've already committed ourselves and can't fail
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
* in the middle)
|
|
|
|
*/
|
2006-12-25 11:11:00 +00:00
|
|
|
if (!index_only) {
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
int removed = 0;
|
|
|
|
for (i = 0; i < list.nr; i++) {
|
2012-09-26 18:21:13 +00:00
|
|
|
const char *path = list.entry[i].name;
|
|
|
|
if (list.entry[i].is_submodule) {
|
|
|
|
if (is_empty_dir(path)) {
|
|
|
|
if (!rmdir(path)) {
|
|
|
|
removed = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
strbuf_addstr(&buf, path);
|
|
|
|
if (!remove_dir_recursively(&buf, 0)) {
|
|
|
|
removed = 1;
|
|
|
|
strbuf_release(&buf);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
strbuf_release(&buf);
|
|
|
|
/* Fallthrough and let remove_path() fail. */
|
|
|
|
}
|
|
|
|
}
|
2008-09-26 22:59:14 +00:00
|
|
|
if (!remove_path(path)) {
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
removed = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!removed)
|
2009-06-27 15:58:46 +00:00
|
|
|
die_errno("git rm: '%s'", path);
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (active_cache_changed) {
|
|
|
|
if (write_cache(newfd, active_cache, active_nr) ||
|
2008-01-16 19:12:46 +00:00
|
|
|
commit_locked_index(&lock_file))
|
2011-02-22 23:42:05 +00:00
|
|
|
die(_("Unable to write new index file"));
|
Add builtin "git rm" command
This changes semantics very subtly, because it adds a new atomicity
guarantee.
In particular, if you "git rm" several files, it will now do all or
nothing. The old shell-script really looped over the removed files one by
one, and would basically randomly fail in the middle if "-f" was used and
one of the files didn't exist in the working directory.
This C builtin one will not re-write the index after each remove, but
instead remove all files at once. However, that means that if "-f" is used
(to also force removal of the file from the working directory), and some
files have already been removed from the workspace, it won't stop in the
middle in some half-way state like the old one did.
So what happens is that if the _first_ file fails to be removed with "-f",
we abort the whole "git rm". But once we've started removing, we don't
leave anything half done. If some of the other files don't exist, we'll
just ignore errors of removal from the working tree.
This is only an issue with "-f", of course.
I think the new behaviour is strictly an improvement, but perhaps more
importantly, it is _different_. As a special case, the semantics are
identical for the single-file case (which is the only one our test-suite
seems to test).
The other question is what to do with leading directories. The old "git
rm" script didn't do anything, which is somewhat inconsistent. This one
will actually clean up directories that have become empty as a result of
removing the last file, but maybe we want to have a flag to decide the
behaviour?
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-19 23:19:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|