Merge branch 'maint-1.8.1' into maint-1.8.2

diff --git a/transport-helper.c b/transport-helper.c
index cb3ef7d38e475480a5d81ce6077c4c87ea09a318..fdd79d8b35010ae7ed6515abc9a9fd7865a5851d 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -211,9 +211,8 @@ static struct child_process *get_helper(struct transport *transport)
                int i;
                data->refspec_nr = refspec_nr;
                data->refspecs = parse_fetch_refspec(refspec_nr, refspecs);
-               for (i = 0; i < refspec_nr; i++) {
+               for (i = 0; i < refspec_nr; i++)
                        free((char *)refspecs[i]);
-               }
                free(refspecs);
        }
        strbuf_release(&buf);
@@ -991,7 +990,7 @@ struct unidirectional_transfer {
        int src_is_sock;
        /* Is destination socket? */
        int dest_is_sock;
-       /* Transfer state (TRANSFERING/FLUSHING/FINISHED) */
+       /* Transfer state (TRANSFERRING/FLUSHING/FINISHED) */
        int state;
        /* Buffer. */
        char buf[BUFFERSIZE];