projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Imported Upstream version 2.13.2
[platform/upstream/git.git]
/
merge.c
diff --git
a/merge.c
b/merge.c
index
23866c9
..
04ee5fc
100644
(file)
--- a/
merge.c
+++ b/
merge.c
@@
-57,7
+57,7
@@
int checkout_fast_forward(const unsigned char *head,
refresh_cache(REFRESH_QUIET);
- if (hold_locked_index(lock_file,
0
) < 0)
+ if (hold_locked_index(lock_file,
LOCK_REPORT_ON_ERROR
) < 0)
return -1;
memset(&trees, 0, sizeof(trees));