git/t/t7502-commit.sh, branch v1.6.3

t7502-commit: Skip SIGTERM test on Windows

2009-03-25T20:25:57Z

The implementation of exec on Windows is just a rough approximation of the POSIX behavior. In particular, no real process "overlay" happens (a new process is spawned instead and the parent process waits until the child terminates). In particular, the process ID cannot be taken by the exec'd process. But there is one test in t7502-commit.sh that depends on this. We have to skip it on Windows. Signed-off-by: Johannes Sixt

wt-status: load diff ui config

2008-10-26T21:09:48Z

When "git status -v" shows a diff, we did not respect the user's usual diff preferences at all. Loading just git_diff_basic_config would give us things like rename limits and diff drivers. But it makes even more sense to load git_diff_ui_config, which gives us colorization if the user has requested it. Note that we need to take special care to cancel colorization when writing to the commit template file, as described in the code comments. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Compact commit template message

2008-07-31T18:20:13Z

We recently let the user know explicitly that an empty commit message will abort the commit. However, this adds yet another line to the template; let's rephrase and re-wrap so that this fits back on two lines. This patch also makes the "fatal: empty commit message?" warning a bit less scary, since this is now a "feature" instead of an error. However, we retain the non-zero exit status to indicate to callers that nothing was committed. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Advertise the ability to abort a commit

2008-07-30T07:00:02Z

This treats aborting a commit more like a feature. Signed-off-by: Anders Melchiorsen Signed-off-by: Junio C Hamano

t7502-commit.sh: rearrange test to make more portable

2008-07-23T18:36:31Z

Some shells have problems with one-shot environment variable export and function calls. The sequence is rearranged to avoid the one-shot and to allow the test script to be linked together with '&&'. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

t7502-commit.sh: test_must_fail doesn't work with inline environment variables

2008-06-19T23:07:06Z

When the arguments to test_must_fail() begin with a variable assignment, test_must_fail() attempts to execute the variable assignment as a command. This fails, and so test_must_fail returns with a successful status value without running the command it was intended to test. For example, the following script: #!/bin/sh test_must_fail () { "$@" test $? -gt 0 -a $? -le 129 } foo='wo adrian' test_must_fail foo='yo adrian' sh -c 'echo foo: $foo' always exits zero and prints the message: test.sh: line 3: foo=yo adrian: command not found Test 16 calls test_must_fail in such a way and therefore has not been testing whether git 'do[es] not fire editor in the presence of conflicts'. A workaround is to set and export the variable in a normal way, not using one-shot notation. Because this would affect the remainder of the process, the test is done inside a subshell. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

t7502: honor SHELL_PATH

2008-06-04T19:11:59Z

Signed-off-by: Junio C Hamano

t7502: tighten loosely written test sequence

2008-06-04T01:13:33Z

We would like to catch breakage at any step in the sequence. Signed-off-by: Junio C Hamano

t7502: do not globally unset GIT_COMMITTER_* environment variables

2008-06-04T01:08:08Z

One particular test wants to check the behaviour of the command when these variables are not set, but the later tests should have the reliable committer identity for repeatable tests. Move the "unset" of the variables inside a subshell in the test that wants to unset them. Signed-off-by: Junio C Hamano

commit: drop duplicated parents

2008-06-03T06:55:57Z

The scripted version of git-commit internally used git-commit-tree which omitted duplicated parents given from the command line. This prevented a nonsensical octopus merge from getting created even when you said "git merge A B" while you are already on branch A. However, when git-commit was rewritten in C, this sanity check was lost. This resurrects it. Signed-off-by: Junio C Hamano