зеркало из https://github.com/microsoft/git.git
read-cache: fix indentation in read_index_from
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
aecce6d0ef
Коммит
6bea53c130
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче