From debecc55583aa498dbc64a1d45b8abba324a2dae Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Fri, 19 Jul 2013 18:26:24 +0200 Subject: [PATCH 1/4] Documentation: "git reset " takes a tree-ish, not tree-sh Reported-By: Ibrahim M. Ghazal Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- Documentation/git-reset.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index a404b47b7..f445cb38f 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git reset' [-q] [] [--] ... -'git reset' (--patch | -p) [] [--] [...] +'git reset' (--patch | -p) [] [--] [...] 'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [] DESCRIPTION From 3def06e625099907fb44c519611188904b6937a2 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Thu, 18 Jul 2013 23:35:26 +0200 Subject: [PATCH 2/4] http-push.c::add_send_request(): do not initialize transfer_request That pointer will be assigned to new memory via request = xmalloc(sizeof(*request)); 20 lines later unconditionally anyway, so it's safe to not assign it to an arbitrary variable. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- http-push.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http-push.c b/http-push.c index 395a8cfc1..6dad188b5 100644 --- a/http-push.c +++ b/http-push.c @@ -663,7 +663,7 @@ static void add_fetch_request(struct object *obj) static int add_send_request(struct object *obj, struct remote_lock *lock) { - struct transfer_request *request = request_queue_head; + struct transfer_request *request; struct packed_git *target; /* Keep locks active */ From 1f976bd03f26b70dfbb26b3f9478df09709db966 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Thu, 18 Jul 2013 23:35:27 +0200 Subject: [PATCH 3/4] apply.c::find_name_traditional(): do not initialize len to the line's length The variable len is set to len = strchrnul(line, '\n') - line; unconditionally 9 lines later, hence we can remove the call to strlen. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- builtin/apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/apply.c b/builtin/apply.c index 0e9b631db..ff01ebff3 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -722,7 +722,7 @@ static char *find_name(const char *line, char *def, int p_value, int terminate) static char *find_name_traditional(const char *line, char *def, int p_value) { - size_t len = strlen(line); + size_t len; size_t date_len; if (*line == '"') { From f893b7420cdf085dfde809d4ea97cb8c03b81c94 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 19 Jul 2013 10:59:36 -0700 Subject: [PATCH 4/4] Start preparing for 1.8.3.4 Hopefully this will be the final maintenance release before we go to feature freeze for 1.8.4. --- Documentation/RelNotes/1.8.3.4.txt | 15 +++++++++++++++ RelNotes | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/1.8.3.4.txt diff --git a/Documentation/RelNotes/1.8.3.4.txt b/Documentation/RelNotes/1.8.3.4.txt new file mode 100644 index 000000000..24ee2b801 --- /dev/null +++ b/Documentation/RelNotes/1.8.3.4.txt @@ -0,0 +1,15 @@ +Git v1.8.3.4 Release Notes +========================== + +This update is mostly to propagate documentation fixes and test +updates from the master front back to the maintenance track. + +Fixes since v1.8.3.3 +-------------------- + + * The bisect log listed incorrect commits when bisection ends with + only skipped ones. + + * The test coverage framework was left broken for some time. + + * The test suite for HTTP transport did not run with Apache 2.4. diff --git a/RelNotes b/RelNotes index a5201213a..a95f779ae 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.8.3.3.txt \ No newline at end of file +Documentation/RelNotes/1.8.3.4.txt \ No newline at end of file