diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-24 16:31:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-24 16:31:25 -0800 |
| commit | ab002e34e26c39a716dc80359450f739ba907122 (patch) | |
| tree | 8728bf9611ec83ea36325960c43c707aa43820b3 /t/t7501-commit.sh | |
| parent | 25f3cd527dec9909322a0f76458a0b602de61141 (diff) | |
| parent | 1f759eeede0597580be8ce26305550350e3c017a (diff) | |
| download | git-ab002e34e26c39a716dc80359450f739ba907122.tar.gz git-ab002e34e26c39a716dc80359450f739ba907122.tar.xz | |
Merge branch 'js/mingw-fallouts'
* js/mingw-fallouts:
fetch-pack: Prepare for a side-band demultiplexer in a thread.
rehabilitate some t5302 tests on 32-bit off_t machines
Allow ETC_GITCONFIG to be a relative path.
Introduce git_etc_gitconfig() that encapsulates access of ETC_GITCONFIG.
Allow a relative builtin template directory.
Close files opened by lock_file() before unlinking.
builtin run_command: do not exit with -1.
Move #include <sys/select.h> and <sys/ioctl.h> to git-compat-util.h.
Use is_absolute_path() in sha1_file.c.
Skip t3902-quoted.sh if the file system does not support funny names.
t5302-pack-index: Skip tests of 64-bit offsets if necessary.
t7501-commit.sh: Not all seds understand option -i
t5300-pack-object.sh: Split the big verify-pack test into smaller parts.
Diffstat (limited to 't/t7501-commit.sh')
| -rwxr-xr-x | t/t7501-commit.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 9dba104b1..31a6f6339 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -79,7 +79,8 @@ test_expect_success \ cat >editor <<\EOF #!/bin/sh -sed -i -e "s/a file/an amend commit/g" $1 +sed -e "s/a file/an amend commit/g" < $1 > $1- +mv $1- $1 EOF chmod 755 editor @@ -98,7 +99,8 @@ test_expect_success \ cat >editor <<\EOF #!/bin/sh -sed -i -e "s/amend/older/g" $1 +sed -e "s/amend/older/g" < $1 > $1- +mv $1- $1 EOF chmod 755 editor |