To: git@vger.kernel.org
-Subject: What's cooking in git.git (Mar 2012, #07; Mon, 19)
-X-master-at: f524129737d9ba3e685c31bacde844ec1db1fea9
-X-next-at: 898d27118349f1a83f6d93545cb67dbcb0b8c288
+Subject: What's cooking in git.git (Mar 2012, #08; Fri, 23)
+X-master-at: c16df57c5a778ef14ede7ad202c74146269d61ac
+X-next-at: 1bdf608349ec8c63dd8b91991095c3368a1e8a87
-What's cooking in git.git (Mar 2012, #07; Mon, 19)
+What's cooking in git.git (Mar 2012, #08; Fri, 23)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
-As of tonight, the tip of master is 1.7.10-rc1 and I'll start ignoring new
-feature patches out of blue and low impact fix patches that are not very
-well cooked, expecting for them to be rerolled after 1.7.10 final.
+The tip of 'master' was tagged as 1.7.10-rc2 today.
You can find the changes described here in the integration branches of the
repositories listed at
--------------------------------------------------
[Graduated to "master"]
-* ab/perl-i18n (2012-03-10) 3 commits
- + perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER
- + Git::I18N: compatibility with perl <5.8.3
+* am/completion-zsh-fix (2012-03-21) 1 commit
+ + contrib/completion: "local var=()" is misinterpreted as func-decl by zsh
-Attempts to help installations with ancient Perl and/or without
-MakeMaker.
+* dw/gitweb-doc-grammo (2012-03-23) 1 commit
+ + Documentation/gitweb: trivial English fixes
-* jc/maint-verify-objects-remove-pessimism (2012-03-15) 1 commit
- (merged to 'next' on 2012-03-15 at f824530)
- + fetch/receive: remove over-pessimistic connectivity check
-
-The code to validate the history connectivity between old refs and new
-refs used by fetch and receive-pack, introduced in 1.7.8, was grossly
-inefficient and unnecessarily tried to re-validate integrity of individual
-objects. This essentially reverts the patch that introduced the
-performance regression.
-
-* jn/maint-fast-import-empty-ls (2012-03-09) 2 commits
- (merged to 'next' on 2012-03-15 at d531079)
- + fast-import: don't allow 'ls' of path with empty components
- + fast-import: leakfix for 'ls' of dirty trees
-
-fast-import did not diagnose "ls ''" that asks an empty path
-as an error.
-
-* sl/customize-sane-tool-path (2012-03-09) 1 commit
- (merged to 'next' on 2012-03-15 at a838844)
- + configure: allow user to prevent $PATH "sanitization" on Solaris
-
-"configure" script learned to take "--sane-tool-path" from the command
-line to record SANE_TOOL_PATH (used to avoid broken platform tools in
-/usr/bin) in config.mak-autogen. This may be useful for people on Solaris
-who have saner tools outside /usr/xpg[46]/bin.
-
-* th/doc-diff-submodule-option (2012-03-14) 1 commit
- (merged to 'next' on 2012-03-14 at 0e1d755)
- + Documentation/diff-options: reword description of --submodule option
-
-Update "diff --submodule" documentation.
-
-* th/git-diffall (2012-03-14) 5 commits
- (merged to 'next' on 2012-03-14 at 38e1251)
- + contrib/diffall: fix cleanup trap on Windows
- + contrib/diffall: eliminate duplicate while loops
- + contrib/diffall: eliminate use of tar
- + contrib/diffall: create tmp dirs without mktemp
- + contrib/diffall: comment actual reason for 'cdup'
-
-Update sample "diffall" script.
-
-* th/mergetools-deltawalker (2012-03-15) 1 commit
- (merged to 'next' on 2012-03-15 at 1a62faf)
- + Documentation/difftool: add deltawalker to list of valid diff tools
+Typofix.
--------------------------------------------------
[New Topics]
-* jc/maint-clean-nested-worktree-in-subdir (2012-03-15) 2 commits
- - clean: preserve nested git worktree in subdirectories
- - remove_dir_recursively(): Add flag for skipping removal of toplevel dir
- (this branch is tangled with jh/notes-merge-in-git-dir-worktree.)
+* lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits
+ - t4202: add test for "log --graph --stat -p" separator lines
+ - log --graph: fix break in graph lines
+ - log --graph --stat: three-dash separator should come after graph lines
-"git clean -d -f" (not "-d -f -f") is supposed to protect nested working
-trees of independent git repositories that exist in the current project
-working tree from getting removed, but the protection applied only to such
-working trees that are at the top-level of the current project by mistake.
+The combination of two options "log --graph --stat" was an obscure corner
+case nobody cared about, and did not correctly show the ancestry graph
+lines.
-Not urgent.
+I've split the original patch into three pieces, one for fixes to two
+different issues and a test. Also the test is adjusted so that the series
+can be back-merged to older codebase that did not have 7f81463 (Use
+correct grammar in diffstat summary line, 2012-02-01) that first appeared
+in v1.7.9.2
-* ct/advise-push-default (2012-03-19) 1 commit
- - push: Provide situational hints for non-fast-forward errors
+* wk/gitweb-snapshot-use-if-modified-since (2012-03-20) 1 commit
+ - Pull gitweb If-Modified-Since handling out into its own function and use for snapshots.
-Breaks down the cases in which "git push" fails due to non-ff into three
-categories, and gives separate advise messages. I think there should be
-three advise confvars, not just two.
+Unreviewed; the title looks way too long and does not sit well in the
+shortlog output.
-* nl/rebase-i-cheat-sheet (2012-03-16) 1 commit
- - [Do not merge] rebase -i: remind that the lines are top-to-bottom
+* jc/maint-merge-autoedit (2012-03-20) 1 commit
+ - merge: backport GIT_MERGE_AUTOEDIT support
-Not urgent.
+In 1.7.10, we added GIT_MERGE_AUTOEDIT=no environment variable to help
+older scripts to let them refuse giving users a chance to explain the
+merge, but forgot that 1.7.9 automatically opens an editor when merging an
+annotated tag, and there is no equivalent escape hatch. A merge of this
+topic to 1.7.10 track becomes a no-op, but we may want to apply this to
+the 1.7.9.x series.
-* da/difftool-test (2012-03-19) 1 commit
- - t7800: Test difftool passing arguments to diff
+* jk/diff-no-rename-empty (2012-03-23) 4 commits
+ - merge-recursive: don't detect renames of empty files
+ - teach diffcore-rename to optionally ignore empty content
+ - make is_empty_blob_sha1 available everywhere
+ - drop casts from users EMPTY_TREE_SHA1_BIN
-Makes sure "difftool" options can be given in any order.
-
-* th/difftool-diffall (2012-03-19) 9 commits
- - difftool: print list of valid tools with '--tool-help'
- - difftool: teach dir-diff to copy modified files back to working tree
- - difftool: teach difftool to handle directory diffs
- - difftool: replace system call with Git::command_noisy
- - difftool: eliminate setup_environment function
- - difftool: stop appending '.exe' to git
- - difftool: remove explicit change of PATH
- - difftool: exit(0) when usage is printed
- - difftool: parse options using Getopt::Long
-
-Reworks the "diffall" contrib script into "difftool" framework. Use of
-Getopt::Long obviously contradicts with da/difftool-test and breaks 'pu'.
+Forbids rename detection logic from matching two empty files as renames
+during merge-recursive to prevent mismerges.
--------------------------------------------------
[Stalled]
+* cn/apply-fix-ws-can-lengthen-lines (2012-03-11) 1 commit
+ . apply: reallocate the postimage buffer when needed
+
+Attempts to address an ancient bug that dates back to the addition
+of an oddball "tab-in-indent" whitespace breakage class that wants
+to have longer lines than the original when fixing things up.
+
+Needs more work; results in double-frees.
+
* nd/columns (2012-03-13) 12 commits
- column: support grouping entries
- column: support "denser" mode
but it seems the topic is cooking between Ramsay and Duy out of tree.
Waiting for resolution.
+* jh/apply-free-patch (2012-03-21) 4 commits
+ - apply.c: WIP ownership audit
+ - apply: free patch->result
+ - apply: free patch->{def,old,new}_name fields
+ - apply: do not leak patches and fragments
+
+Valgrind reports quite a lot of discarded memory inside apply. I have a
+slight suspicion that we should first clarify the ownership rules of
+pieces of memory in this standalone program that was designed to be "run
+once and let exit take care of the memory" before proceeding further.
+
+Will defer til 1.7.10.
+
* dg/test-from-elsewhere (2012-03-04) 2 commits
- Support out-of-tree Valgrind tests
- Allow overriding GIT_BUILD_DIR
test helpers and freshly built Git relative to it (GIT_BUILD_DIR is
a mere short-hand for $TEST_DIRECTORY/..).
-* cn/apply-fix-ws-can-lengthen-lines (2012-03-11) 1 commit
- . apply: reallocate the postimage buffer when needed
-
-Attempts to address an ancient bug that dates back to the addition
-of an oddball "tab-in-indent" whitespace breakage class that wants
-to have longer lines than the original when fixing things up.
-
-Needs more work; results in double-frees.
+Discussion stalled.
* hv/submodule-recurse-push (2012-02-13) 3 commits
- push: teach --recurse-submodules the on-demand option
--------------------------------------------------
[Cooking]
+* th/difftool-diffall (2012-03-23) 9 commits
+ - difftool: print list of valid tools with '--tool-help'
+ - difftool: teach difftool to handle directory diffs
+ - difftool: replace system call with Git::command_noisy
+ - difftool: eliminate setup_environment function
+ - difftool: stop appending '.exe' to git
+ - difftool: remove explicit change of PATH
+ - difftool: exit(0) when usage is printed
+ - difftool: add '--no-gui' option
+ - difftool: parse options using Getopt::Long
+
+Rolls the two-directory-diff logic from diffall script (in contrib/) into
+"git difftool" framework.
+
+* jc/maint-clean-nested-worktree-in-subdir (2012-03-15) 2 commits
+ (merged to 'next' on 2012-03-20 at fb5485e)
+ + clean: preserve nested git worktree in subdirectories
+ + remove_dir_recursively(): Add flag for skipping removal of toplevel dir
+ (this branch is tangled with jh/notes-merge-in-git-dir-worktree.)
+
+"git clean -d -f" (not "-d -f -f") is supposed to protect nested working
+trees of independent git repositories that exist in the current project
+working tree from getting removed, but the protection applied only to such
+working trees that are at the top-level of the current project by mistake.
+
+Not urgent.
+
+* ct/advise-push-default (2012-03-19) 1 commit
+ - push: Provide situational hints for non-fast-forward errors
+
+Breaks down the cases in which "git push" fails due to non-ff into three
+categories, and gives separate advise messages. This should be a good
+change regardless of mm/push-default-switch-warning topic.
+
+* nl/rebase-i-cheat-sheet (2012-03-20) 1 commit
+ (merged to 'next' on 2012-03-20 at 3092a2b)
+ + rebase -i: remind that the lines are top-to-bottom
+
+Not urgent.
+
+* da/difftool-test (2012-03-19) 1 commit
+ (merged to 'next' on 2012-03-20 at 0ada7d4)
+ + t7800: Test difftool passing arguments to diff
+
+Makes sure "difftool" options can be given in any order.
+
* jh/notes-merge-in-git-dir-worktree (2012-03-15) 4 commits
- - notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
- - notes-merge: use opendir/readdir instead of using read_directory()
- - t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/
- - remove_dir_recursively(): Add flag for skipping removal of toplevel dir
+ (merged to 'next' on 2012-03-20 at 0c1b1de)
+ + notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
+ + notes-merge: use opendir/readdir instead of using read_directory()
+ + t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/
+ + remove_dir_recursively(): Add flag for skipping removal of toplevel dir
(this branch is tangled with jc/maint-clean-nested-worktree-in-subdir.)
Running "notes merge --commit" failed to perform correctly when run
Not urgent.
* jn/diffstat-tests (2012-03-13) 7 commits
- - diffstat summary line varies by locale: miscellany
- - test: use numstat instead of diffstat in binary-diff test
- - test: use --numstat instead of --stat in "git stash show" tests
- - test: test cherry-pick functionality and output separately
- - test: modernize funny-names test style
- - test: use numstat instead of diffstat in funny-names test
- - test: use test_i18ncmp when checking --stat output
+ (merged to 'next' on 2012-03-20 at 8791b2f)
+ + diffstat summary line varies by locale: miscellany
+ + test: use numstat instead of diffstat in binary-diff test
+ + test: use --numstat instead of --stat in "git stash show" tests
+ + test: test cherry-pick functionality and output separately
+ + test: modernize funny-names test style
+ + test: use numstat instead of diffstat in funny-names test
+ + test: use test_i18ncmp when checking --stat output
Some tests checked the "diff --stat" output when they do not have to,
which unnecessarily made things harder to verify under GETTEXT_POISON.
Not urgent.
* tr/maint-word-diff-regex-sticky (2012-03-14) 3 commits
- - diff: tweak a _copy_ of diff_options with word-diff
- - diff: refactor the word-diff setup from builtin_diff_cmd
- - t4034: diff.*.wordregex should not be "sticky" in --word-diff
+ (merged to 'next' on 2012-03-20 at b3f67cd)
+ + diff: tweak a _copy_ of diff_options with word-diff
+ + diff: refactor the word-diff setup from builtin_diff_cmd
+ + t4034: diff.*.wordregex should not be "sticky" in --word-diff
The regexp configured with wordregex was incorrectly reused across
files.
Not urgent.
* zj/test-cred-helper-nicer-prove (2012-03-15) 2 commits
- - t0303: resurrect commit message as test documentation
- - t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER
+ (merged to 'next' on 2012-03-20 at b675ec1)
+ + t0303: resurrect commit message as test documentation
+ + t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER
Minor improvement to t0303.
Not urgent.
(merged to 'next' on 2012-03-15 at cca0032)
+ xdiff: PATIENCE/HISTOGRAM are not independent option bits
+ xdiff: remove XDL_PATCH_* macros
- (this branch is used by jc/diff-ignore-case.)
Resurrects the preparatory clean-up patches from another topic that was
discarded, as this would give a saner foundation to build on diff.algo
Not urgent.
-* jh/apply-free-patch (2012-03-07) 1 commit
- - apply: do not leak patches and fragments
-
-Will defer til 1.7.10.
-
* rs/unpack-trees-leakfix (2012-03-06) 1 commit
(merged to 'next' on 2012-03-07 at 69a69cd)
+ unpack-trees: plug minor memory leak
Will defer til 1.7.10.
-* tb/maint-remove-irrelevant-i18n-test (2012-03-06) 1 commit
- (merged to 'next' on 2012-03-07 at 23f2dd1)
- + t0204: remove a test that checks undefined behaviour
-
-I tentatively parked this in 'next' but later reverted the merge.
-Will discard.
-
* mm/push-default-switch-warning (2012-03-09) 1 commit
- push: start warning upcoming default change for push.default
Will defer til 1.7.10.
* nl/http-proxy-more (2012-03-15) 5 commits
- - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
- - http: Avoid limit of retrying request only twice
- - http: handle proxy authentication failure (error 407)
- - http: handle proxy proactive authentication
- - http: try http_proxy env var when http.proxy config option is not set
+ (merged to 'next' on 2012-03-20 at c004001)
+ + http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
+ + http: Avoid limit of retrying request only twice
+ + http: handle proxy authentication failure (error 407)
+ + http: handle proxy proactive authentication
+ + http: try http_proxy env var when http.proxy config option is not set
The code to talk to http proxies learn to use the same credential
API used to talk to the final http destinations.
--------------------------------------------------
[Discarded]
-* jc/diff-ignore-mode (2012-03-01) 1 commit
- . diff --ignore-mode-change
-
- * jc/diff-ignore-case (2012-02-28) 6 commits
- . diff: -i is "--ignore-case" but means a bit more in "log"
- . diff: --ignore-case
- . xdiff: introduce XDF_IGNORE_CASE
- . xdiff: introduce XDF_INEXACT_MATCH
- - xdiff: PATIENCE/HISTOGRAM are not independent option bits
- - xdiff: remove XDL_PATCH_* macros
-
-* jh/trace-use-startup-info (2012-03-02) 1 commit
- . Use startup_info->prefix rather than prefix.
-
-I tend to agree with the doubt of the author of this patch expressed.
-
-* nd/optim-connected (2012-03-15) 1 commit
- . {fetch,receive}-pack: skip sha-1 integrity test on objects from new pack
-
-jc/maint-verify-objects-remove-pessimism replaces this.
-
-* jc/advise-push-default (2011-12-18) 1 commit
- . push: hint to use push.default=upstream when appropriate
-
-A rework by Christopher Tiwald replaces this.
-
-* th/mergetools-tool-help (2012-03-15) 1 commit
- . difftool: print list of valid tools with '--tool-help'
+* tb/maint-remove-irrelevant-i18n-test (2012-03-06) 1 commit
+ (merged to 'next' on 2012-03-07 at 23f2dd1)
+ + t0204: remove a test that checks undefined behaviour
-Reworked as part of th/difftool-diffall topic.
+I tentatively parked this in 'next' but later reverted the merge.
projects / thirdparty / git.git / commitdiff
