diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-19 11:15:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-19 11:15:48 -0700 |
| commit | e3d44930318ed3746fe6da51913602d4fad8daaf (patch) | |
| tree | b0261d0a69cdbdf78a6bbc485324f76a6f1a2c26 | |
| parent | Update draft release notes to 1.8.4 (diff) | |
| parent | Start preparing for 1.8.3.4 (diff) | |
| download | tgif-e3d44930318ed3746fe6da51913602d4fad8daaf.tar.xz | |
Sync with maint
| -rw-r--r-- | Documentation/RelNotes/1.8.3.4.txt | 15 | ||||
| -rw-r--r-- | Documentation/git-reset.txt | 2 | ||||
| -rw-r--r-- | builtin/apply.c | 2 | ||||
| -rw-r--r-- | http-push.c | 2 |
4 files changed, 18 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.8.3.4.txt b/Documentation/RelNotes/1.8.3.4.txt new file mode 100644 index 0000000000..24ee2b8017 --- /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/Documentation/git-reset.txt b/Documentation/git-reset.txt index a404b47b7b..f445cb38fa 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -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 diff --git a/builtin/apply.c b/builtin/apply.c index 0e9b631db6..ff01ebff3d 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 == '"') { diff --git a/http-push.c b/http-push.c index 395a8cfc10..6dad188b5f 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 */ |