OSDN Git Service
(root)
/
git-core
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aecce6d
)
read-cache: fix indentation in read_index_from
author
Stefan Beller
<sbeller@google.com>
Mon, 31 Aug 2015 18:43:29 +0000
(11:43 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 31 Aug 2015 19:31:00 +0000
(12:31 -0700)
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
read-cache.c
patch
|
blob
|
history
diff --git
a/read-cache.c
b/read-cache.c
index
ab1bfc9
..
87204a5
100644
(file)
--- a/
read-cache.c
+++ b/
read-cache.c
@@
-1654,7
+1654,7
@@
int read_index_from(struct index_state *istate, const char *path)
die("broken index, expect %s in %s, got %s",
sha1_to_hex(split_index->base_sha1),
git_path("sharedindex.%s",
-
sha1_to_hex(split_index->base_sha1)),
+ sha1_to_hex(split_index->base_sha1)),
sha1_to_hex(split_index->base->sha1));
merge_base_index(istate);
check_ce_order(istate);