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

Git.pm: tentative fix to test the freshly built Git.pm

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-06-24 19:41:03 -07:00
parent d595a473ee
commit f6276fe159
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -531,9 +531,12 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
chmod +x $@+ chmod +x $@+
mv $@+ $@ mv $@+ $@
$(patsubst %.perl,%,$(SCRIPT_PERL)) : % : %.perl $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/Makefile
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
rm -f $@ $@+ rm -f $@ $@+
sed -e '1s|#!.*perl\(.*\)|#!$(PERL_PATH_SQ)\1 -I'"$$(make -s -C perl instlibdir)"'|' \ INSTLIBDIR=$$(make -s -C perl instlibdir) && \
sed -e '1s|#!.*perl\(.*\)|#!$(PERL_PATH_SQ)\1|' \
-e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
$@.perl >$@+ $@.perl >$@+
chmod +x $@+ chmod +x $@+

1
git-fmt-merge-msg.perl
View File

@ -5,6 +5,7 @@
# Read .git/FETCH_HEAD and make a human readable merge message # Read .git/FETCH_HEAD and make a human readable merge message
# by grouping branches and tags together to form a single line. # by grouping branches and tags together to form a single line.
unshift @INC, '@@INSTLIBDIR@@';
use strict; use strict;
use Git; use Git;
use Error qw(:try); use Error qw(:try);