projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jc/mention-tracking-for-pull-default'
[git.git]
/
unpack-trees.c
diff --git
a/unpack-trees.c
b/unpack-trees.c
index 0e1a196ace33110e2bb74cde90d6f62358413ead..09e53df3b2a39e7ec8c7d601c5b8b8ae4de39b9a 100644
(file)
--- a/
unpack-trees.c
+++ b/
unpack-trees.c
@@
-1020,7
+1020,7
@@
int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
if (!core_apply_sparse_checkout || !o->update)
o->skip_sparse_checkout = 1;
if (!o->skip_sparse_checkout) {
if (!core_apply_sparse_checkout || !o->update)
o->skip_sparse_checkout = 1;
if (!o->skip_sparse_checkout) {
- if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0,
NULL,
&el, 0) < 0)
+ if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0, &el, 0) < 0)
o->skip_sparse_checkout = 1;
else
o->el = ⪙
o->skip_sparse_checkout = 1;
else
o->el = ⪙