projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cvsserver' of http://locke.catalyst.net.nz/git/git-martinlanghoff;...
[git.git]
/
read-tree.c
diff --git
a/read-tree.c
b/read-tree.c
index
4e0cdda
..
f39fe5c
100644
(file)
--- a/
read-tree.c
+++ b/
read-tree.c
@@
-404,7
+404,7
@@
static void verify_uptodate(struct cache_entry *ce)
return;
if (!lstat(ce->name, &st)) {
return;
if (!lstat(ce->name, &st)) {
- unsigned changed = ce_match_stat(ce, &st);
+ unsigned changed = ce_match_stat(ce, &st
, 1
);
if (!changed)
return;
errno = 0;
if (!changed)
return;
errno = 0;
@@
-619,7
+619,7
@@
static int twoway_merge(struct cache_entry **src)
struct cache_entry *oldtree = src[1], *newtree = src[2];
if (merge_size != 2)
struct cache_entry *oldtree = src[1], *newtree = src[2];
if (merge_size != 2)
- return error("Cannot do a twoway merge of %d trees
\n
",
+ return error("Cannot do a twoway merge of %d trees",
merge_size);
if (current) {
merge_size);
if (current) {
@@
-671,7
+671,7
@@
static int oneway_merge(struct cache_entry **src)
struct cache_entry *a = src[1];
if (merge_size != 1)
struct cache_entry *a = src[1];
if (merge_size != 1)
- return error("Cannot do a oneway merge of %d trees
\n
",
+ return error("Cannot do a oneway merge of %d trees",
merge_size);
if (!a)
merge_size);
if (!a)