undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tar-tree deprecation: we eat our own dog food.

Browse Source 
It is silly to keep using git-tar-tree in dist target when the
command gives a big deprecation warning when called.  Instead,
use "git-archive --format=tar" which we recommend to our users.

Update gitweb's snapshot feature to use git-archive for the same
reason.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-10-05 02:26:12 -07:00
parent 6030649591
commit 9ccb64c8e0
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -856,8 +856,9 @@ git.spec: git.spec.in
mv $@+ $@ mv $@+ $@
GIT_TARNAME=git-$(GIT_VERSION) GIT_TARNAME=git-$(GIT_VERSION)
dist: git.spec git-tar-tree dist: git.spec git-archive
./git-tar-tree HEAD^{tree} $(GIT_TARNAME) > $(GIT_TARNAME).tar ./git-archive --format=tar \
--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
@mkdir -p $(GIT_TARNAME) @mkdir -p $(GIT_TARNAME)
@cp git.spec $(GIT_TARNAME) @cp git.spec $(GIT_TARNAME)
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version @echo $(GIT_VERSION) > $(GIT_TARNAME)/version

9
gitweb/gitweb.perl
View File

@ -2838,9 +2838,12 @@ sub git_snapshot {
-content_disposition => 'inline; filename="' . "$filename" . '"', -content_disposition => 'inline; filename="' . "$filename" . '"',
-status => '200 OK'); -status => '200 OK');
my $git_command = git_cmd_str(); my $git = git_cmd_str();
open my $fd, "-|", "$git_command tar-tree $hash \'$project\' | $command" or my $name = $project;
die_error(undef, "Execute git-tar-tree failed."); $name =~ s/\047/\047\\\047\047/g;
open my $fd, "-|",
"$git archive --format=tar --prefix=\'$name\'/ $hash | $command"
or die_error(undef, "Execute git-tar-tree failed.");
binmode STDOUT, ':raw'; binmode STDOUT, ':raw';
print <$fd>; print <$fd>;
binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi