From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Feb 2014 22:01:37 +0000 (-0800)
Subject: Merge branch 'mw/symlinks'
X-Git-Tag: v2.0.0-rc0~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a342058f62d24d6ff62a0f6e81d3e60291eae94;p=thirdparty%2Fgit.git

Merge branch 'mw/symlinks'

All subcommands that take pathspecs mishandled an in-tree symbolic
link when given it as a full path from the root (which arguably is
a sick way to use pathspecs).  "git ls-files -s $(pwd)/RelNotes" in
our tree is an easy reproduction recipe.

* mw/symlinks:
  setup: don't dereference in-tree symlinks for absolute paths
  setup: add abspath_part_inside_repo() function
  t0060: add tests for prefix_path when path begins with work tree
  t0060: add test for prefix_path when path == work tree
  t0060: add test for prefix_path on symlinks via absolute paths
  t3004: add test for ls-files on symlinks via absolute paths
---

8a342058f62d24d6ff62a0f6e81d3e60291eae94