Here are the topics that have been cooking.  Commits prefixed with '-' are
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.

The tip of 'master' has been tagged as 1.7.12-rc0; this deliberately
contains a few topics that have been in 'next' only for a few days,
so please make sure to spot any possible issues and report soonish
to avoid regressions in the upcoming release.

You can find the changes described here in the integration branches of the
repositories listed at

[Graduated to "master"]

* jk/mediawiki-credential (2012-07-18) 4 commits
  (merged to 'next' on 2012-07-22 at 2cb99b2)
 + mw-to-git: use git-credential's URL parser
 + credential: convert "url" attribute into its parsed subparts
 + mw-to-git: check blank credential attributes via length
 + docs/credential: minor clarity fixups

Mediawiki importer updates.

* jn/block-sha1 (2012-07-23) 3 commits
  (merged to 'next' on 2012-07-23 at a11a08b)
 + Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads
 + block-sha1: put expanded macro parameters in parentheses
 + block-sha1: avoid pointer conversion that violates alignment constraints

The code to load a word one-byte-at-a-time was optimized into a
word-wide load instruction even when the pointer was not aligned,
which caused issues on architectures that do not like unaligned

* jn/make-assembly-in-right-directory (2012-07-22) 1 commit
  (merged to 'next' on 2012-07-23 at 3c155cc)
 + Makefile: fix location of listing produced by "make subdir/foo.s"

* jv/maint-no-ext-diff (2012-07-19) 2 commits
  (merged to 'next' on 2012-07-22 at eefcf45)
 + diff: test precedence of external diff drivers
 + diff: correctly disable external_diff with --no-ext-diff

"git diff --no-ext-diff" did not output anything for a typechange
filepair when GIT_EXTERNAL_DIFF is in effect.

* kk/maint-1.7.9-commit-tree (2012-07-17) 1 commit
 + commit-tree: resurrect command line parsing updates
 (this branch is used by kk/maint-commit-tree.)

A more natural-looking "git commit-tree -p <parent> <tree>" syntax
was introduced long time ago, but we accidentally broke it in the
1.7.9 era.

* kk/maint-commit-tree (2012-07-17) 2 commits
  (merged to 'next' on 2012-07-22 at ab15d56)
 + Revert "git-commit-tree(1): update synopsis"
 + Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree
 (this branch uses kk/maint-1.7.9-commit-tree.)

The same as above, for merging to the upcoming release.

* mm/mediawiki-usability (2012-07-17) 10 commits
  (merged to 'next' on 2012-07-22 at fe66a95)
 + git-remote-mediawiki: allow page names with a ':'
 + git-remote-mediawiki: fix incorrect test usage in test
 + git-remote-mediawiki: properly deal with invalid remote revisions
 + git-remote-mediawiki: show progress information when getting last remote 
 + git-remote-mediawiki: show progress information when listing pages
 + git-remote-mediawiki: use --force when adding notes
 + git-remote-mediawiki: get rid of O(N^2) loop
 + git-remote-mediawiki: make mediafiles export optional
 + git-remote-mediawiki: actually send empty comment when they're empty
 + git-remote-mediawiki: don't split namespaces with spaces

Mediawiki importer updates.

* nk/maint-gitweb-log-by-lines (2012-07-05) 3 commits
  (merged to 'next' on 2012-07-13 at 780e16a)
 + gitweb: Add support to Link: tag
 + gitweb: Handle other types of tag in git_print_log
 + gitweb: Cleanup git_print_log()

Teach gitweb to pay attention to various forms of credits that are
similar to "Signed-off-by:" lines.

Needs to be eyeballed for the correctness of the esc_html() in the tip one.

* sl/autoconf (2012-07-19) 7 commits
  (merged to 'next' on 2012-07-23 at dc94990)
 + build: reconfigure automatically if changes
 + build: "make clean" should not remove configure-generated files
 + autoconf: use AC_CONFIG_COMMANDS instead of ad-hoc 'config.mak.append'
 + autoconf: remove few redundant semicolons
 + autoconf: remove some redundant shell indirections
 + autoconf: GIT_CONF_APPEND_LINE: change signature

