diff options
author | Junio C Hamano <junkio@cox.net> | 2005-09-08 18:50:33 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-09-08 18:50:33 -0700 |
commit | bc6146d2abcf3800eb3683cfe972cabd38ff4796 (patch) | |
tree | 061f79e214d9071b392d530ca83d0c12b1ba4200 /t/t1005-read-tree-m-2way-emu23.sh | |
parent | 2f0f8b71ee45bcf91c2de480474a26030596fe3c (diff) | |
download | git-bc6146d2abcf3800eb3683cfe972cabd38ff4796.tar.gz |
'build' scripts before installing.
Earlier we renamed git-foo.sh to git-foo while installing, which
was mostly done by inertia than anything else. This however
made writing tests to use scripts harder.
This patch builds the scripts the same way as we build binaries
from their sources. As a side effect, you can now specify
non-standard paths you have your Perl binary is in when running
the make.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t1005-read-tree-m-2way-emu23.sh')
-rwxr-xr-x | t/t1005-read-tree-m-2way-emu23.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1005-read-tree-m-2way-emu23.sh b/t/t1005-read-tree-m-2way-emu23.sh index 00c332a140..258a372ed7 100755 --- a/t/t1005-read-tree-m-2way-emu23.sh +++ b/t/t1005-read-tree-m-2way-emu23.sh @@ -25,7 +25,7 @@ In the test, these paths are used: read_tree_twoway () { git-read-tree --emu23 "$1" "$2" && git-ls-files --stage && - git-merge-index ../../git-merge-one-file.sh -a && + git-merge-index git-merge-one-file -a && git-ls-files --stage } |