Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sb/read-cache-one-indent-style-fix'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 2 Sep 2015 19:50:18 +0000
(12:50 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 2 Sep 2015 19:50:18 +0000
(12:50 -0700)
* sb/read-cache-one-indent-style-fix:
read-cache: fix indentation in read_index_from
read-cache.c
patch
|
blob
|
history
raw
(from parent 1:
83d9092
)
diff --git
a/read-cache.c
b/read-cache.c
index ab1bfc94d6eab530723d5fabe6093bb9929de35c..87204a50a5cfe2acbdb0563a68f88303a5eb7ae7 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);