undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* sb/read-cache-one-indent-style-fix:
  read-cache: fix indentation in read_index_from
This commit is contained in:
Junio C Hamano 2015-09-02 12:50:18 -07:00
commit 8f8386eeb4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
read-cache.c
View File

@ -1654,7 +1654,7 @@ int read_index_from(struct index_state *istate, const char *path)
die("broken index, expect %s in %s, got %s", die("broken index, expect %s in %s, got %s",
sha1_to_hex(split_index->base_sha1), sha1_to_hex(split_index->base_sha1),
git_path("sharedindex.%s", 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)); sha1_to_hex(split_index->base->sha1));
merge_base_index(istate); merge_base_index(istate);
check_ce_order(istate); check_ce_order(istate);