diff options
author | Pete Wyckoff <pw@padd.com> | 2014-01-21 18:16:44 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-01-22 08:06:19 -0800 |
commit | 0cf1b72a38e6190a7e614bbc53fbb81704a3d4af (patch) | |
tree | b9cc9161d83b70a11387bd0691ddfc7b3928c30f /builtin/merge.c | |
parent | git p4 test: run as user "author" (diff) | |
download | tgif-0cf1b72a38e6190a7e614bbc53fbb81704a3d4af.tar.xz |
git p4 test: do not pollute /tmp
Generating the submit template for p4 uses tempfile.mkstemp(),
which by default puts files in /tmp. For a test that fails,
possibly on purpose, this is not cleaned up. Run with TMPDIR
pointing into the trash directory so the temp files go away
with the test results.
To do this required some other minor changes. First, the editor
is launched using system(editor + " " + template_file), using
shell expansion to build the command string. This doesn't work
if editor has a space in it. And is generally unwise as it's
easy to fool the shell into doing extra work. Exec the args
directly, without shell expansion.
Second, without shell expansion, the trick of "P4EDITOR=:" used
in the tests doesn't work. Use a real command, true, as the
non-interactive editor for testing.
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions