diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-11-01 13:47:47 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-01 13:47:47 -0700 |
commit | 4340a813d007b592534de664d152d66417dbe809 (patch) | |
tree | 731be77f39c37cd0c6b1ddf5bf8e50f1692ae9e7 /t | |
parent | 6959893b0b65ebc68ce2fb524a8ec15a26ca4972 (diff) | |
parent | 546bb5823249678bc6ad11e65661d896ed83448a (diff) | |
download | git-4340a813d007b592534de664d152d66417dbe809.tar.gz |
Merge branch 'js/forkexec'
* js/forkexec:
Use the asyncronous function infrastructure to run the content filter.
Avoid a dup2(2) in apply_filter() - start_command() can do it for us.
t0021-conversion.sh: Test that the clean filter really cleans content.
upload-pack: Run rev-list in an asynchronous function.
upload-pack: Move the revision walker into a separate function.
Use the asyncronous function infrastructure in builtin-fetch-pack.c.
Add infrastructure to run a function asynchronously.
upload-pack: Use start_command() to run pack-objects in create_pack_file().
Have start_command() create a pipe to read the stderr of the child.
Use start_comand() in builtin-fetch-pack.c instead of explicit fork/exec.
Use run_command() to spawn external diff programs instead of fork/exec.
Use start_command() to run content filters instead of explicit fork/exec.
Use start_command() in git_connect() instead of explicit fork/exec.
Change git_connect() to return a struct child_process instead of a pid_t.
Conflicts:
builtin-fetch-pack.c
Diffstat (limited to 't')
-rwxr-xr-x | t/t0021-conversion.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index a839f4e074..cb860296ed 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -42,7 +42,12 @@ test_expect_success check ' git diff --raw --exit-code :test :test.i && id=$(git rev-parse --verify :test) && embedded=$(sed -ne "$script" test.i) && - test "z$id" = "z$embedded" + test "z$id" = "z$embedded" && + + git cat-file blob :test.t > test.r && + + ./rot13.sh < test.o > test.t && + cmp test.r test.t ' # If an expanded ident ever gets into the repository, we want to make sure that |