Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
read-cache: fix wrong 'the_index' usage
author
Felipe Contreras
<felipe.contreras@gmail.com>
Thu, 30 May 2013 13:56:18 +0000
(08:56 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 3 Jun 2013 17:10:25 +0000
(10:10 -0700)
We are dealing with the 'istate' index, not 'the_index'.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
read-cache.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
1599999
)
diff --git
a/read-cache.c
b/read-cache.c
index fda78bc353afcfd4d01864f2a13158d9c9c55173..aeda7180bac62c14b431d6bd96d5b314e013ff04 100644
(file)
--- a/
read-cache.c
+++ b/
read-cache.c
@@
-622,7
+622,7
@@
int add_to_index(struct index_state *istate, const char *path, struct stat *st,
if (*ptr == '/') {
struct cache_entry *foundce;
++ptr;
- foundce = index_name_exists(
&the_index
, ce->name, ptr - ce->name, ignore_case);
+ foundce = index_name_exists(
istate
, ce->name, ptr - ce->name, ignore_case);
if (foundce) {
memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
startPtr = ptr;