mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hv/submodule-alt-odb'

Browse Source 
When peeking into object stores of submodules, the code forgot that they
might borrow objects from alternate object stores on their own.

By Heiko Voigt
* hv/submodule-alt-odb:
  teach add_submodule_odb() to look for alternates
This commit is contained in:
Junio C Hamano
2012-05-23 13:35:05 -07:00
parent aa3bb87176 5e73633dbf
commit 4809ff858b
4 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@ -947,6 +947,7 @@ extern struct alternate_object_database {
char base[FLEX_ARRAY]; /* more */ char base[FLEX_ARRAY]; /* more */
} *alt_odb_list; } *alt_odb_list;
extern void prepare_alt_odb(void); extern void prepare_alt_odb(void);
extern void read_info_alternates(const char * relative_base, int depth);
extern void add_to_alternates_file(const char *reference); extern void add_to_alternates_file(const char *reference);
typedef int alt_odb_fn(struct alternate_object_database *, void *); typedef int alt_odb_fn(struct alternate_object_database *, void *);
extern void foreach_alt_odb(alt_odb_fn, void*); extern void foreach_alt_odb(alt_odb_fn, void*);

3
sha1_file.c
View File

@ -229,7 +229,6 @@ char *sha1_pack_index_name(const unsigned char *sha1)
struct alternate_object_database *alt_odb_list; struct alternate_object_database *alt_odb_list;
static struct alternate_object_database **alt_odb_tail; static struct alternate_object_database **alt_odb_tail;
static void read_info_alternates(const char * alternates, int depth);
static int git_open_noatime(const char *name); static int git_open_noatime(const char *name);
/* /*
@ -354,7 +353,7 @@ static void link_alt_odb_entries(const char *alt, const char *ep, int sep,
} }
} }
static void read_info_alternates(const char * relative_base, int depth) void read_info_alternates(const char * relative_base, int depth)
{ {
char *map; char *map;
size_t mapsz; size_t mapsz;

3
submodule.c
View File

@ -63,6 +63,9 @@ static int add_submodule_odb(const char *path)
alt_odb->name[40] = '\0'; alt_odb->name[40] = '\0';
alt_odb->name[41] = '\0'; alt_odb->name[41] = '\0';
alt_odb_list = alt_odb; alt_odb_list = alt_odb;
/* add possible alternates from the submodule */
read_info_alternates(objects_directory.buf, 0);
prepare_alt_odb(); prepare_alt_odb();
done: done:
strbuf_release(&objects_directory); strbuf_release(&objects_directory);

34
t/t4041-diff-submodule-option.sh
View File

@ -458,4 +458,38 @@ EOF
test_cmp expected actual test_cmp expected actual
' '
test_expect_success 'diff --submodule with objects referenced by alternates' '
mkdir sub_alt &&
(cd sub_alt &&
git init &&
echo a >a &&
git add a &&
git commit -m a
) &&
mkdir super &&
(cd super &&
git clone -s ../sub_alt sub &&
git init &&
git add sub &&
git commit -m "sub a"
) &&
(cd sub_alt &&
sha1_before=$(git rev-parse --short HEAD)
echo b >b &&
git add b &&
git commit -m b
sha1_after=$(git rev-parse --short HEAD)
echo "Submodule sub $sha1_before..$sha1_after:
> b" >../expected
) &&
(cd super &&
(cd sub &&
git fetch &&
git checkout origin/master
) &&
git diff --submodule > ../actual
)
test_cmp expected actual
'
test_done test_done