提交 8f8386ee 编写于 作者: J Junio C Hamano

Merge branch 'sb/read-cache-one-indent-style-fix'

* sb/read-cache-one-indent-style-fix:
  read-cache: fix indentation in read_index_from
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册