projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-write-tree writes garbage on sparc64
[git.git]
/
apply.c
diff --git
a/apply.c
b/apply.c
index
269210a
..
acecf8d
100644
(file)
--- a/
apply.c
+++ b/
apply.c
@@
-8,6
+8,7
@@
*/
#include <fnmatch.h>
#include "cache.h"
*/
#include <fnmatch.h>
#include "cache.h"
+#include "cache-tree.h"
#include "quote.h"
#include "blob.h"
#include "quote.h"
#include "blob.h"
@@
-1717,6
+1718,7
@@
static void remove_file(struct patch *patch)
if (write_index) {
if (remove_file_from_cache(patch->old_name) < 0)
die("unable to remove %s from index", patch->old_name);
if (write_index) {
if (remove_file_from_cache(patch->old_name) < 0)
die("unable to remove %s from index", patch->old_name);
+ cache_tree_invalidate_path(active_cache_tree, patch->old_name);
}
unlink(patch->old_name);
}
}
unlink(patch->old_name);
}
@@
-1813,8
+1815,9
@@
static void create_file(struct patch *patch)
if (!mode)
mode = S_IFREG | 0644;
if (!mode)
mode = S_IFREG | 0644;
- create_one_file(path, mode, buf, size);
+ create_one_file(path, mode, buf, size);
add_index_file(path, mode, buf, size);
add_index_file(path, mode, buf, size);
+ cache_tree_invalidate_path(active_cache_tree, path);
}
static void write_out_one_result(struct patch *patch)
}
static void write_out_one_result(struct patch *patch)