mirror of
https://github.com/git/git.git
synced 2026-01-22 14:57:18 +09:00
What's cooking (2013/07 #08)
This commit is contained in:
Junio C Hamano
parent
8c84c1eb98
commit
bf8fd109c0
@ -1,19 +1,27 @@
|
||||
To: git@vger.kernel.org
|
||||
Bcc: lwn@lwn.net
|
||||
Subject: What's cooking in git.git (Jul 2013, #07; Sun, 21)
|
||||
X-master-at: 805c5a578995db7594ad0751a683bc6422655c29
|
||||
X-next-at: e2c9e63a26e9480ed73a4f2615121c69962087b4
|
||||
Subject: What's cooking in git.git (Jul 2013, #08; Mon, 22)
|
||||
X-master-at: 0bde8c0c1e53e2b2001f4ced58d3e66865758cea
|
||||
X-next-at: c240c481b4c5d7c300800bb80174c0853d587c6d
|
||||
|
||||
What's cooking in git.git (Jul 2013, #07; Sun, 21)
|
||||
What's cooking in git.git (Jul 2013, #08; Mon, 22)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with
|
||||
'-' are only in 'pu' (proposed updates) while commits prefixed with
|
||||
'+' are in 'next'.
|
||||
|
||||
Quite a many documentation clean-up patches that are already in
|
||||
'master' have been applied to 'maint'. Hopefully 1.8.3.4 will be
|
||||
the last of the 1.8.3.x maintenance series.
|
||||
This again is one of those back-to-back issues of "What's cooking"
|
||||
report, but I expect that the rest of the week will be slower than
|
||||
usual due to it being the OSCON week, and I wanted to categorize the
|
||||
topics in flight into those that should be in -rc1 and those that
|
||||
should cook until the next cycle. Hopefully -rc0 will be tagged
|
||||
tomorrow with some of the former, but not all, as we would like to
|
||||
cook topics that are not trivial in 'next' for at least a week or
|
||||
so. The ones marked as "will merge to master" below are marked as
|
||||
such because I do not expect major issues in them to be found before
|
||||
we tag -rc1 (see http://tinyurl.com/gitCal), while ones marked as
|
||||
"will cook in next" may not be so trivial.
|
||||
|
||||
You can find the changes described here in the integration branches
|
||||
of the repositories listed at
|
||||
@ -21,16 +29,91 @@ of the repositories listed at
|
||||
http://git-blame.blogspot.com/p/git-public-repositories.html
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
[Graduated to "master"]
|
||||
|
||||
* mm/color-auto-default (2013-07-19) 1 commit
|
||||
(merged to 'next' on 2013-07-19 at 880d984)
|
||||
+ git add -e: Explicitly specify that patch should have no color
|
||||
* db/show-ref-head (2013-07-17) 1 commit
|
||||
(merged to 'next' on 2013-07-18 at 73797d0)
|
||||
+ show-ref: make --head always show the HEAD ref
|
||||
|
||||
A finishing touch to fix breakage to "add -e" caused by defaulting
|
||||
ui.color to "auto".
|
||||
The "--head" option to "git show-ref" was only to add "HEAD" to the
|
||||
list of candidate refs to be filtered by the usual rules
|
||||
(e.g. "--heads" that only show refs under refs/heads). Change the
|
||||
meaning of the option to always show "HEAD" regardless of what
|
||||
filtering will be applied to any other ref (this is a backward
|
||||
incompatible change, so I may need to add an entry to the Release
|
||||
Notes).
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
* dw/request-pull-diag (2013-07-17) 1 commit
|
||||
(merged to 'next' on 2013-07-18 at d4406de)
|
||||
+ request-pull: improve error message for invalid revision args
|
||||
|
||||
|
||||
* es/blame-L-breakage (2013-07-17) 6 commits
|
||||
(merged to 'next' on 2013-07-18 at cfd871a)
|
||||
+ blame-options.txt: explain that -L <start> and <end> are optional
|
||||
+ blame-options.txt: place each -L option variation on its own line
|
||||
+ t8001/t8002 (blame): add blame -L :funcname tests
|
||||
+ t8001/t8002 (blame): add blame -L tests
|
||||
+ t8001/t8002 (blame): modernize style
|
||||
+ line-range: fix "blame -L X,-N" regression
|
||||
|
||||
The refactoring made for parsing "-L" option recently to support
|
||||
"git log -L" seems to have broken "git blame -L X,-5" to show 5
|
||||
lines leading to X.
|
||||
|
||||
|
||||
* es/check-mailmap (2013-07-13) 2 commits
|
||||
(merged to 'next' on 2013-07-21 at 23c5363)
|
||||
+ t4203: test check-mailmap command invocation
|
||||
+ builtin: add git-check-mailmap command
|
||||
(this branch is used by es/contacts.)
|
||||
|
||||
A new command to allow scripts to query the mailmap information.
|
||||
|
||||
|
||||
* hv/config-from-blob (2013-07-12) 5 commits
|
||||
(merged to 'next' on 2013-07-15 at 9ab7f3f)
|
||||
+ do not die when error in config parsing of buf occurs
|
||||
+ teach config --blob option to parse config from database
|
||||
+ config: make parsing stack struct independent from actual data source
|
||||
+ config: drop cf validity check in get_next_char()
|
||||
+ config: factor out config file stack management
|
||||
|
||||
Allow configuration data to be read from in-tree blob objects,
|
||||
which would help working in a bare repository and submodule
|
||||
updates.
|
||||
|
||||
|
||||
* jc/mailmap-case-insensitivity (2013-07-15) 9 commits
|
||||
(merged to 'next' on 2013-07-18 at 83341ac)
|
||||
+ mailmap: style fixes
|
||||
+ mailmap: debug: avoid passing NULL to fprintf() '%s' conversion specification
|
||||
+ mailmap: debug: eliminate -Wformat field precision type warning
|
||||
+ mailmap: debug: fix malformed fprintf() format conversion specification
|
||||
+ mailmap: debug: fix out-of-order fprintf() arguments
|
||||
+ mailmap: do not downcase mailmap entries
|
||||
+ t4203: demonstrate loss of uppercase characters in canonical email
|
||||
+ mailmap: do not lose single-letter names
|
||||
+ t4203: demonstrate loss of single-character name in mailmap entry
|
||||
|
||||
The mailmap mechanism unnecessarily downcased the e-mail addresses
|
||||
in the output, and also ignored the human name when it is a single
|
||||
character name.
|
||||
|
||||
|
||||
* jc/name-rev-exact-ref (2013-07-18) 5 commits
|
||||
(merged to 'next' on 2013-07-18 at c8bc00c)
|
||||
+ describe: fix --contains when a tag is given as input
|
||||
+ name-rev: differentiate between tags and commits they point at
|
||||
(merged to 'next' on 2013-07-11 at fd5b30c)
|
||||
+ describe: use argv-array
|
||||
+ name-rev: allow converting the exact object name at the tip of a ref
|
||||
+ name-ref: factor out name shortening logic from name_ref()
|
||||
|
||||
Corrects the longstanding sloppiness in the implementation of
|
||||
name-rev that conflated "we take commit-ish" and "differences
|
||||
between tags and commits do not matter".
|
||||
|
||||
|
||||
* jc/simple-add-must-be-a-no-op (2013-07-19) 1 commit
|
||||
@ -40,39 +123,141 @@ of the repositories listed at
|
||||
This detected a mismerge of one of "add-2.0" topics to the 'jch'
|
||||
and 'pu' branches.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
* jk/gcc-function-attributes (2013-07-19) 4 commits
|
||||
(merged to 'next' on 2013-07-19 at 5f6ad91)
|
||||
+ Add the LAST_ARG_MUST_BE_NULL macro
|
||||
(merged to 'next' on 2013-07-12 at 5a7081f)
|
||||
+ wt-status: use "format" function attribute for status_printf
|
||||
+ use "sentinel" function attribute for variadic lists
|
||||
+ add missing "format" function attributes
|
||||
|
||||
Use the function attributes extension to catch mistakes in use of
|
||||
our own variadic functions that use NULL sentinel at the end
|
||||
(i.e. like execl(3)) and format strings (i.e. like printf(3)).
|
||||
|
||||
|
||||
* jm/doc-ref-prune (2013-07-18) 2 commits
|
||||
- Documentation: fix git-prune example usage
|
||||
- Documentation: remove --prune from pack-refs examples
|
||||
* jk/t0008-sigpipe-fix (2013-07-12) 1 commit
|
||||
(merged to 'next' on 2013-07-15 at cead4b2)
|
||||
+ t0008: avoid SIGPIPE race condition on fifo
|
||||
|
||||
Will merge to 'next' and then 'master'.
|
||||
Fix for recent test breakage on 'master'.
|
||||
|
||||
|
||||
* rj/sparse (2013-07-21) 1 commit
|
||||
- Revert "compat/unsetenv.c: Fix a sparse warning"
|
||||
* jx/clean-interactive (2013-06-26) 16 commits
|
||||
(merged to 'next' on 2013-07-12 at 61dd42d)
|
||||
+ test: run testcases with POSIX absolute paths on Windows
|
||||
+ test: add t7301 for git-clean--interactive
|
||||
+ git-clean: add documentation for interactive git-clean
|
||||
+ git-clean: add ask each interactive action
|
||||
+ git-clean: add select by numbers interactive action
|
||||
+ git-clean: add filter by pattern interactive action
|
||||
+ git-clean: use a git-add-interactive compatible UI
|
||||
+ git-clean: add colors to interactive git-clean
|
||||
+ git-clean: show items of del_list in columns
|
||||
+ git-clean: add support for -i/--interactive
|
||||
(merged to 'next' on 2013-06-26 at f7be2d8)
|
||||
+ git-clean: refactor git-clean into two phases
|
||||
+ write_name{_quoted_relative,}(): remove redundant parameters
|
||||
+ quote_path_relative(): remove redundant parameter
|
||||
+ quote.c: substitute path_relative with relative_path
|
||||
+ path.c: refactor relative_path(), not only strip prefix
|
||||
+ test: add test cases for relative_path
|
||||
|
||||
Will merge to 'next' and then 'master'.
|
||||
Add "interactive" mode to "git clean".
|
||||
|
||||
|
||||
* sb/traverse-trees-bitmask-variable-name (2013-07-19) 1 commit
|
||||
- traverse_trees(): clarify return value of the callback
|
||||
* mk/upload-pack-off-by-one-dead-code-removal (2013-07-15) 1 commit
|
||||
(merged to 'next' on 2013-07-15 at a8f55a2)
|
||||
+ upload-pack: remove a piece of dead code
|
||||
|
||||
Will merge to 'next' and then 'master'.
|
||||
|
||||
* mm/color-auto-default (2013-07-19) 1 commit
|
||||
(merged to 'next' on 2013-07-19 at 880d984)
|
||||
+ git add -e: Explicitly specify that patch should have no color
|
||||
|
||||
A finishing touch to fix breakage to "add -e" caused by defaulting
|
||||
ui.color to "auto".
|
||||
|
||||
|
||||
* mm/diff-no-patch-synonym-to-s (2013-07-17) 6 commits
|
||||
(merged to 'next' on 2013-07-18 at 3b893d6)
|
||||
+ Documentation/git-log.txt: capitalize section names
|
||||
+ Documentation: move description of -s, --no-patch to diff-options.txt
|
||||
+ Documentation/git-show.txt: include common diff options, like git-log.txt
|
||||
+ diff: allow --patch & cie to override -s/--no-patch
|
||||
+ diff: allow --no-patch as synonym for -s
|
||||
+ t4000-diff-format.sh: modernize style
|
||||
|
||||
"git show -s" was less discoverable than it should have been. It
|
||||
now has a more natural looking "git show --no-patch" synonym.
|
||||
|
||||
|
||||
* nd/const-struct-cache-entry (2013-07-09) 1 commit
|
||||
(merged to 'next' on 2013-07-15 at 9ce0122)
|
||||
+ Convert "struct cache_entry *" to "const ..." wherever possible
|
||||
|
||||
|
||||
* rr/send-email-ssl-verify (2013-07-18) 1 commit
|
||||
(merged to 'next' on 2013-07-21 at 62099ff)
|
||||
+ send-email: be explicit with SSL certificate verification
|
||||
|
||||
Newer Net::SMTP::SSL module does not want the user programs to use
|
||||
the default behaviour to let server certificate go without
|
||||
verification, so by default enable the verification with a
|
||||
mechanism to turn it off if needed.
|
||||
|
||||
|
||||
* sb/parse-object-buffer-eaten (2013-07-17) 1 commit
|
||||
(merged to 'next' on 2013-07-18 at 364689c)
|
||||
+ parse_object_buffer: correct freeing the buffer
|
||||
|
||||
|
||||
* tr/do-not-call-submodules-subprojects (2013-07-18) 2 commits
|
||||
(merged to 'next' on 2013-07-18 at 6386fd5)
|
||||
+ show-branch: fix description of --date-order
|
||||
+ apply, entry: speak of submodules instead of subprojects
|
||||
|
||||
|
||||
* tr/fd-gotcha-fixes (2013-07-12) 2 commits
|
||||
(merged to 'next' on 2013-07-18 at 30f4fdf)
|
||||
+ run-command: dup_devnull(): guard against syscalls failing
|
||||
+ git_mkstemps: correctly test return value of open()
|
||||
|
||||
Two places we did not check return value (expected to be a file
|
||||
descriptor) correctly.
|
||||
|
||||
|
||||
* tr/protect-low-3-fds (2013-07-17) 2 commits
|
||||
(merged to 'next' on 2013-07-18 at 504d972)
|
||||
+ git: ensure 0/1/2 are open in main()
|
||||
+ daemon/shell: refactor redirection of 0/1/2 from /dev/null
|
||||
|
||||
When "git" is spawned in such a way that any of the low 3 file
|
||||
descriptors is closed, our first open() may yield file descriptor 2,
|
||||
and writing error message to it would screw things up in a big way.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* rj/doc-rev-parse (2013-07-22) 2 commits
|
||||
(merged to 'next' on 2013-07-22 at 8188667)
|
||||
+ rev-parse(1): logically group options
|
||||
+ rev-parse: remove restrictions on some options
|
||||
|
||||
Will cook in 'next'.
|
||||
|
||||
|
||||
* ob/typofixes (2013-07-22) 3 commits
|
||||
- typofix: in-code comments
|
||||
- typofix: documentation
|
||||
- typofix: release notes
|
||||
|
||||
Will merge to 'next' and then to 'master'.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* jk/fast-import-empty-ls (2013-06-23) 4 commits
|
||||
- fast-import: allow moving the root tree
|
||||
- fast-import: allow ls or filecopy of the root tree
|
||||
- fast-import: set valid mode on root tree in "ls"
|
||||
- t9300: document fast-import empty path issues
|
||||
|
||||
Comments?
|
||||
|
||||
|
||||
* tf/gitweb-ss-tweak (2013-07-15) 4 commits
|
||||
- gitweb: make search help link less ugly
|
||||
- gitweb: omit the repository owner when it is unset
|
||||
@ -192,6 +377,37 @@ of the repositories listed at
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* jk/fast-import-empty-ls (2013-06-23) 4 commits
|
||||
- fast-import: allow moving the root tree
|
||||
- fast-import: allow ls or filecopy of the root tree
|
||||
- fast-import: set valid mode on root tree in "ls"
|
||||
- t9300: document fast-import empty path issues
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jm/doc-ref-prune (2013-07-18) 2 commits
|
||||
(merged to 'next' on 2013-07-22 at 414e6ea)
|
||||
+ Documentation: fix git-prune example usage
|
||||
+ Documentation: remove --prune from pack-refs examples
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* rj/sparse (2013-07-21) 1 commit
|
||||
(merged to 'next' on 2013-07-22 at 24efece)
|
||||
+ Revert "compat/unsetenv.c: Fix a sparse warning"
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* sb/traverse-trees-bitmask-variable-name (2013-07-19) 1 commit
|
||||
(merged to 'next' on 2013-07-22 at be3227c)
|
||||
+ traverse_trees(): clarify return value of the callback
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mh/multimail (2013-07-15) 2 commits
|
||||
- post-receive-email: deprecate script in favor of git-multimail
|
||||
- git-multimail: an improved replacement for post-receive-email
|
||||
@ -204,51 +420,14 @@ of the repositories listed at
|
||||
time.
|
||||
|
||||
|
||||
* db/show-ref-head (2013-07-17) 1 commit
|
||||
(merged to 'next' on 2013-07-18 at 73797d0)
|
||||
+ show-ref: make --head always show the HEAD ref
|
||||
|
||||
The "--head" option to "git show-ref" was only to add "HEAD" to the
|
||||
list of candidate refs to be filtered by the usual rules
|
||||
(e.g. "--heads" that only show refs under refs/heads). Change the
|
||||
meaning of the option to always show "HEAD" regardless of what
|
||||
filtering will be applied to any other ref (this is a backward
|
||||
incompatible change, so I may need to add an entry to the Release
|
||||
Notes).
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* dw/request-pull-diag (2013-07-17) 1 commit
|
||||
(merged to 'next' on 2013-07-18 at d4406de)
|
||||
+ request-pull: improve error message for invalid revision args
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* es/blame-L-breakage (2013-07-17) 6 commits
|
||||
(merged to 'next' on 2013-07-18 at cfd871a)
|
||||
+ blame-options.txt: explain that -L <start> and <end> are optional
|
||||
+ blame-options.txt: place each -L option variation on its own line
|
||||
+ t8001/t8002 (blame): add blame -L :funcname tests
|
||||
+ t8001/t8002 (blame): add blame -L tests
|
||||
+ t8001/t8002 (blame): modernize style
|
||||
+ line-range: fix "blame -L X,-N" regression
|
||||
|
||||
The refactoring made for parsing "-L" option recently to support
|
||||
"git log -L" seems to have broken "git blame -L X,-5" to show 5
|
||||
lines leading to X.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/diff-filter-negation (2013-07-19) 6 commits
|
||||
- diff: deprecate -q option to diff-files
|
||||
- diff: allow lowercase letter to specify what change class to exclude
|
||||
- diff: reject unknown change class given to --diff-filter
|
||||
- diff: preparse --diff-filter string argument
|
||||
- diff: factor out match_filter()
|
||||
- diff: pass the whole diff_options to diffcore_apply_filter()
|
||||
(merged to 'next' on 2013-07-22 at 80d167d)
|
||||
+ diff: deprecate -q option to diff-files
|
||||
+ diff: allow lowercase letter to specify what change class to exclude
|
||||
+ diff: reject unknown change class given to --diff-filter
|
||||
+ diff: preparse --diff-filter string argument
|
||||
+ diff: factor out match_filter()
|
||||
+ diff: pass the whole diff_options to diffcore_apply_filter()
|
||||
(this branch is used by jc/hold-diff-remove-q-synonym-for-no-deletion.)
|
||||
|
||||
Teach "git diff --diff-filter" to express "I do not want to see
|
||||
@ -257,7 +436,7 @@ of the repositories listed at
|
||||
everything but deletion) and deprecate "diff-files -q" which did
|
||||
the same thing as "--diff-filter=d".
|
||||
|
||||
Will merge to 'next'.
|
||||
Will cook in 'next'.
|
||||
|
||||
|
||||
* mh/packed-refs-do-one-ref-recursion (2013-07-17) 1 commit
|
||||
@ -267,40 +446,28 @@ of the repositories listed at
|
||||
|
||||
|
||||
* ml/avoid-using-grep-on-crlf-files (2013-07-18) 1 commit
|
||||
- test-lib.sh - define and use GREP_STRIPS_CR
|
||||
(merged to 'next' on 2013-07-22 at f861472)
|
||||
+ test-lib.sh - define and use GREP_STRIPS_CR
|
||||
|
||||
On systems that understand a CRLF as a line ending, tests in this
|
||||
script that worked on files with CRLF line endings using "grep" to
|
||||
extract matching lines may lose the CR at the end of lines that
|
||||
match, causing the actual output not to match the expected output.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ml/cygwin-updates (2013-07-21) 4 commits
|
||||
- cygwin: stop forcing core.filemode=false
|
||||
- Cygwin 1.7 supports mmap
|
||||
- Cygwin 1.7 has thread-safe pread
|
||||
- Cygwin 1.7 needs compat/regex
|
||||
(merged to 'next' on 2013-07-22 at e9c9872)
|
||||
+ cygwin: stop forcing core.filemode=false
|
||||
+ Cygwin 1.7 supports mmap
|
||||
+ Cygwin 1.7 has thread-safe pread
|
||||
+ Cygwin 1.7 needs compat/regex
|
||||
|
||||
The tip one does _not_ revert c869753e (Force core.filemode to
|
||||
false on Cygwin., 2006-12-30) on purpose, so that people can
|
||||
still retain the old behaviour if they wanted to.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* mm/diff-no-patch-synonym-to-s (2013-07-17) 6 commits
|
||||
(merged to 'next' on 2013-07-18 at 3b893d6)
|
||||
+ Documentation/git-log.txt: capitalize section names
|
||||
+ Documentation: move description of -s, --no-patch to diff-options.txt
|
||||
+ Documentation/git-show.txt: include common diff options, like git-log.txt
|
||||
+ diff: allow --patch & cie to override -s/--no-patch
|
||||
+ diff: allow --no-patch as synonym for -s
|
||||
+ t4000-diff-format.sh: modernize style
|
||||
|
||||
"git show -s" was less discoverable than it should be.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
@ -361,14 +528,15 @@ of the repositories listed at
|
||||
|
||||
|
||||
* rh/template-updates (2013-07-15) 3 commits
|
||||
- templates: spell ASCII in uppercase in pre-commit hook
|
||||
- templates: Reformat pre-commit hook's message
|
||||
- templates: Use heredoc in pre-commit hook
|
||||
(merged to 'next' on 2013-07-22 at 53dffdd)
|
||||
+ templates: spell ASCII in uppercase in pre-commit hook
|
||||
+ templates: Reformat pre-commit hook's message
|
||||
+ templates: Use heredoc in pre-commit hook
|
||||
|
||||
This is an earlier part of a 6 patch series, with log message
|
||||
corrected.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* sb/misc-fixes (2013-07-15) 3 commits
|
||||
@ -382,56 +550,6 @@ of the repositories listed at
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* sb/parse-object-buffer-eaten (2013-07-17) 1 commit
|
||||
(merged to 'next' on 2013-07-18 at 364689c)
|
||||
+ parse_object_buffer: correct freeing the buffer
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* tr/do-not-call-submodules-subprojects (2013-07-18) 2 commits
|
||||
(merged to 'next' on 2013-07-18 at 6386fd5)
|
||||
+ show-branch: fix description of --date-order
|
||||
+ apply, entry: speak of submodules instead of subprojects
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* tr/protect-low-3-fds (2013-07-17) 2 commits
|
||||
(merged to 'next' on 2013-07-18 at 504d972)
|
||||
+ git: ensure 0/1/2 are open in main()
|
||||
+ daemon/shell: refactor redirection of 0/1/2 from /dev/null
|
||||
|
||||
When "git" is spawned in such a way that any of the low 3 file
|
||||
descriptors is closed, our first open() may yield file descriptor 2,
|
||||
and writing error message to it would screw things up in a big way.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* rr/send-email-ssl-verify (2013-07-18) 1 commit
|
||||
(merged to 'next' on 2013-07-21 at 62099ff)
|
||||
+ send-email: be explicit with SSL certificate verification
|
||||
|
||||
Newer Net::SMTP::SSL module does not want the user programs to use
|
||||
the default behaviour to let server certificate go without
|
||||
verification, so by default enable the verification with a
|
||||
mechanism to turn it off if needed.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* es/check-mailmap (2013-07-13) 2 commits
|
||||
(merged to 'next' on 2013-07-21 at 23c5363)
|
||||
+ t4203: test check-mailmap command invocation
|
||||
+ builtin: add git-check-mailmap command
|
||||
(this branch is used by es/contacts.)
|
||||
|
||||
A new command to allow scripts to query the mailmap information.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/check-x-z (2013-07-11) 4 commits
|
||||
(merged to 'next' on 2013-07-15 at 62751bc)
|
||||
+ check-attr -z: a single -z should apply to both input and output
|
||||
@ -448,73 +566,25 @@ of the repositories listed at
|
||||
screams before deciding if we want to do anything to help existing
|
||||
users (there may be none).
|
||||
|
||||
Waiting for failure reports ;-)
|
||||
Will cook in 'next'.
|
||||
|
||||
|
||||
* jk/cat-file-batch-optim (2013-07-18) 9 commits
|
||||
- Fix some sparse warnings
|
||||
- sha1_object_info_extended: pass object_info to helpers
|
||||
- sha1_object_info_extended: make type calculation optional
|
||||
- packed_object_info: make type lookup optional
|
||||
- packed_object_info: hoist delta type resolution to helper
|
||||
- sha1_loose_object_info: make type lookup optional
|
||||
- sha1_object_info_extended: rename "status" to "type"
|
||||
- cat-file: disable object/refname ambiguity check for batch mode
|
||||
- Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optim
|
||||
(merged to 'next' on 2013-07-22 at 965897c)
|
||||
+ Fix some sparse warnings
|
||||
+ sha1_object_info_extended: pass object_info to helpers
|
||||
+ sha1_object_info_extended: make type calculation optional
|
||||
+ packed_object_info: make type lookup optional
|
||||
+ packed_object_info: hoist delta type resolution to helper
|
||||
+ sha1_loose_object_info: make type lookup optional
|
||||
+ sha1_object_info_extended: rename "status" to "type"
|
||||
+ cat-file: disable object/refname ambiguity check for batch mode
|
||||
+ Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optim
|
||||
|
||||
If somebody wants to only know on-disk footprint of an object
|
||||
without having to know its type or payload size, we can bypass a
|
||||
lot of code to cheaply learn it.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jk/t0008-sigpipe-fix (2013-07-12) 1 commit
|
||||
(merged to 'next' on 2013-07-15 at cead4b2)
|
||||
+ t0008: avoid SIGPIPE race condition on fifo
|
||||
|
||||
Fix for recent test breakage on 'master'.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mk/upload-pack-off-by-one-dead-code-removal (2013-07-15) 1 commit
|
||||
(merged to 'next' on 2013-07-15 at a8f55a2)
|
||||
+ upload-pack: remove a piece of dead code
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* tr/fd-gotcha-fixes (2013-07-12) 2 commits
|
||||
(merged to 'next' on 2013-07-18 at 30f4fdf)
|
||||
+ run-command: dup_devnull(): guard against syscalls failing
|
||||
+ git_mkstemps: correctly test return value of open()
|
||||
|
||||
Two places we did not check return value (expected to be a file
|
||||
descriptor) correctly.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/mailmap-case-insensitivity (2013-07-15) 9 commits
|
||||
(merged to 'next' on 2013-07-18 at 83341ac)
|
||||
+ mailmap: style fixes
|
||||
+ mailmap: debug: avoid passing NULL to fprintf() '%s' conversion specification
|
||||
+ mailmap: debug: eliminate -Wformat field precision type warning
|
||||
+ mailmap: debug: fix malformed fprintf() format conversion specification
|
||||
+ mailmap: debug: fix out-of-order fprintf() arguments
|
||||
+ mailmap: do not downcase mailmap entries
|
||||
+ t4203: demonstrate loss of uppercase characters in canonical email
|
||||
+ mailmap: do not lose single-letter names
|
||||
+ t4203: demonstrate loss of single-character name in mailmap entry
|
||||
|
||||
The mailmap mechanism unnecessarily downcased the e-mail addresses
|
||||
in the output, and also ignored the human name when it is a single
|
||||
character name.
|
||||
|
||||
This now has become Eric Sunshine's series, even though it still is
|
||||
under jc/ hierarchy.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
@ -525,65 +595,24 @@ of the repositories listed at
|
||||
Allow fetch.prune and remote.*.prune configuration variables to be set,
|
||||
and "git fetch" to behave as if "--prune" is given.
|
||||
|
||||
Will merge to 'master'.
|
||||
"git fetch" that honors remote.*.prune is fine, but I wonder if we
|
||||
should somehow make "git push" aware of it as well. Perhaps
|
||||
remote.*.prune should not be just a boolean, but a 4-way "none",
|
||||
"push", "fetch", "both"?
|
||||
|
||||
Will cook in 'next'.
|
||||
|
||||
|
||||
* jk/gcc-function-attributes (2013-07-19) 4 commits
|
||||
(merged to 'next' on 2013-07-19 at 5f6ad91)
|
||||
+ Add the LAST_ARG_MUST_BE_NULL macro
|
||||
(merged to 'next' on 2013-07-12 at 5a7081f)
|
||||
+ wt-status: use "format" function attribute for status_printf
|
||||
+ use "sentinel" function attribute for variadic lists
|
||||
+ add missing "format" function attributes
|
||||
|
||||
Use the function attributes extension to catch mistakes in use of
|
||||
our own variadic functions that use NULL sentinel at the end
|
||||
(i.e. like execl(3)) and format strings (i.e. like printf(3)).
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* km/http-curl-config-per-url (2013-07-21) 5 commits
|
||||
. config: allow http.<url>.* any user matching
|
||||
. tests: add new test for the url_normalize function
|
||||
. config: improve support for http.<url>.* settings
|
||||
. config: add support for http.<url>.* settings
|
||||
. http.c: fix parsing of http.sslCertPasswordProtected variable
|
||||
* km/http-curl-config-per-url (2013-07-22) 5 commits
|
||||
- config: allow http.<url>.* any user matching
|
||||
- tests: add new test for the url_normalize function
|
||||
- config: improve support for http.<url>.* settings
|
||||
- config: add support for http.<url>.* settings
|
||||
- http.c: fix parsing of http.sslCertPasswordProtected variable
|
||||
|
||||
Allows custom curl configuration per URL when talking over http.
|
||||
Tentatively ejected as I did not seem to have received some binary
|
||||
files correctly.
|
||||
|
||||
|
||||
* hv/config-from-blob (2013-07-12) 5 commits
|
||||
(merged to 'next' on 2013-07-15 at 9ab7f3f)
|
||||
+ do not die when error in config parsing of buf occurs
|
||||
+ teach config --blob option to parse config from database
|
||||
+ config: make parsing stack struct independent from actual data source
|
||||
+ config: drop cf validity check in get_next_char()
|
||||
+ config: factor out config file stack management
|
||||
|
||||
Allow configuration data to be read from in-tree blob objects,
|
||||
which would help working in a bare repository and submodule
|
||||
updates.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/name-rev-exact-ref (2013-07-18) 5 commits
|
||||
(merged to 'next' on 2013-07-18 at c8bc00c)
|
||||
+ describe: fix --contains when a tag is given as input
|
||||
+ name-rev: differentiate between tags and commits they point at
|
||||
(merged to 'next' on 2013-07-11 at fd5b30c)
|
||||
+ describe: use argv-array
|
||||
+ name-rev: allow converting the exact object name at the tip of a ref
|
||||
+ name-ref: factor out name shortening logic from name_ref()
|
||||
|
||||
Corrects the longstanding sloppiness in the implementation of
|
||||
name-rev that conflated "we take commit-ish" and "differences
|
||||
between tags and commits do not matter".
|
||||
|
||||
Will merge to 'master'.
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* km/svn-1.8-serf-only (2013-07-18) 3 commits
|
||||
@ -596,7 +625,7 @@ of the repositories listed at
|
||||
Subversion 1.8.0 that was recently released breaks older subversion
|
||||
clients coming over http/https in various ways.
|
||||
|
||||
Will cook for a while.
|
||||
Will cook in 'next'.
|
||||
|
||||
|
||||
* tr/merge-recursive-index-only (2013-07-07) 3 commits
|
||||
@ -604,12 +633,7 @@ of the repositories listed at
|
||||
- merge-recursive: untangle double meaning of o->call_depth
|
||||
- merge-recursive: remove dead conditional in update_stages()
|
||||
|
||||
What's the status of this one?
|
||||
|
||||
I am not particularly fond of the second patch that conceptually
|
||||
allows updating working tree during a virtual merge (i.e. addition
|
||||
of o->no_worktree is fine, but there needs a way to make sure it is
|
||||
never set to false when o->depth is not zero).
|
||||
Will hold, until we get any user.
|
||||
|
||||
|
||||
* jc/push-cas (2013-07-17) 6 commits
|
||||
@ -637,36 +661,27 @@ of the repositories listed at
|
||||
it is a weaker and more controlled form of "--force" that is used
|
||||
to defeat the usual "must fast-forward" safety.
|
||||
|
||||
|
||||
* nd/const-struct-cache-entry (2013-07-09) 1 commit
|
||||
(merged to 'next' on 2013-07-15 at 9ce0122)
|
||||
+ Convert "struct cache_entry *" to "const ..." wherever possible
|
||||
|
||||
Will merge to 'master'.
|
||||
Will redo one more time.
|
||||
|
||||
|
||||
* es/contacts (2013-07-21) 5 commits
|
||||
- contrib: contacts: add documentation
|
||||
- contrib: contacts: add mailmap support
|
||||
- contrib: contacts: interpret committish akin to format-patch
|
||||
- contrib: contacts: add ability to parse from committish
|
||||
- contrib: add git-contacts helper
|
||||
(this branch uses es/check-mailmap.)
|
||||
(merged to 'next' on 2013-07-22 at a78c3d6)
|
||||
+ contrib: contacts: add documentation
|
||||
+ contrib: contacts: add mailmap support
|
||||
+ contrib: contacts: interpret committish akin to format-patch
|
||||
+ contrib: contacts: add ability to parse from committish
|
||||
+ contrib: add git-contacts helper
|
||||
|
||||
A helper to read from a set of format-patch output files or a range
|
||||
of commits and find those who may have insights to the code that
|
||||
the changes touch by running a series of "git blame" commands.
|
||||
|
||||
Still needs to add mailmap support and other niceties but the
|
||||
basics already look sound, and the enhancements can be done
|
||||
in-tree. Assuming that "git contact" is something we may want to
|
||||
have as a member of the official set of commands someday, that is.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/pull-training-wheel (2013-07-19) 1 commit
|
||||
- pull: require choice between rebase/merge on non-fast-forward pull
|
||||
(merged to 'next' on 2013-07-22 at 748180e)
|
||||
+ pull: require choice between rebase/merge on non-fast-forward pull
|
||||
|
||||
Make "git pull" (without arguments that say what branch to
|
||||
integrate from where) refuse with "it does not fast forward; choose
|
||||
@ -679,7 +694,7 @@ of the repositories listed at
|
||||
|
||||
for full discussion.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will cook in 'next'.
|
||||
|
||||
|
||||
* rj/cygwin-clarify-use-of-cheating-lstat (2013-07-18) 1 commit
|
||||
@ -704,39 +719,12 @@ of the repositories listed at
|
||||
|
||||
|
||||
* mh/ref-races-optim-invalidate-cached (2013-06-20) 1 commit
|
||||
- refs: do not invalidate the packed-refs cache unnecessarily
|
||||
(merged to 'next' on 2013-07-22 at 144d135)
|
||||
+ refs: do not invalidate the packed-refs cache unnecessarily
|
||||
|
||||
This requires the platform lstat() to be correct to avoid false
|
||||
negatives.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jx/clean-interactive (2013-06-26) 16 commits
|
||||
(merged to 'next' on 2013-07-12 at 61dd42d)
|
||||
+ test: run testcases with POSIX absolute paths on Windows
|
||||
+ test: add t7301 for git-clean--interactive
|
||||
+ git-clean: add documentation for interactive git-clean
|
||||
+ git-clean: add ask each interactive action
|
||||
+ git-clean: add select by numbers interactive action
|
||||
+ git-clean: add filter by pattern interactive action
|
||||
+ git-clean: use a git-add-interactive compatible UI
|
||||
+ git-clean: add colors to interactive git-clean
|
||||
+ git-clean: show items of del_list in columns
|
||||
+ git-clean: add support for -i/--interactive
|
||||
(merged to 'next' on 2013-06-26 at f7be2d8)
|
||||
+ git-clean: refactor git-clean into two phases
|
||||
+ write_name{_quoted_relative,}(): remove redundant parameters
|
||||
+ quote_path_relative(): remove redundant parameter
|
||||
+ quote.c: substitute path_relative with relative_path
|
||||
+ path.c: refactor relative_path(), not only strip prefix
|
||||
+ test: add test cases for relative_path
|
||||
|
||||
Add "interactive" mode to "git clean".
|
||||
|
||||
The early part to refactor relative path related helper functions
|
||||
looked sensible.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
@ -771,4 +759,4 @@ of the repositories listed at
|
||||
- diff: remove "diff-files -q" in a version of Git in a distant future
|
||||
(this branch uses jc/diff-filter-negation.)
|
||||
|
||||
This obviously has to wait until a distant future.
|
||||
Will cook in 'next' until a distant future.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user