Merge branch 'dt/cat-file-follow-symlinks'
commit67f0b6f3b2226ea858c616028375dcc3c46ccc37
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Jun 2015 19:45:16 +0000 (1 12:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Jun 2015 19:45:16 +0000 (1 12:45 -0700)
tree598a4db2b8e80916be9c2074490070bdd15e4df4
parent4ba5bb5531c6ec64a57ae2754ba51ce477eebaf0
parent122d53464b29d3ac20891c5ee2f75ac5ecbb7b20
Merge branch 'dt/cat-file-follow-symlinks'

"git cat-file --batch(-check)" learned the "--follow-symlinks"
option that follows an in-tree symbolic link when asked about an
object via extended SHA-1 syntax, e.g. HEAD:RelNotes that points at
Documentation/RelNotes/2.5.0.txt.  With the new option, the command
behaves as if HEAD:Documentation/RelNotes/2.5.0.txt was given as
input instead.

* dt/cat-file-follow-symlinks:
  cat-file: add --follow-symlinks to --batch
  sha1_name: get_sha1_with_context learns to follow symlinks
  tree-walk: learn get_tree_entry_follow_symlinks
Documentation/git-cat-file.txt
builtin/cat-file.c
cache.h
sha1_name.c
t/t1006-cat-file.sh