Browse Source

Sync with maint

maint
Junio C Hamano 12 years ago
parent
commit
e3d4493031
  1. 15
      Documentation/RelNotes/1.8.3.4.txt
  2. 2
      Documentation/git-reset.txt
  3. 2
      builtin/apply.c
  4. 2
      http-push.c

15
Documentation/RelNotes/1.8.3.4.txt

@ -0,0 +1,15 @@ @@ -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.

2
Documentation/git-reset.txt

@ -9,7 +9,7 @@ SYNOPSIS @@ -9,7 +9,7 @@ SYNOPSIS
--------
[verse]
'git reset' [-q] [<tree-ish>] [--] <paths>...
'git reset' (--patch | -p) [<tree-sh>] [--] [<paths>...]
'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]
'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>]

DESCRIPTION

2
builtin/apply.c

@ -722,7 +722,7 @@ static char *find_name(const char *line, char *def, int p_value, int terminate) @@ -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 == '"') {

2
http-push.c

@ -663,7 +663,7 @@ static void add_fetch_request(struct object *obj) @@ -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 */

Loading…
Cancel
Save