Merge branch 'th/diff-no-index-fixes'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Jul 2012 06:40:38 +0000 (23:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Jul 2012 06:40:38 +0000 (23:40 -0700)
commit60ad08bfdfe393fd86391e2f9e60e8ffccc78e5b
treee856039e5ad6149a72dfa5d9160ff1b1888dd23e
parent348c44e78eb079fa97a575f8fb8c1fcac747efe5
parent304970dd5d9e542e70eca98932c1e9f26770678e
Merge branch 'th/diff-no-index-fixes'

"git diff --no-index" did not correctly handle relative paths and
did not give correct exit codes when run under "--quiet" option.

* th/diff-no-index-fixes:
  diff-no-index: exit(1) if 'diff --quiet <repo file> <external file>' finds changes
  diff: handle relative paths in no-index
cache.h
diff-no-index.c
setup.c