summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-branches-default-merge_branches-default
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2008-10-26 00:46:21 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-10-26 14:09:48 -0700
commit2675773af893ae81f9b09f18c1f2ec86ca2158e7 (patch)
tree8f0fed7f4cbfb7f74804c574e698079899906fea /t/t5515/fetch.br-branches-default-merge_branches-default
parentuserdiff: require explicitly allowing textconv (diff)
downloadtgif-2675773af893ae81f9b09f18c1f2ec86ca2158e7.tar.xz
only textconv regular files
We treat symlinks as text containing the results of the symlink, so it doesn't make much sense to text-convert them. Similarly gitlink components just end up as the text "Subproject commit $sha1", which we should leave intact. Note that a typechange may be broken into two parts: the removal of the old part and the addition of the new. In that case, we _do_ show the textconv for any part which is the addition or removal of a file we would ordinarily textconv, since it is purely acting on the file contents. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/fetch.br-branches-default-merge_branches-default')
0 files changed, 0 insertions, 0 deletions