Merge branch 'fc/do-not-use-the-index-in-add-to-index' into next
commit94e7b6077c76217de7276e31c82003b11537d20e
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Jun 2013 22:26:00 +0000 (4 15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Jun 2013 22:26:01 +0000 (4 15:26 -0700)
tree07b54d01e14d13ad873e3c92ec92e7d19fd58287
parenta603082874fa37ae33fad52a22170084f2160c5b
parentc4aa3167fe9dd0b94594c20d8b3673929fcb217d
Merge branch 'fc/do-not-use-the-index-in-add-to-index' into next

add_to_index() should have checked with the istate it was operating
on, but by mistake looked at the_index (the global default).

* fc/do-not-use-the-index-in-add-to-index:
  read-cache: trivial style cleanups
  read-cache: fix wrong 'the_index' usage
read-cache.c