Skip to content

Commit

Permalink
Merge branch 'sb/read-cache-one-indent-style-fix'
Browse files Browse the repository at this point in the history
* sb/read-cache-one-indent-style-fix:
  read-cache: fix indentation in read_index_from
  • Loading branch information
Junio C Hamano committed Sep 2, 2015
2 parents 83d9092 + 6bea53c commit 8f8386e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion read-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 8f8386e

Please sign in to comment.