Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
We are in the post-1.8.3 cycle. As promised, 'next' has been
rewound. A few stalled topics have been ejected and bunch of new
topics that have been cooking are now in it. I expect these on
'next' to graduate to 'master' soonish, as I picked relatively easy
ones in this round.
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"]
* kb/status-ignored-optim-2 (2013-06-02) 1 commit
(merged to 'next' on 2013-06-02 at 88ee588)
+ dir.c: fix ignore processing within not-ignored directories
Fix 1.8.3 regressions in the .gitignore path exclusion logic.
--
[New Topics]
* ar/wildmatch-foldcase (2013-06-02) 1 commit
(merged to 'next' on 2013-06-04 at 3180bcc)
+ wildmatch: properly fold case everywhere
The wildmatch engine did not honor WM_CASEFOLD option correctly.
Will merge to 'master'.
* cr/git-work-tree-sans-git-dir (2013-06-03) 1 commit
(merged to 'next' on 2013-06-04 at bebedca)
+ git.txt: remove stale comment regarding GIT_WORK_TREE
These days, "git --work-tree=there cmd" without specifying an
explicit --git-dir=here will do the usual discovery, but we had a
description of older behaviour in the documentation.
Will merge to 'master'.
* fc/do-not-use-the-index-in-add-to-index (2013-06-03) 2 commits
(merged to 'next' on 2013-06-04 at 94e7b60)
+ read-cache: trivial style cleanups
+ read-cache: fix wrong 'the_index' usage
Will merge to 'master'.
* fc/sequencer-skip-quiet (2013-06-03) 8 commits
- revert/cherry-pick: add --skip option
- revert/cherry-pick: add --quiet option
- sequencer: run post-rewrite hook
- cherry-pick: store rewritten commits
- SQUASH???
- cherry-pick: add --skip-empty option
- sequencer: trivial fix
- sequencer: remove useless indentation
I think the post-rewrite hook should not apply to revert, and
revert should be taught about --skip-empty. The "copy-notes"
change was nak'ed, and I agree with Thomas that the external
interface to the mechanism should be aligned with existing
notes.rewrite..
Waiting for a reroll.
$gmane/225676, $gmane/226263, $gmane/226271
* js/test-ln-s-add (2013-06-02) 11 commits
- t6035: use test_ln_s_add to remove SYMLINKS prerequisite
- t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
- t3100: use test_ln_s_add to remove SYMLINKS prerequisite
- t3030: use test_ln_s_add to remove SYMLINKS prerequisite
- t2100: use test_ln_s_add to remove SYMLINKS prerequisite
- t: use test_ln_s_add to remove SYMLINKS prerequisite
- tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
- tests: introduce test_ln_s and test_ln_s_add
- t3010: modernize style
- t2100: modernize style and unroll a loop of test cases
- test-chmtime: Fix exit code on Windows
Many tests that check the behaviour of symbolic links stored in the
index or the tree objects do not have to be skipped on a filesystem
that lack symbolic link support.
There seem to be some misconversion, mostly around the use of the
new test_ln_s helper.
Waiting for responses to reviews.
$gmane/226417 and others.
* mt/send-email-cc-match-fix (2013-06-03) 6 commits
- t/send-email: test suppress-cc=self with non-ascii
- t/send-email: add test with quoted sender
- send-email: make --suppress-cc=self sanitize input
- t/send-email: test suppress-cc=self on cccmd
- send-email: fix suppress-cc=self on cccmd
- t/send-email.sh: add test for suppress-cc=self
It may want to have an additional test case for --from='"A U. Thor"
' to make sure we do not doubly escape what is
already escaped.
Some changes in patch 2/6 and a later patch may need to be flipped
around.
* rr/complete-difftool (2013-06-03) 2 commits
(merged to 'next' on 2013-06-04 at 01c7611)
+ completion: clarify ls-tree, archive, show completion
+ completion: difftool takes both revs and files
Update command line completion (in contrib/) to use a better named
completion helper function for commands that take revisions and
paths.
Will merge to 'master'.
* rr/diffcore-pickaxe-doc (2013-06-03) 2 commits
(merged to 'next' on 2013-06-04 at 67d1fc7)
+ diffcore-pickaxe doc: document -S and -G properly
+ diffcore-pickaxe: make error messages more consistent
Update the low-level diffcore documentation on -S/-G and --pickaxe-all.
Will merge to 'master'.
* tr/sha1-file-silence-loose-object-info-under-prune-race (2013-06-03) 1 commit
(merged to 'next' on 2013-06-04 at e891bb8)
+ sha1_file: silence sha1_loose_object_info
Will merge to 'master'.
* bp/mediawiki-credential (2013-06-04) 1 commit
- git-remote-mediawiki: use git.pm functions for credentials
T
