projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make t4101-apply-nonl bring along its patches
[git.git]
/
builtin-rm.c
diff --git
a/builtin-rm.c
b/builtin-rm.c
index
e7793a2
..
4d56a1f
100644
(file)
--- a/
builtin-rm.c
+++ b/
builtin-rm.c
@@
-41,7
+41,7
@@
static int remove_file(const char *name)
return ret;
}
return ret;
}
-static struct
cache_file cache
_file;
+static struct
lock_file lock
_file;
int cmd_rm(int argc, const char **argv, char **envp)
{
int cmd_rm(int argc, const char **argv, char **envp)
{
@@
-53,7
+53,7
@@
int cmd_rm(int argc, const char **argv, char **envp)
git_config(git_default_config);
git_config(git_default_config);
- newfd = hold_
index_file_for_update(&cache
_file, get_index_file());
+ newfd = hold_
lock_file_for_update(&lock
_file, get_index_file());
if (newfd < 0)
die("unable to create new index file");
if (newfd < 0)
die("unable to create new index file");
@@
-83,15
+83,15
@@
int cmd_rm(int argc, const char **argv, char **envp)
}
die(builtin_rm_usage);
}
}
die(builtin_rm_usage);
}
- pathspec = get_pathspec(prefix, argv + i);
+ if (argc <= i)
+ usage(builtin_rm_usage);
+ pathspec = get_pathspec(prefix, argv + i);
seen = NULL;
seen = NULL;
- if (pathspec) {
- for (i = 0; pathspec[i] ; i++)
- /* nothing */;
- seen = xmalloc(i);
- memset(seen, 0, i);
- }
+ for (i = 0; pathspec[i] ; i++)
+ /* nothing */;
+ seen = xmalloc(i);
+ memset(seen, 0, i);
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
@@
-121,6
+121,9
@@
int cmd_rm(int argc, const char **argv, char **envp)
cache_tree_invalidate_path(active_cache_tree, path);
}
cache_tree_invalidate_path(active_cache_tree, path);
}
+ if (show_only)
+ return 0;
+
/*
* Then, if we used "-f", remove the filenames from the
* workspace. If we fail to remove the first one, we
/*
* Then, if we used "-f", remove the filenames from the
* workspace. If we fail to remove the first one, we
@@
-144,7
+147,7
@@
int cmd_rm(int argc, const char **argv, char **envp)
if (active_cache_changed) {
if (write_cache(newfd, active_cache, active_nr) ||
if (active_cache_changed) {
if (write_cache(newfd, active_cache, active_nr) ||
- commit_
index_file(&cache
_file))
+ commit_
lock_file(&lock
_file))
die("Unable to write new index file");
}
die("Unable to write new index file");
}