* sn/doc-typofix (2012-07-14) 1 commit
  (merged to 'next' on 2012-07-22 at 168bba9)
 + doc: A few minor copy edits.

* tg/ce-namelen-field (2012-07-11) 2 commits
  (merged to 'next' on 2012-07-22 at 2d85b05)
 + Strip namelen out of ce_flags into a ce_namelen field
 + Merge branch 'tg/maint-cache-name-compare' into tg/ce-namelen-field

Split lower bits of ce_flags field and creates a new ce_namelen
field in the in-core index structure.

* th/difftool-diffall (2012-07-19) 1 commit
  (merged to 'next' on 2012-07-23 at db62371)
 + difftool: only copy back files modified during directory diff
 (this branch is used by da/difftool-updates.)

Finishing touches to "difftool --dir-diff".

[New Topics]

* da/difftool-updates (2012-07-23) 5 commits
  (merged to 'next' on 2012-07-23 at 96528a7)
 + difftool: Use symlinks when diffing against the worktree
 + difftool: Call the temp directory "git-difftool"
 + difftool: Move option values into a hash
 + difftool: Eliminate global variables
 + difftool: Simplify print_tool_help()

"git difftool --dir-diff" learned to use symbolic links to prepare
temporary copy of the working tree when available.

Will merge to 'master'.

* jc/mergetool-tool-help (2012-07-23) 1 commit
  (merged to 'next' on 2012-07-23 at ef256fc)
 + mergetool: support --tool-help option like difftool does

"git mergetool" did not support --tool-help option to give the list
of supported backends, like "git difftool" does.

Will merge to 'master'.

* jk/maint-advise-vaddf (2012-07-23) 1 commit
  (merged to 'next' on 2012-07-23 at 5b13a77)
 + advice: pass varargs to strbuf_vaddf, not strbuf_addf
 (this branch is used by jk/maint-commit-abandoned-message.)

The advise() function did not use varargs correctly to format
its message.

Will merge to 'master' and soon to 'maint'.

* jk/maint-commit-abandoned-message (2012-07-23) 2 commits
 - commit: give a hint when a commit message has been abandoned
 - Merge commit 'b2eda9b' into jk/maint-commit-abandoned-message
 (this branch uses jk/maint-advise-vaddf.)

Will drop.

* jk/maint-commit-check-committer-early (2012-07-23) 1 commit
  (merged to 'next' on 2012-07-23 at a2c7133)
 + commit: check committer identity more strictly

"git commit --amend" let the user edit the log message and then died
when the human-readable committer name was given insufficiently by

Will merge to 'master' and soon to 'maint'.

* jk/maint-commit-document-editmsg (2012-07-23) 1 commit
  (merged to 'next' on 2012-07-23 at 06307fb)
 + commit: document the temporary commit message file


Will merge to 'master' and soon to 'maint'.


* mz/rebase-range (2012-07-18) 7 commits
 - rebase (without -p): correctly calculate patches to rebase
 - rebase -p: don't request --left-right only to ignore left side
 - rebase -p: use --cherry-mark for todo file
 - look up subject in add_pick_line
 - git-rebase--interactive: group all $preserve_merges code
 - extract function for adding "pick" line
 - avoid special-casing --keep-empty

Performance concerns from Windows folks.  Also the series lacks
proper sign-offs.

* jl/submodule-rm (2012-07-05) 2 commits
 - rm: remove submodules from the index and the .gitmodules file
 - rm: don't fail when removing populated submodules

Expecting a reroll.

* ph/stash-rerere (2012-07-08) 2 commits
 - stash: invoke rerere in case of conflict
 - test: git-stash conflict sets up rerere

Will be rerolled but is going in the right direction.

* lt/commit-tree-guess-utf-8 (2012-06-28) 1 commit
 - commit/commit-tree: correct latin1 to utf-8

