summaryrefslogtreecommitdiff
path: root/git-rebase--preserve-merges.sh
diff options
context:
space:
mode:
authorLibravatar SZEDER Gábor <szeder.dev@gmail.com>2019-03-13 13:24:10 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-03-14 12:34:39 +0900
commit80a539acf6663ec97bfbf552faa32105bd7f599f (patch)
treecc519df303b7de0b874c69061ab8c39fa7383eea /git-rebase--preserve-merges.sh
parenttest-lib: fix interrupt handling with 'dash' and '--verbose-log -x' (diff)
downloadtgif-80a539acf6663ec97bfbf552faa32105bd7f599f.tar.xz
t/lib-git-daemon: make sure to kill the 'git-daemon' process
After 'start_git_daemon' starts 'git daemon' (note the space in the middle) in the background, it saves the background process' PID, so the daemon can be stopped at the end of the test script. However, 'git-daemon' is not a builtin but a dashed external command, which means that the dashless 'git daemon' executes the dashed 'git-daemon' command, and, consequently, the PID recorded is not the PID of the "real" daemon process, but that of the main 'git' wrapper. Now, if a test script involving 'git daemon' is interrupted by ctrl-C, then only the main 'git' process is stopped, but the real daemon process tends to survive somehow, and keeps on running in the background indefinitely, keeping the daemon's port to itself, and thus preventing subsequent runs of the same test script. Work this around by running 'git daemon' with the '--pidfile=...' option to save the PID of the real daemon process, and kill that process in 'stop_git_daemon' as well. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--preserve-merges.sh')
0 files changed, 0 insertions, 0 deletions