gitweb: Better cutting matched string and its context

diff --git a/http-push.c b/http-push.c
index 14ef652ca76a6abab44e5f5e5b3265c3cdb34506..0beb7406c34a19403062a6a2e2aeeee35566a45f 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -2390,7 +2390,8 @@ int main(int argc, char **argv)
 
                /* Generate a list of objects that need to be pushed */
                pushing = 0;
-               prepare_revision_walk(&revs);
+               if (prepare_revision_walk(&revs))
+                       die("revision walk setup failed");
                mark_edges_uninteresting(revs.commits);
                objects_to_send = get_delta(&revs, ref_lock);
                finish_all_active_slots();
@@ -2413,12 +2414,9 @@ int main(int argc, char **argv)
                } while (request_queue_head && !aborted);
 
                /* Update the remote branch if all went well */
-               if (aborted || !update_remote(ref->new_sha1, ref_lock)) {
+               if (aborted || !update_remote(ref->new_sha1, ref_lock))
                        rc = 1;
-                       goto unlock;
-               }
 
-       unlock:
                if (!rc)
                        fprintf(stderr, "    done\n");
                unlock_remote(ref_lock);