Fix up some fallout from "setup_git_directory()" cleanups
[git/git-svn.git] / builtin-rm.c
blob92d205a7153a7cc5267ea9cf774bc1e4fac887d4
1 /*
2 * "git rm" builtin command
4 * Copyright (C) Linus Torvalds 2006
5 */
6 #include "cache.h"
7 #include "builtin.h"
8 #include "dir.h"
9 #include "cache-tree.h"
11 static const char builtin_rm_usage[] =
12 "git-rm [-n] [-v] [-f] <filepattern>...";
14 static struct {
15 int nr, alloc;
16 const char **name;
17 } list;
19 static void add_list(const char *name)
21 if (list.nr >= list.alloc) {
22 list.alloc = alloc_nr(list.alloc);
23 list.name = xrealloc(list.name, list.alloc * sizeof(const char *));
25 list.name[list.nr++] = name;
28 static int remove_file(const char *name)
30 int ret;
31 char *slash;
33 ret = unlink(name);
34 if (!ret && (slash = strrchr(name, '/'))) {
35 char *n = strdup(name);
36 do {
37 n[slash - name] = 0;
38 name = n;
39 } while (!rmdir(name) && (slash = strrchr(name, '/')));
41 return ret;
44 static struct lock_file lock_file;
46 int cmd_rm(int argc, const char **argv, const char *prefix)
48 int i, newfd;
49 int verbose = 0, show_only = 0, force = 0;
50 const char **pathspec;
51 char *seen;
53 git_config(git_default_config);
55 newfd = hold_lock_file_for_update(&lock_file, get_index_file());
56 if (newfd < 0)
57 die("unable to create new index file");
59 if (read_cache() < 0)
60 die("index file corrupt");
62 for (i = 1 ; i < argc ; i++) {
63 const char *arg = argv[i];
65 if (*arg != '-')
66 break;
67 if (!strcmp(arg, "--")) {
68 i++;
69 break;
71 if (!strcmp(arg, "-n")) {
72 show_only = 1;
73 continue;
75 if (!strcmp(arg, "-v")) {
76 verbose = 1;
77 continue;
79 if (!strcmp(arg, "-f")) {
80 force = 1;
81 continue;
83 die(builtin_rm_usage);
85 if (argc <= i)
86 usage(builtin_rm_usage);
88 pathspec = get_pathspec(prefix, argv + i);
89 seen = NULL;
90 for (i = 0; pathspec[i] ; i++)
91 /* nothing */;
92 seen = xcalloc(i, 1);
94 for (i = 0; i < active_nr; i++) {
95 struct cache_entry *ce = active_cache[i];
96 if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen))
97 continue;
98 add_list(ce->name);
101 if (pathspec) {
102 const char *match;
103 for (i = 0; (match = pathspec[i]) != NULL ; i++) {
104 if (*match && !seen[i])
105 die("pathspec '%s' did not match any files", match);
110 * First remove the names from the index: we won't commit
111 * the index unless all of them succeed
113 for (i = 0; i < list.nr; i++) {
114 const char *path = list.name[i];
115 printf("rm '%s'\n", path);
117 if (remove_file_from_cache(path))
118 die("git rm: unable to remove %s", path);
119 cache_tree_invalidate_path(active_cache_tree, path);
122 if (show_only)
123 return 0;
126 * Then, if we used "-f", remove the filenames from the
127 * workspace. If we fail to remove the first one, we
128 * abort the "git rm" (but once we've successfully removed
129 * any file at all, we'll go ahead and commit to it all:
130 * by then we've already committed ourselves and can't fail
131 * in the middle)
133 if (force) {
134 int removed = 0;
135 for (i = 0; i < list.nr; i++) {
136 const char *path = list.name[i];
137 if (!remove_file(path)) {
138 removed = 1;
139 continue;
141 if (!removed)
142 die("git rm: %s: %s", path, strerror(errno));
146 if (active_cache_changed) {
147 if (write_cache(newfd, active_cache, active_nr) ||
148 close(newfd) || commit_lock_file(&lock_file))
149 die("Unable to write new index file");
152 return 0;