From: Johannes Sixt <j6t@xxxxxxxx> Jeff King schrieb: > On Fri, Jan 09, 2009 at 11:36:41AM +0100, Johannes Sixt wrote: > >> I'll test your other patch (that replaces the execvp in git.c by >> run_command). > > There is something funny with it that I have not diagnosed: aliases are > broken, and "git foobar" does not return an error. Presumably just > checking the "we did not exec succesfully" case is not triggering > properly. However, I think the right solution is actually to refactor > git.c to figure out ahead of time whether we have a builtin, external, > or alias. I can work on that, but not tonight, as my git-time is up for > now. > > But other than that, did it work for you on Windows? It passed the test suite. This should already work better on Windows, because we already *do* look-up the program, and exit from mingw_spawnvpe() before the equivalent of fork+exec happens. > However, here is a 4-patch series that handles the separate signal > delivery problem. It should fix the "^C makes funny things happen" > problems you were seeing. Please test and let me know how it works on > Windows. It does help a bit. The interesting thing is that the only case where I can now reproduces the unwanted behavior with the unpatched version is when all output was completely read by 'less' and git already waits in wait_for_pager(), such as in 'git show'. But Ctrl-C'ing a 'git log -p' works as expected even without these patches. With the patches, the 'git show' case now works as well. > The patches are: > 1/4: Makefile: clean up TEST_PROGRAMS definition > 2/4: chain kill signals for cleanup functions > 3/4: refactor signal handling for cleanup functions > 4/4: pager: do wait_for_pager on signal death But we need to insert the patch below *before* 2/4. The test case needs a change, too,(exit code on Windows is 3, not 130) but I'll keep that in my repository, like with all other Windows related test suite changes. -- Hannes -- 8< -- From: Johannes Sixt <j6t@xxxxxxxx> Subject: Windows: Fix signal numbers We had defined some SIG_FOO macros that appear in the code, but that are not supported on Windows, in order to make the code compile. But a subsequent change will assert that a signal number is non-zero. We now use the signal numbers that are commonly used on POSIX systems. Signed-off-by: Johannes Sixt <j6t@xxxxxxxx> --- compat/mingw.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compat/mingw.h b/compat/mingw.h index 4f275cb..a255898 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -21,12 +21,12 @@ typedef int pid_t; #define WEXITSTATUS(x) ((x) & 0xff) #define WIFSIGNALED(x) ((unsigned)(x) > 259) -#define SIGKILL 0 -#define SIGCHLD 0 -#define SIGPIPE 0 -#define SIGHUP 0 -#define SIGQUIT 0 -#define SIGALRM 100 +#define SIGHUP 1 +#define SIGQUIT 3 +#define SIGKILL 9 +#define SIGPIPE 13 +#define SIGALRM 14 +#define SIGCHLD 17 #define F_GETFD 1 #define F_SETFD 2 -- 1.6.1.rc4.959.gcece.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
