summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2008-04-09 21:14:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-10 07:20:38 (GMT)
commitac7fa2776c4a839a5a96c13886714774b52844de (patch)
tree9d07d1203f5cd3c2bfbd5d2c22f894f36fd805ac /merge-tree.c
parent3f36cbbaaf87b67abafa851e2808735553f92b06 (diff)
downloadgit-ac7fa2776c4a839a5a96c13886714774b52844de.zip
git-ac7fa2776c4a839a5a96c13886714774b52844de.tar.gz
git-ac7fa2776c4a839a5a96c13886714774b52844de.tar.bz2
git-archive: ignore prefix when checking file attribute
Ulrik Sverdrup noticed that git-archive doesn't correctly apply the attribute export-subst when the option --prefix is given, too. When it checked if a file has the attribute turned on, git-archive would try to look up the full path -- including the prefix -- in .gitattributes. That's wrong, as the prefix doesn't need to have any relation to any existing directories, tracked or not. This patch makes git-archive ignore the prefix when looking up if value of the attribute export-subst for a file. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions