On Fri, Jan 09, 2009 at 03:38:36AM -0500, Jeff King wrote:
> So the _real_ problem is that we are not always triggering the "wait for
> pager to finish" code because we exec and forget about it. Which means
> this strategy of "git runs child pager" will never work properly.
> Instead, we have to use three processes: git and the pager become child
> processes, while the original process waits for both to exit and returns
> the proper exit code from git.
>
> Let me try to work up a patch.
Below is a patch that uses the three-process mechanism, and it fixes the
problem. _But_ it is not satisfactory for inclusion, because it won't
work on MINGW32. Since it is actually splitting git into two processes
(one to monitor the pager and one to actually run git), it uses fork.
So I think to do things right, we have to be even more complicated. When
we spawn the pager, we keep git as a single process. We register the
atexit() handler to wait for the pager, and intercept any death signals
to do the same. Then, if we are running a builtin, it is business as
usual. But if we want to exec something, instead we have to actually
spawn into the three-process form. Meaning we have to use run_command to
start it, and then wait for it and the pager to return.
Of course, we don't know ahead of time whether exec'ing a command will
work: we find out by trying. So now we will end up creating a pipe and
fork()ing every time we want to see whether we can exec a command. But I
suppose that only happens once or twice, so maybe the performance impact
isn't relevant.
This is all getting complicated enough that I am tempted to just suggest
reverting ea27a18c. But even that won't fix everything, though, since
MINGW32 still needs to use run_command to spawn the pager. IOW, I think
the breakage you are seeing has always been broken on MINGW32.
Blah. Anyway, here is the Unix-only patch.
---
diff --git a/pager.c b/pager.c
index f19ddbc..68ae669 100644
--- a/pager.c
+++ b/pager.c
@@ -28,18 +28,10 @@ static void pager_preexec(void)
static const char *pager_argv[] = { "sh", "-c", NULL, NULL };
static struct child_process pager_process;
-static void wait_for_pager(void)
-{
- fflush(stdout);
- fflush(stderr);
- /* signal EOF to pager */
- close(1);
- close(2);
- finish_command(&pager_process);
-}
-
void setup_pager(void)
{
+ pid_t git_child;
+ int status;
const char *pager = getenv("GIT_PAGER");
if (!isatty(1))
@@ -68,14 +60,24 @@ void setup_pager(void)
if (start_command(&pager_process))
return;
- /* original process continues, but writes to the pipe */
- dup2(pager_process.in, 1);
- if (isatty(2))
- dup2(pager_process.in, 2);
- close(pager_process.in);
+ /* now spawn the actual git process */
+ git_child = fork();
+ if (git_child == -1)
+ die("unable to fork: %s", strerror(errno));
+ if (git_child == 0) {
+ dup2(pager_process.in, 1);
+ if (isatty(2))
+ dup2(pager_process.in, 2);
+ close(pager_process.in);
+ return;
+ }
- /* this makes sure that the parent terminates after the pager */
- atexit(wait_for_pager);
+ /* and the original process just waits for both to finish */
+ close(pager_process.in);
+ if (waitpid(git_child, &status, 0) < 0)
+ die("wait failure: %s", strerror(errno));
+ finish_command(&pager_process);
+ exit(status);
}
int pager_in_use(void)
--
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