Teaches "git commit" and "git commit-tree" the "we are told to use
utf-8 in log message, but this does not look like utf-8---attempt to
pass it through convert-from-latin1-to-utf8 and see if it makes
sense" heuristics "git mailinfo" already uses.

A draft from Linus received privately without a log message.
Expecting a reroll.

* jc/test-lib-source-build-options-early (2012-06-24) 1 commit
 - test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier

Reorders t/ so that we dot-source GIT-BUILD-OPTIONS that
records the shell and Perl the user told us to use with Git a lot
early, so that script itself can use "$PERL_PATH" in
one of its early operations.

Needs to be eyeballed by people who run tests with exotic options
like valgrind, --root=/dev/shm/somewhere, etc.

* mb/remote-default-nn-origin (2012-07-11) 6 commits
 - Teach get_default_remote to respect remote.default.
 - Test that plain "git fetch" uses remote.default when on a detached HEAD.
 - Teach clone to set remote.default.
 - Teach "git remote" about remote.default.
 - Teach remote.c about the remote.default configuration setting.
 - Rename remote.c's default_remote_name static variables.

When the user does not specify what remote to interact with, we
often attempt to use 'origin'.  This can now be customized via a
configuration variable.

Expecting a reroll.
"The first remote becomes the default" bit is better done as a
separate step.

* jc/maint-push-refs-all (2012-05-04) 2 commits
 - get_fetch_map(): tighten checks on dest refs
 - fetch/push: allow refs/*:refs/*

Allows pushing and fetching refs/stash.
There still seem to be other bugs hiding (e.g. try pushing twice).

Not ready.

* jc/split-blob (2012-04-03) 6 commits
 - chunked-object: streaming checkout
 - chunked-object: fallback checkout codepaths
 - bulk-checkin: support chunked-object encoding
 - bulk-checkin: allow the same data to be multiply hashed
 - new representation types in the packstream
 - packfile: use varint functions

Not ready.

I finished the streaming checkout codepath, but as explained in
127b177 (bulk-checkin: support chunked-object encoding, 2011-11-30),
these are still early steps of a long and painful journey. At least
pack-objects and fsck need to learn the new encoding for the series
to be usable locally, and then index-pack/unpack-objects needs to
learn it to be used remotely.

Given that I heard a lot of noise that people want large files, and
that I was asked by somebody at GitTogether'11 privately for an
advice on how to pay developers (not me) to help adding necessary
support, I am somewhat dissapointed that the original patch series
that was sent almost two months ago still remains here without much
comments and updates from the developer community. I even made the
interface to the logic that decides where to split chunks easily
replaceable, and I deliberately made the logic in the original patch
extremely stupid to entice others, especially the "bup" fanboys, to
come up with a better logic, thinking that giving people an easy
target to shoot for, they may be encouraged to help out. The plan is
not working :-(.


* mh/maint-revisions-doc (2012-07-23) 3 commits
 - fixup-amend: Enumerate revision range specifiers in the documentation
 - Document rev^! and rev^@ as revision specifiers
 - Make <refname> documentation more consistent.

Getting tired of waiting, so I rewrote the tip one.
Waiting for some feedback.

* jx/i18n-1.7.11 (2012-07-22) 7 commits
 - i18n: merge-recursive: mark strings for translation
 - Remove unused and bad gettext block from git-am
 - i18n: am: mark more strings for translation
 - Remove obsolete LONG_USAGE which breaks xgettext
 - i18n: Rewrite gettext messages start with dash
 - i18n: rebase: mark strings for translation
 - i18n: New keywords for xgettext extraction from sh

* jk/no-more-pre-exec-callback (2012-06-05) 1 commit
  (merged to 'next' on 2012-07-23 at fe59cb6)
 + pager: drop "wait for output to run less" hack

Will defer for 6 months until ancient "less" goes extinct.

* mm/push-default-switch-warning (2012-06-24) 1 commit
  (merged to 'next' on 2012-06-26 at fea512a)
 + push: start warning upcoming default change for push.default

Will defer for another cycle.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to