Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/ref-symlink-loop' into maint
[gitweb.git]
/
builtin
/
checkout.c
diff --git
a/builtin/checkout.c
b/builtin/checkout.c
index 0ad96786c9a257e2b4f3fd8325c68ae183c4b0f9..32cf317ec244f0f08d2a2174e3e5b6279cde5b85 100644
(file)
--- a/
builtin/checkout.c
+++ b/
builtin/checkout.c
@@
-548,7
+548,7
@@
static int merge_working_tree(const struct checkout_opts *opts,
* entries in the index.
*/
- add_files_to_cache(NULL, NULL, 0
, 0
);
+ add_files_to_cache(NULL, NULL, 0);
/*
* NEEDSWORK: carrying over local changes
* when branches have different end-of-line