diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-02 12:50:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-02 12:50:18 -0700 |
| commit | 8f8386eeb43e12a6c9704915994e6075a5a9b1cf (patch) | |
| tree | c0d0e893a5e12f9787806e074f0f84628151ea3a | |
| parent | 83d9092f95cefa3f72ba772b8405b116b622553b (diff) | |
| parent | 6bea53c130a8f519fd534edfcd8116d2963afce8 (diff) | |
| download | git-8f8386eeb43e12a6c9704915994e6075a5a9b1cf.tar.gz git-8f8386eeb43e12a6c9704915994e6075a5a9b1cf.tar.xz | |
Merge branch 'sb/read-cache-one-indent-style-fix'
* sb/read-cache-one-indent-style-fix:
read-cache: fix indentation in read_index_from
| -rw-r--r-- | read-cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/read-cache.c b/read-cache.c index ab1bfc94d..87204a50a 100644 --- 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); |