finalise 0.17~experimental2

diff --git a/debian/changelog b/debian/changelog
index 89f416eec75c87e9fbf23f73d4b964d5bccad10c..ae985a5ff60fb23adb5bc093c49c3197302cee92 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ dgit (0.17~experimental2) experimental; urgency=low
   Changes to remote functionality:
   * More bugfixes.
 
- --
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 23 Oct 2013 12:56:34 +0100
 
 dgit (0.17~experimental1) experimental; urgency=low
 

diff --git a/dgit b/dgit
index 497687ac2b7932d34a4eb5f893a0bdb647339b81..53083860f84920f5599583bff0fe0ccb9819c9da 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1504,16 +1504,6 @@ sub cmd_rpush {
        };
        i_method "i_resp", $icmd, $iargs;
     }
-
-    my $pid = $i_child_pid;
-    $i_child_pid = undef; # prevents killing some other process with same pid
-    printdebug "waiting for remote child $pid...";
-    my $got = waitpid $pid, 0;
-    die $! unless $got == $pid;
-    die "remote child failed $?" if $?;
-
-    i_cleanup();
-    exit 0;
 }
 
 sub i_resp_progress ($) {
@@ -1523,6 +1513,13 @@ sub i_resp_progress ($) {
 }
 
 sub i_resp_complete {
+    my $pid = $i_child_pid;
+    $i_child_pid = undef; # prevents killing some other process with same pid
+    printdebug "waiting for remote child $pid...";
+    my $got = waitpid $pid, 0;
+    die $! unless $got == $pid;
+    die "remote child failed $?" if $?;
+
     i_cleanup();
     exit 0;
 }