git, branch v1.8.5.5

Git 1.8.5.5

2014-02-13T21:41:53Z

Signed-off-by: Junio C Hamano

Merge branch 'bm/merge-base-octopus-dedup' into maint

2014-02-13T21:38:59Z

"git merge-base --octopus" used to leave cleaning up suboptimal result to the caller, but now it does the clean-up itself. * bm/merge-base-octopus-dedup: merge-base --octopus: reduce the result from get_octopus_merge_bases() merge-base: separate "--independent" codepath into its own helper

Merge branch 'jc/revision-range-unpeel' into maint

2014-02-13T21:38:47Z

"git log --left-right A...B" lost the "leftness" of commits reachable from A when A is a tag as a side effect of a recent bugfix. This is a regression in 1.8.4.x series. * jc/revision-range-unpeel: revision: propagate flag bits from tags to pointees revision: mark contents of an uninteresting tree uninteresting

Merge branch 'jk/allow-fetch-onelevel-refname' into maint

2014-02-13T21:38:34Z

"git clone" would fail to clone from a repository that has a ref directly under "refs/", e.g. "refs/stash", because different validation paths do different things on such a refname. Loosen the client side's validation to allow such a ref. * jk/allow-fetch-onelevel-refname: fetch-pack: do not filter out one-level refs

Merge branch 'jk/interpret-branch-name-fix' into maint

2014-02-13T21:38:25Z

A handful of bugs around interpreting $branch@{upstream} notation and its lookalike, when $branch part has interesting characters, e.g. "@", and ":", have been fixed. * jk/interpret-branch-name-fix: interpret_branch_name: find all possible @-marks interpret_branch_name: avoid @{upstream} past colon interpret_branch_name: always respect "namelen" parameter interpret_branch_name: rename "cp" variable to "at" interpret_branch_name: factor out upstream handling

Merge branch 'rk/send-email-ssl-cert' into maint

2014-02-13T21:38:19Z

A recent update to "git send-email" broke platforms where /etc/ssl/certs/ directory exists but cannot be used as SSL_ca_path (e.g. Fedora rawhide). * rk/send-email-ssl-cert: send-email: /etc/ssl/certs/ directory may not be usable as ca_path

Merge branch 'sb/repack-in-c' into maint

2014-02-13T21:38:09Z

"git repack --max-pack-size=8g" stopped being parsed correctly when the command was reimplemented in C. * sb/repack-in-c: repack: propagate pack-objects options as strings repack: make parsed string options const-correct repack: fix typo in max-pack-size option

Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint

2014-02-13T21:37:53Z

The pathspec matching code, while comparing two trees (e.g. "git diff A B -- path1 path2") was too aggressive and failed to match some paths when multiple pathspecs were involved. * as/tree-walk-fix-aggressive-short-cut: tree_entry_interesting: match against all pathspecs

Git 1.8.5.4

2014-02-05T22:13:23Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/maint-pull-docfix' into maint

2014-02-05T22:03:47Z

The documentation to "git pull" hinted there is an "-m" option because it incorrectly shared the documentation with "git merge". * jc/maint-pull-docfix: Documentation: "git pull" does not have the "-m" option Documentation: exclude irrelevant options from "git pull"