Welcome to the first issue of What's cooking report for the new
year.
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--
[Graduated to master]
* fc/remote-helper-fixes (2013-12-26) 5 commits
(merged to 'next' on 2013-12-26 at ce5f872)
+ remote-hg: test 'shared_path' in a moved clone
(merged to 'next' on 2013-12-17 at aa4dc07)
+ remote-hg: add tests for special filenames
+ remote-hg: fix 'shared path' path
+ remote-helpers: add extra safety checks
+ remote-hg: avoid buggy strftime()
* jc/push-refmap (2013-12-04) 3 commits
(merged to 'next' on 2013-12-12 at 71e358f)
+ push: also use upstream mapping when pushing a single ref
+ push: use remote.$name.push as a refmap
+ builtin/push.c: use strbuf instead of manual allocation
Make git push origin master update the same ref that would be
updated by our 'master' when git push origin (no refspecs) is run
while the 'master' branch is checked out, which makes git push
more symmetric to git fetch and more usable for the triangular
workflow.
* jk/cat-file-regression-fix (2013-12-12) 2 commits
(merged to 'next' on 2013-12-13 at 3713e01)
+ cat-file: handle --batch format with missing type/size
+ cat-file: pass expand_data to print_object_or_die
git cat-file --batch=, an admittedly useless command, did not
behave very well.
* jk/name-pack-after-byte-representation (2013-12-16) 3 commits
(merged to 'next' on 2013-12-17 at 0bc385c)
+ pack-objects doc: treat output filename as opaque
(merged to 'next' on 2013-12-09 at 247b2d0)
+ pack-objects: name pack files after trailer hash
+ sha1write: make buffer const-correct
(this branch is tangled with jk/pack-bitmap.)
Two packfiles that contain the same set of objects have
traditionally been named identically, but that made repacking a
repository that is already fully packed without any cruft with a
different packing parameter cumbersome. Update the convention to
name the packfile after the bytestream representation of the data,
not after the set of objects in it.
* jk/pull-rebase-using-fork-point (2013-12-10) 2 commits
(merged to 'next' on 2013-12-13 at 1862c12)
+ rebase: use reflog to find common base with upstream
+ pull: use merge-base --fork-point when appropriate
* jk/rev-parse-double-dashes (2013-12-09) 2 commits
(merged to 'next' on 2013-12-13 at d26bac7)
+ rev-parse: be more careful with munging arguments
+ rev-parse: correctly diagnose revision errors before --
git rev-parse revs -- paths did not implement the usual
disambiguation rules the commands in the git log family used in
the same way.
* js/gnome-keyring (2013-12-16) 1 commit
(merged to 'next' on 2013-12-17 at 422fd61)
+ contrib/git-credential-gnome-keyring.c: small stylistic cleanups
Style fix.
* tg/diff-no-index-refactor (2013-12-16) 4 commits
(merged to 'next' on 2013-12-17 at 009d8d8)
+ diff: avoid some nesting
+ diff: add test for --no-index executed outside repo
(merged to 'next' on 2013-12-13 at 523f7c4)
+ diff: don't read index when --no-index is given
+ diff: move no-index detection to builtin/diff.c
git diff ../else/where/A ../else/where/B when ../else/where is
clearly outside the repository, and git diff --no-index A B, do
not have to look at the index at all, but we used to read the index
unconditionally.
* zk/difftool-counts (2013-12-16) 2 commits
(merged to 'next' on 2013-12-16 at 0e0d235)
+ diff.c: fix some recent whitespace style violations
(merged to 'next' on 2013-12-12 at ba35694)
+ difftool: display the number of files in the diff queue in the prompt
Show the total number of paths and the number of paths shown so far
when git difftool prompts to launch an external diff tool, which
would give users some sense of progress.
--
[New Topics]
* ta/format-user-manual-as-an-article (2014-01-06) 1 commit
(merged to 'next' on 2014-01-06 at 37858f6)
+ user-manual: improve html and pdf formatting
Update the way the user-manual is formatted via AsciiDoc to save
trees.
Will merge to 'master'.
* bm/merge-base-octopus-dedup (2013-12-30) 2 commits
(merged to 'next' on 2014-01-06 at 355d62b)
+ merge-base --octopus: reduce the result from get_octopus_merge_bases()
+ merge-base: separate --independent codepath into its own helper
git merge-base --octopus used to leave cleaning up suboptimal
result to the caller, but now it does the clean-up itself.
Will merge to 'master'.
* jk/test-framework-updates (2014-01-02) 3 commits
(merged to 'next' on 2014-01-06 at f81f373)
+ t: drop known breakage test
+ t: simplify HARNESS_ACTIVE hack
+ t: set TEST_OUTPUT_DIRECTORY for
