attr: be careful about sparse directories
Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
02155c8c00
commit
77efbb366a
15
attr.c
15
attr.c
|
@ -14,6 +14,7 @@
|
||||||
#include "utf8.h"
|
#include "utf8.h"
|
||||||
#include "quote.h"
|
#include "quote.h"
|
||||||
#include "thread-utils.h"
|
#include "thread-utils.h"
|
||||||
|
#include "dir.h"
|
||||||
|
|
||||||
const char git_attr__true[] = "(builtin)true";
|
const char git_attr__true[] = "(builtin)true";
|
||||||
const char git_attr__false[] = "\0(builtin)false";
|
const char git_attr__false[] = "\0(builtin)false";
|
||||||
|
@ -744,6 +745,20 @@ static struct attr_stack *read_attr_from_index(struct index_state *istate,
|
||||||
if (!istate)
|
if (!istate)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The .gitattributes file only applies to files within its
|
||||||
|
* parent directory. In the case of cone-mode sparse-checkout,
|
||||||
|
* the .gitattributes file is sparse if and only if all paths
|
||||||
|
* within that directory are also sparse. Thus, don't load the
|
||||||
|
* .gitattributes file since it will not matter.
|
||||||
|
*
|
||||||
|
* In the case of a sparse index, it is critical that we don't go
|
||||||
|
* looking for a .gitattributes file, as doing so would cause the
|
||||||
|
* index to expand.
|
||||||
|
*/
|
||||||
|
if (!path_in_cone_mode_sparse_checkout(path, istate))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
buf = read_blob_data_from_index(istate, path, NULL);
|
buf = read_blob_data_from_index(istate, path, NULL);
|
||||||
if (!buf)
|
if (!buf)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Reference in New Issue