projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the merge scripts for the big git rename.
[git.git]
/
checkout-cache.c
diff --git
a/checkout-cache.c
b/checkout-cache.c
index
f65be62
..
a1ef944
100644
(file)
--- a/
checkout-cache.c
+++ b/
checkout-cache.c
@@
-34,12
+34,12
@@
*/
#include "cache.h"
*/
#include "cache.h"
-static int force = 0, quiet = 0;
+static int force = 0, quiet = 0
, not_new = 0
;
static void create_directories(const char *path)
{
int len = strlen(path);
static void create_directories(const char *path)
{
int len = strlen(path);
- char *buf = malloc(len + 1);
+ char *buf =
x
malloc(len + 1);
const char *slash = path;
while ((slash = strchr(slash+1, '/')) != NULL) {
const char *slash = path;
while ((slash = strchr(slash+1, '/')) != NULL) {
@@
-118,7
+118,8
@@
static int checkout_entry(struct cache_entry *ce, const char *base_dir)
* just do the right thing)
*/
unlink(path);
* just do the right thing)
*/
unlink(path);
- }
+ } else if (not_new)
+ return 0;
return write_entry(ce, path);
}
return write_entry(ce, path);
}
@@
-182,6
+183,10
@@
int main(int argc, char **argv)
quiet = 1;
continue;
}
quiet = 1;
continue;
}
+ if (!strcmp(arg, "-n")) {
+ not_new = 1;
+ continue;
+ }
if (!memcmp(arg, "--prefix=", 9)) {
base_dir = arg+9;
continue;
if (!memcmp(arg, "--prefix=", 9)) {
base_dir = arg+9;
continue;