To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Jun 2014, #02; Fri, 6)
-X-master-at: 0953113bb5687f42bcdfc3d20dd3a125784ad383
-X-next-at: 41885497b0c577b31af733b8c4b05bcded1912bd
+Subject: What's cooking in git.git (Jun 2014, #03; Tue, 10)
+X-master-at: 50f84e34a1b0bb893327043cb0c491e02ced9ff5
+X-next-at: 8cd8cf873f2edce97930416c82a1a2213d488ee4
-What's cooking in git.git (Jun 2014, #02; Fri, 6)
+What's cooking in git.git (Jun 2014, #03; Tue, 10)
--------------------------------------------------
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 second batch of topics, all of which have been cooking for quite
-a while on the 'next' branch, have been merged to 'master'.
-
-I am aware of a handful of multi-patch topics sent to the list the
-past week that have not been picked up, and I won't be picking them
-up yet, before we have a chance to first have some topics that have
-been cooking in 'next' during the previous cycle merged to 'master'
-and then rewind the tip of 'next'. At that point, I may have to ask
-for them to be rebased on top of the updated 'master' to reduce
-conflicts. Thanks for your patience.
+The tip of 'next' has been rewound. I originally wanted to eject
+many younger topics and slim the branch down, but decided against
+it.
You can find the changes described here in the integration branches
of the repositories listed at
--------------------------------------------------
[Graduated to "master"]
-* bc/blame-crlf-test (2014-05-08) 1 commit
- (merged to 'next' on 2014-05-14 at b819505)
- + blame: correctly handle files regardless of autocrlf
-
- If a file contained CRLF line endings in a repository with
- core.autocrlf=input, then blame always marked lines as "Not
- Committed Yet", even if they were unmodified.
-
-
-* da/imap-send-use-credential-helper (2014-04-29) 1 commit
- (merged to 'next' on 2014-05-12 at b0698a5)
- + imap-send: use git-credential
-
- "git imap-send" learned to ask the credential helper for
- authentication material.
-
-
-* dk/blame-reorg (2014-04-28) 1 commit
- (merged to 'next' on 2014-05-14 at 354a0e3)
- + blame: large-scale performance rewrite
-
- "git blame" has been optimized greatly by reorganising the data
- structure that is used to keep track of the work to be done, thanks
- to David Karstrup <dak@gnu.org>.
-
-
-* dk/raise-core-deltabasecachelimit (2014-05-06) 1 commit
- (merged to 'next' on 2014-05-12 at 97ec92a)
- + Bump core.deltaBaseCacheLimit to 96m
-
- The `core.deltabasecachelimit` used to default to 16 MiB, but this
- proved to be too small, and has been bumped to 96 MiB.
-
-
-* dt/merge-recursive-case-insensitive (2014-05-08) 2 commits
- (merged to 'next' on 2014-05-12 at 820d524)
- + mv: allow renaming to fix case on case insensitive filesystems
- + merge-recursive.c: fix case-changing merge bug
-
- On a case insensitive filesystem, merge-recursive incorrectly
- deleted the file that is to be renamed to a name that is the same
- except for case differences.
-
-
-* ep/shell-assign-and-export-vars (2014-05-23) 2 commits
- (merged to 'next' on 2014-05-23 at 7699c0e)
- + scripts: more "export VAR=VALUE" fixes
- + scripts: "export VAR=VALUE" construct is not portable
-
-
-* fc/status-printf-squelch-format-zero-length-warnings (2014-05-07) 1 commit
- (merged to 'next' on 2014-05-12 at 6b04e23)
- + silence a bunch of format-zero-length warnings
-
-
-* jc/coding-guidelines (2014-05-20) 9 commits
- (merged to 'next' on 2014-05-23 at bb351fc)
- + CodingGuidelines: avoid "test <cond> -a/-o <cond>"
- (merged to 'next' on 2014-05-12 at e1fcf62)
- + CodingGuidelines: on splitting a long line
- + CodingGuidelines: on comparison
- + CodingGuidelines: do not call the conditional statement "if()"
- + CodingGuidelines: give an example for shell function preamble
- + CodingGuidelines: give an example for control statements
- + CodingGuidelines: give an example for redirection
- + CodingGuidelines: give an example for case/esac statement
- + CodingGuidelines: once it is in, it is not worth the code churn
-
- Some people need these things spelled out, unable to follow advices
- given by others when they fail to imitate the surrounding existing
- code.
-
-
-* jd/subtree (2014-05-13) 6 commits
- (merged to 'next' on 2014-05-14 at 977db74)
- + contrib/subtree: allow adding an annotated tag
- (merged to 'next' on 2014-05-07 at 81b375d)
- + contrib/subtree/Makefile: clean up rule for "clean"
- + contrib/subtree/Makefile: clean up rules to generate documentation
- + contrib/subtree/Makefile: s/libexecdir/gitexecdir/
- + contrib/subtree/Makefile: use GIT-VERSION-FILE
- + contrib/subtree/Makefile: scrap unused $(gitdir)
-
- Clean-up build procedure of subtree in contrib/.
+* jc/rev-parse-argh-dashed-multi-words (2014-06-04) 1 commit
+ (merged to 'next' on 2014-06-06 at 8b04440)
+ + update-index: fix segfault with missing --cacheinfo argument
+ "update-index --cacheinfo" in 2.0 crashes on a malformed command line.
-* je/pager-do-not-recurse (2014-04-28) 1 commit
- (merged to 'next' on 2014-05-12 at 32de470)
- + pager: do allow spawning pager recursively
- We used to unconditionally disable the pager in the pager process
- we spawn to feed out output, but that prevented people who want to
- run "less" within "less" from doing so.
+* jc/shortlog-ref-exclude (2014-06-04) 1 commit
+ (merged to 'next' on 2014-06-06 at a358cbe)
+ + shortlog: allow --exclude=<glob> to be passed
+ "shortlog --opts and args" and "log --opts and args | shortlog"
+ should be equivalent, but the former did not grok some options.
-* jj/command-line-adjective (2014-05-21) 1 commit
- (merged to 'next' on 2014-05-23 at fe136c8)
- + Documentation: use "command-line" when used as a compound adjective, and fix other minor grammatical issues
+* lt/request-pull (2014-06-02) 1 commit
+ (merged to 'next' on 2014-06-06 at ad4d79d)
+ + fix brown paper bag breakage in t5150-request-pull.sh
-* jk/commit-C-pick-empty (2014-04-28) 1 commit
- (merged to 'next' on 2014-05-12 at c187e1e)
- + commit: do not complain of empty messages from -C
- "git commit --allow-empty-message -C $commit" did not work when the
- commit did not have any log message.
+* mn/sideband-no-ansi (2014-06-02) 1 commit
+ (merged to 'next' on 2014-06-06 at f61fc73)
+ + sideband.c: do not use ANSI control sequence on non-terminal
-* jk/grep-tell-run-command-to-cd-when-running-pager (2014-05-07) 1 commit
- (merged to 'next' on 2014-05-12 at 065cb22)
- + grep: use run-command's "dir" option for --open-files-in-pager
+* na/no-http-test-in-the-middle (2014-05-30) 1 commit
+ (merged to 'next' on 2014-06-06 at e195615)
+ + t5538: move http push tests out to t5542
-* jk/index-pack-report-missing (2014-05-12) 1 commit
- (merged to 'next' on 2014-05-14 at 72d40e1)
- + index-pack: distinguish missing objects from type errors
+* pb/trim-trailing-spaces (2014-06-02) 1 commit
+ (merged to 'next' on 2014-06-06 at 741efc2)
+ + dir.c:trim_trailing_spaces(): fix for " \ " sequence
+ Fix an error in parsing of .gitignore files that use a trailing
+ "\ " to mark pathnames that end with a SP.
-* jk/squelch-compiler-warning-from-funny-error-macro (2014-05-06) 2 commits
- (merged to 'next' on 2014-05-12 at d9daf8d)
- + let clang use the constant-return error() macro
- + inline constant return from error() function
+* rs/mailinfo-header-cmp (2014-06-02) 1 commit
+ (merged to 'next' on 2014-06-06 at 5e856f4)
+ + mailinfo: use strcmp() for string comparison
-* jk/utf8-switch-between-nfd-and-nfc (2014-04-29) 1 commit
- (merged to 'next' on 2014-05-12 at 948823c)
- + t3910: show failure of core.precomposeunicode with decomposed filenames
+ Avoid running over the end of header string while parsing an
+ incoming e-mail message to extract the patch.
- Document a known breakage with a test.
+--------------------------------------------------
+[New Topics]
+* ep/avoid-test-a-o (2014-06-10) 21 commits
+ - git-submodule.sh: avoid "echo" path-like values
+ - SQUASH: misconversion breakage fix
+ - git-submodule.sh: avoid "test <cond> -a/-o <cond>"
+ - t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
+ - t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"
+ - t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"
+ - git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"
+ - git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
+ - git-bisect.sh: avoid "test <cond> -a/-o <cond>"
+ - contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"
+ - contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"
+ - contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"
+ - contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"
+ - contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"
+ - check_bindir: avoid "test <cond> -a/-o <cond>"
+
+
+* jc/revision-dash-count-parsing (2014-06-09) 1 commit
+ (merged to 'next' on 2014-06-10 at 1aeca19)
+ + revision: parse "git log -<count>" more carefully
+
+ "git log -2master" is a common typo that shows two commits starting
+ from whichever random branch that is not 'master' that happens to
+ be checked out currently.
-* jn/contrib-remove-diffall (2014-05-09) 1 commit
- (merged to 'next' on 2014-05-12 at 416009e)
- + contrib: remove git-diffall
+ Will merge to 'master'.
- Spring cleaning of contrib/.
+* jc/test-lazy-prereq (2014-06-09) 7 commits
+ - tests: drop GIT_*_TIMING_TESTS environment variable support
+ (merged to 'next' on 2014-06-10 at 4f774f7)
+ + t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
+ + t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
+ + t3302: do not chdir around in the primary test process
+ + t3302: coding style updates
+ + test: turn USR_BIN_TIME into a lazy prerequisite
+ + test: turn EXPENSIVE into a lazy prerequisite
+
+ Test-script clean-up. The last step might be controversial.
+
+ Will merge to 'master' except for the last one.
+
+
+* jk/commit-buffer-length (2014-06-10) 16 commits
+ - SQUASH to 12/15???
+ - commit: record buffer length in cache
+ - commit: convert commit->buffer to a slab
+ - commit-slab: provide a static initializer
+ - use get_commit_buffer everywhere
+ - convert logmsg_reencode to get_commit_buffer
+ - use get_commit_buffer to avoid duplicate code
+ - use get_cached_commit_buffer where appropriate
+ - provide helpers to access the commit buffer
+ - provide a helper to set the commit buffer
+ - provide a helper to free commit buffer
+ - sequencer: use logmsg_reencode in get_message
+ - logmsg_reencode: return const buffer
+ - do not create "struct commit" with xcalloc
+ - commit: push commit_index update into alloc_commit_node
+ - alloc: include any-object allocations in alloc_report
-* jn/contrib-remove-vim (2014-05-09) 1 commit
- (merged to 'next' on 2014-05-12 at 9e727c8)
- + contrib: remove vim support instructions
+ Expecting a reroll.
- Spring cleaning of contrib/.
+* jm/api-strbuf-doc (2014-06-09) 1 commit
+ (merged to 'next' on 2014-06-10 at 831aa30)
+ + api-strbuf.txt minor typos
-* jn/test-lint-unmoor (2014-05-23) 1 commit
- (merged to 'next' on 2014-05-23 at aa997bc)
- + test-lint: find unportable sed, echo, test, and export usage after &&
+ Will merge to 'master'.
-* mc/git-p4-prepare-p4-only (2014-05-27) 1 commit
- (merged to 'next' on 2014-05-27 at 71572fe)
- + git-p4: Do not include diff in spec file when just preparing p4
+* rs/more-starts-with (2014-06-09) 1 commit
+ (merged to 'next' on 2014-06-10 at efcd02e)
+ + Use starts_with() for C strings instead of memcmp()
+ Will merge to 'master'.
-* mk/show-s-no-extra-blank-line-for-merges (2014-05-15) 1 commit
- (merged to 'next' on 2014-05-21 at 3b98b35)
- + git-show: fix 'git show -s' to not add extra terminator after merge commit
- "git show -s" (i.e. show log message only) used to incorrectly emit
- an extra blank line after a merge commit.
+* sk/mingw-dirent (2014-06-09) 5 commits
+ - Win32 dirent: improve dirent implementation
+ - Win32 dirent: clarify #include directives
+ - Win32 dirent: change FILENAME_MAX to MAX_PATH
+ - Win32 dirent: remove unused dirent.d_reclen member
+ - Win32 dirent: remove unused dirent.d_ino member
-* mm/pager-less-sans-S (2014-05-07) 1 commit
- (merged to 'next' on 2014-05-07 at 66ce999)
- + pager: remove 'S' from $LESS by default
+* sk/mingw-main (2014-06-10) 2 commits
+ - mingw: avoid const warning
+ - Win32: move main macro to a function
+ (this branch is used by sk/mingw-uni-console; uses sk/windows-unc-path.)
- Since the very beginning of Git, we gave the LESS environment a
- default value "FRSX" when we spawn "less" as the pager. "S" (chop
- long lines instead of wrapping) has been removed from this default
- set of options, because it is more or less a personal taste thing,
- as opposed to others that have good justifications (i.e. "R" is
- very much justified because many kinds of output we produce are
- colored and "FX" is justified because output we produce is often
- shorter than a page).
+* sk/mingw-uni-console (2014-06-10) 6 commits
+ - Win32: fix broken pipe detection
+ - Win32: Thread-safe windows console output
+ - Win32: add Unicode conversion functions
+ - Win32: warn if the console font doesn't support Unicode
+ - Win32: detect console streams more reliably
+ - Win32: support Unicode console output
+ (this branch uses sk/mingw-main and sk/windows-unc-path.)
-* mt/rebase-i-keep-empty-test (2014-05-19) 1 commit
- (merged to 'next' on 2014-05-21 at d87d266)
- + rebase --keep-empty -i: add test
+ Could somebody from the mingw land double check that I queued the
+ right versions for the above three, as there were many iterations
+ and I wasn't paying attention.
+ After that will merge to 'next' and to 'master'.
-* nd/status-auto-comment-char (2014-05-19) 2 commits
- (merged to 'next' on 2014-05-21 at f762e62)
- + commit: allow core.commentChar=auto for character auto selection
- + config: be strict on core.commentChar
- The `core.commentChar` configuration variable is used to specify a
- custom comment character other than the default "#" to be used in
- the commit log editor. This can be set to `auto` to attempt to
- choose a different character that does not conflict with what
- already starts a line in the message being edited for cases like
- "git commit --amend".
+* tb/t5551-clone-notice-to-stderr (2014-06-09) 1 commit
+ (merged to 'next' on 2014-06-10 at 374082c)
+ + t5551: fix the 50,000 tag test
+ Will merge to 'master'.
-* rs/reflog-exists (2014-05-08) 2 commits
- (merged to 'next' on 2014-05-12 at 24a1d01)
- + checkout.c: use ref_exists instead of file_exist
- + refs.c: add new functions reflog_exists and delete_reflog
+* jk/repack-pack-keep-objects (2014-06-10) 3 commits
+ - repack: s/write_bitmap/&s/ in code
+ - repack: respect pack.writebitmaps
+ - repack: do not accidentally pack kept objects by default
+ (this branch is used by jk/repack-pack-writebitmaps-config.)
-* sk/spawn-less-case-insensitively-from-grep-O-i (2014-05-15) 1 commit
- (merged to 'next' on 2014-05-21 at eb28305)
- + git grep -O -i: if the pager is 'less', pass the '-I' option
+ Will merge to 'next'.
- "git grep -O" to show the lines that hit in the pager did not work
- well with case insensitive search. We now spawn "less" with its
- "-I" option when it is used as the pager (which is the default).
+* jk/repack-pack-writebitmaps-config (2014-06-10) 3 commits
+ - repack: introduce repack.writeBitmaps config option
+ - repack: simplify handling of --write-bitmap-index
+ - pack-objects: stop respecting pack.writebitmaps
+ (this branch uses jk/repack-pack-keep-objects.)
-* sk/submodules-absolute-path-on-windows (2014-05-08) 1 commit
- (merged to 'next' on 2014-05-14 at 83a05d9)
- + Revert "submodules: fix ambiguous absolute paths under Windows"
+ Will merge to 'next'.
-* ss/howto-manage-trunk (2014-05-28) 1 commit
- (merged to 'next' on 2014-05-28 at 5318336)
- + How to keep a project's canonical history correct.
+* mg/verify-commit (2014-06-10) 3 commits
+ - verify-commit: scriptable commit signature verification
+ - gpg-interface: provide access to the payload
+ - pretty: free the gpg status buf
+ Will merge to 'next'.
-* tb/unicode-6.3-zero-width (2014-05-12) 2 commits
- (merged to 'next' on 2014-05-14 at 08e0171)
- + utf8: make it easier to auto-update git_wcwidth()
- + utf8.c: use a table for double_width
- Update the logic to compute the display width needed for utf8
- strings and allow us to more easily maintain the tables used in
- that logic.
+* nd/init-restore-env (2014-06-10) 1 commit
+ - git potty: restore environments after alias expansion
- We may want to let the users choose if codepoints with ambiguous
- widths are treated as a double or single width in a follow-up patch.
+ Will merge to 'next'.
+--------------------------------------------------
+[Stalled]
-* tg/tag-state-tag-name-in-editor-hints (2014-05-07) 1 commit
- (merged to 'next' on 2014-05-12 at 0b7db32)
- + builtin/tag.c: show tag name to hint in the message editor
+* nd/split-index (2014-06-02) 34 commits
+ - fixup! read-cache: new API write_locked_index instead of write_index/write_cache
+ - SQUASH???
+ - t1700: new tests for split-index mode
+ - t2104: make sure split index mode is off for the version test
+ - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
+ - read-tree: note about dropping split-index mode or index version
+ - read-tree: force split-index mode off on --index-output
+ - rev-parse: add --shared-index-path to get shared index path
+ - update-index --split-index: do not split if $GIT_DIR is read only
+ - update-index: new options to enable/disable split index mode
+ - split-index: strip pathname of on-disk replaced entries
+ - split-index: do not invalidate cache-tree at read time
+ - split-index: the reading part
+ - split-index: the writing part
+ - read-cache: mark updated entries for split index
+ - read-cache: save deleted entries in split index
+ - read-cache: mark new entries for split index
+ - read-cache: split-index mode
+ - read-cache: save index SHA-1 after reading
+ - entry.c: update cache_changed if refresh_cache is set in checkout_entry()
+ - cache-tree: mark istate->cache_changed on prime_cache_tree()
+ - cache-tree: mark istate->cache_changed on cache tree update
+ - cache-tree: mark istate->cache_changed on cache tree invalidation
+ - unpack-trees: be specific what part of the index has changed
+ - resolve-undo: be specific what part of the index has changed
+ - update-index: be specific what part of the index has changed
+ - read-cache: be specific what part of the index has changed
+ - read-cache: be strict about "changed" in remove_marked_cache_entries()
+ - read-cache: store in-memory flags in the first 12 bits of ce_flags
+ - read-cache: relocate and unexport commit_locked_index()
+ - read-cache: new API write_locked_index instead of write_index/write_cache
+ - sequencer: do not update/refresh index if the lock cannot be held
+ - ewah: delete unused ewah_read_mmap_native declaration
+ - ewah: fix constness of ewah_read_mmap
- "git tag" when editing the tag message shows the name of the tag
- being edited as a comment in the editor.
+ The tip two remind us the need for a minor reroll. If I find time
+ I could try to squash them myself, but it is low priority for me.
-* tl/relax-in-poll-emulation (2014-04-29) 1 commit
- (merged to 'next' on 2014-05-12 at 9369b08)
- + compat/poll: sleep 1 millisecond to avoid busy wait
+* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
+ - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
+ - git-add--interactive: Preserve diff heading when splitting hunks
+ Waiting for a reroll.
-* wg/svn-fe-style-fixes (2014-05-12) 1 commit
- (merged to 'next' on 2014-05-12 at 88c0e0d)
- + svn-fe: conform to pep8
+* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
+ - gitweb: Harden UTF-8 handling in generated links
-* wk/doc-clarify-upstream (2014-05-13) 1 commit
- (merged to 'next' on 2014-05-14 at 6c8fb52)
- + Documentation: mention config sources for @{upstream}
+ $gmane/250758?
---------------------------------------------------
-[New Topics]
-* jc/rev-parse-argh-dashed-multi-words (2014-06-04) 1 commit
- (merged to 'next' on 2014-06-06 at 8b04440)
- + update-index: fix segfault with missing --cacheinfo argument
+* rh/prompt-tests (2014-06-05) 11 commits
+ - t9904: new __git_ps1 tests for Zsh
+ - test-lib: make it possible to override how test code is eval'd
+ - lib-prompt-tests.sh: add variable for string that encodes percent in PS1
+ - lib-prompt-tests.sh: put all tests inside a function
+ - t9903: move prompt tests to a new lib-prompt-tests.sh file
+ - t9903: move PS1 color code variable definitions to lib-bash.sh
+ - t9903: include "Bash" in test names via new $shellname var
+ - t9903: run pc mode tests again with PS1 expansion disabled
+ - t9903: move test name prefix to a separate variable
+ - t9903: put the Bash pc mode prompt test cases in a function
+ - t9903: remove Zsh test from the suite of Bash prompt tests
- "update-index --cacheinfo" in 2.0 crashes on a malformed command line.
+ Expecting a reroll to limit the damage to test_eval_; also reported
+ to be broken with older zsh that are still in the field ($gmane/251231).
- Will merge to 'master'.
+* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
+ - userdiff: support Java try keyword
+ - userdiff: support C# async methods and correct C# keywords
-* sk/test-cmp-bin (2014-06-04) 1 commit
- (merged to 'next' on 2014-06-06 at 112ae4b)
- + t5000, t5003: do not use test_cmp to compare binary files
+ Reviews sent; waiting for a response.
- Will merge to 'master'.
+* cc/interpret-trailers (2014-05-28) 11 commits
+ - Documentation: add documentation for 'git interpret-trailers'
+ - trailer: add tests for commands in config file
+ - trailer: execute command from 'trailer.<name>.command'
+ - trailer: add tests for "git interpret-trailers"
+ - trailer: add interpret-trailers command
+ - trailer: put all the processing together and print
+ - trailer: parse trailers from file or stdin
+ - trailer: process command line trailer arguments
+ - trailer: read and process config information
+ - trailer: process trailers from input message and arguments
+ - trailer: add data structures and basic functions
-* dt/refs-check-refname-component-optim (2014-06-05) 1 commit
- (merged to 'next' on 2014-06-06 at e85fb57)
- + refs.c: optimize check_refname_component()
+ A new filter to programatically edit the tail end of the commit log
+ messages.
- Will merge to 'master'.
+ What is the status of this one? I think I saw reviews by Michael
+ but after that I do not recall seeing any updates.
-* jm/dedup-test-config (2014-06-05) 1 commit
- (merged to 'next' on 2014-06-06 at 443f096)
- + t/t7810-grep.sh: remove duplicate test_config()
+* jh/submodule-tests (2014-04-17) 1 commit
+ - t7410: 210 tests for various 'git submodule update' scenarios
- Will merge to 'master'.
+ More or less abandoned. Will drop.
---------------------------------------------------
-[Stalled]
* nd/multiple-work-trees (2014-03-25) 28 commits
- count-objects: report unused files in $GIT_DIR/repos/...
rerolled not to squat on @{p} which @{push} and possibly @{pull}
may want to share.
- Ejected from 'pu' to unclutter.
-
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
--------------------------------------------------
[Cooking]
+* sk/test-cmp-bin (2014-06-04) 1 commit
+ (merged to 'next' on 2014-06-10 at 020a475)
+ + t5000, t5003: do not use test_cmp to compare binary files
+
+ Originally merged to 'next' on 2014-06-06
+
+ Will merge to 'master'.
+
+
+* dt/refs-check-refname-component-optim (2014-06-05) 1 commit
+ (merged to 'next' on 2014-06-10 at 4560669)
+ + refs.c: optimize check_refname_component()
+ (this branch is used by dt/refs-check-refname-component-sse42.)
+
+ Originally merged to 'next' on 2014-06-06
+
+ Will merge to 'master'.
+
+
+* jm/dedup-test-config (2014-06-05) 1 commit
+ (merged to 'next' on 2014-06-10 at 8966f54)
+ + t/t7810-grep.sh: remove duplicate test_config()
+
+ Originally merged to 'next' on 2014-06-06
+
+ Will merge to 'master'.
+
+
* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
- (merged to 'next' on 2014-06-06 at a2d0105)
+ (merged to 'next' on 2014-06-10 at fc63847)
+ commit -m: commit staged submodules regardless of ignore config
+ status/commit: show staged submodules regardless of ignore config
+ Originally merged to 'next' on 2014-06-06
+
submodule.*.ignore and diff.ignoresubmodules are used to ignore all
submodule changes in "diff" output, but it can be confusing to
apply these configuration values to status and commit.
* bg/xcalloc-nmemb-then-size (2014-05-27) 12 commits
- (merged to 'next' on 2014-06-06 at 7058fe5)
+ (merged to 'next' on 2014-06-10 at eddb5bc)
+ transport-helper.c: rearrange xcalloc arguments
+ remote.c: rearrange xcalloc arguments
+ reflog-walk.c: rearrange xcalloc arguments
+ builtin/remote.c: rearrange xcalloc arguments
+ builtin/ls-remote.c: rearrange xcalloc arguments
+ Originally merged to 'next' on 2014-06-06
+
Like calloc(3), xcalloc() takes nmemb and then size.
Will merge to 'master'.
* jk/complete-merge-pull (2014-05-27) 2 commits
- (merged to 'next' on 2014-06-06 at f88b8e3)
+ (merged to 'next' on 2014-06-10 at d1524c5)
+ completion: add missing options for git-merge
+ completion: add a note that merge options are shared
+ Originally merged to 'next' on 2014-06-06
+
The completion code did not know about quite a few options that are
common between "git merge" and "git pull", and a couple of options
unique to "git merge".
* jl/remote-rm-prune (2014-05-27) 3 commits
- (merged to 'next' on 2014-06-06 at d3bde27)
+ (merged to 'next' on 2014-06-10 at 13259ff)
+ remote prune: optimize "dangling symref" check/warning
+ remote: repack packed-refs once when deleting multiple refs
+ remote rm: delete remote configuration as the last
+ Originally merged to 'next' on 2014-06-06
+
"git remote rm" and "git remote prune" can involve removing many
refs at once, which is not a very efficient thing to do when very
many refs exist in the packed-refs file.
* jm/instaweb-apache-24 (2014-05-27) 1 commit
- (merged to 'next' on 2014-06-06 at ab6e494)
+ (merged to 'next' on 2014-06-10 at ecf2048)
+ git-instaweb: add support for Apache 2.4
+ Originally merged to 'next' on 2014-06-06
+
Will merge to 'master'.
* jm/t9138-style-fix (2014-05-27) 1 commit
- (merged to 'next' on 2014-06-06 at 552098b)
+ (merged to 'next' on 2014-06-10 at 034f13d)
+ t9138-git-svn-authors-prog.sh fixups
+ Originally merged to 'next' on 2014-06-06
+
Will merge to 'master'.
* nd/daemonize-gc (2014-05-27) 1 commit
- (merged to 'next' on 2014-06-06 at 638c6ca)
+ (merged to 'next' on 2014-06-10 at 6fae7b0)
+ gc --auto: do not lock refs in the background
+ Originally merged to 'next' on 2014-06-06
+
"git gc --auto" was recently changed to run in the background to
give control back early to the end-user sitting in front of the
terminal, but it forgot that housekeeping involving reflogs should
* ow/config-mailmap-pathname (2014-05-27) 1 commit
- (merged to 'next' on 2014-06-06 at a686803)
+ (merged to 'next' on 2014-06-10 at aba4ca2)
+ config: respect '~' and '~user' in mailmap.file
+ Originally merged to 'next' on 2014-06-06
+
mailmap.file configuration names a pathname, hence should honor
~/path and ~user/path as its value.
Will merge to 'master'.
-* rh/prompt-tests (2014-06-05) 11 commits
- - t9904: new __git_ps1 tests for Zsh
- - test-lib: make it possible to override how test code is eval'd
- - lib-prompt-tests.sh: add variable for string that encodes percent in PS1
- - lib-prompt-tests.sh: put all tests inside a function
- - t9903: move prompt tests to a new lib-prompt-tests.sh file
- - t9903: move PS1 color code variable definitions to lib-bash.sh
- - t9903: include "Bash" in test names via new $shellname var
- - t9903: run pc mode tests again with PS1 expansion disabled
- - t9903: move test name prefix to a separate variable
- - t9903: put the Bash pc mode prompt test cases in a function
- - t9903: remove Zsh test from the suite of Bash prompt tests
-
- Maybe a reroll to limit the damage to test_eval_ is coming?
-
-
* jm/doc-wording-tweaks (2014-05-28) 1 commit
- (merged to 'next' on 2014-06-06 at 4dca23e)
+ (merged to 'next' on 2014-06-10 at 5f2e094)
+ Documentation: wording fixes in the user manual and glossary
- Will merge to 'master'.
-
-
-* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
- - gitweb: Harden UTF-8 handling in generated links
-
- $gmane/250758?
-
-
-* mn/sideband-no-ansi (2014-06-02) 1 commit
- (merged to 'next' on 2014-06-06 at f61fc73)
- + sideband.c: do not use ANSI control sequence on non-terminal
+ Originally merged to 'next' on 2014-06-06
Will merge to 'master'.
* jc/fetch-push-refmap (2014-06-05) 9 commits
- - fetch: allow explicit --refmap to override configuration
- - fetch doc: add a section on configured remote-tracking branches
- - fetch doc: remove "short-cut" section
- - fetch doc: update refspec format description
- - fetch doc: on pulling multiple refspecs
- - fetch doc: remove notes on outdated "mixed layout"
- - fetch doc: update note on '+' in front of the refspec
- - fetch doc: move FETCH_HEAD material lower and add an example
- - fetch doc: update introductory part for clarity
-
- Will merge to 'next'.
-
-
-* jc/shortlog-ref-exclude (2014-06-04) 1 commit
- (merged to 'next' on 2014-06-06 at a358cbe)
- + shortlog: allow --exclude=<glob> to be passed
+ (merged to 'next' on 2014-06-10 at 13c13ae)
+ + fetch: allow explicit --refmap to override configuration
+ + fetch doc: add a section on configured remote-tracking branches
+ + fetch doc: remove "short-cut" section
+ + fetch doc: update refspec format description
+ + fetch doc: on pulling multiple refspecs
+ + fetch doc: remove notes on outdated "mixed layout"
+ + fetch doc: update note on '+' in front of the refspec
+ + fetch doc: move FETCH_HEAD material lower and add an example
+ + fetch doc: update introductory part for clarity
Will merge to 'master'.
* lt/log-auto-decorate (2014-05-30) 1 commit
- (merged to 'next' on 2014-06-06 at d451fc1)
+ (merged to 'next' on 2014-06-10 at f149f4a)
+ git log: support "auto" decorations
- Will merge to 'master'.
-
-
-* lt/request-pull (2014-06-02) 1 commit
- (merged to 'next' on 2014-06-06 at ad4d79d)
- + fix brown paper bag breakage in t5150-request-pull.sh
-
- Will merge to 'master'.
-
-
-* na/no-http-test-in-the-middle (2014-05-30) 1 commit
- (merged to 'next' on 2014-06-06 at e195615)
- + t5538: move http push tests out to t5542
-
- Will merge to 'master'.
-
-
-* pb/trim-trailing-spaces (2014-06-02) 1 commit
- (merged to 'next' on 2014-06-06 at 741efc2)
- + dir.c:trim_trailing_spaces(): fix for " \ " sequence
-
- Fix an error in parsing of .gitignore files that use a trailing
- "\ " to mark pathnames that end with a SP.
-
- Will merge to 'master'.
-
-
-* rs/mailinfo-header-cmp (2014-06-02) 1 commit
- (merged to 'next' on 2014-06-06 at 5e856f4)
- + mailinfo: use strcmp() for string comparison
-
- Avoid running over the end of header string while parsing an
- incoming e-mail message to extract the patch.
+ Originally merged to 'next' on 2014-06-06
Will merge to 'master'.
* rs/pack-objects-no-unnecessary-realloc (2014-06-02) 1 commit
- (merged to 'next' on 2014-06-06 at a39f7ad)
+ (merged to 'next' on 2014-06-10 at abae695)
+ pack-objects: use free()+xcalloc() instead of xrealloc()+memset()
+ Originally merged to 'next' on 2014-06-06
+
Avoid unnecessary copy of previous contents when extending the
hashtable used in pack-objects.
Will merge to 'master'.
-* ss/userdiff-update-csharp-java (2014-06-02) 2 commits
- - userdiff: support Java try keyword
- - userdiff: support C# async methods and correct C# keywords
-
-
* jk/error-resolve-conflict-advice (2014-06-03) 2 commits
- (merged to 'next' on 2014-06-06 at f2e7bbf)
+ (merged to 'next' on 2014-06-10 at 713ebe0)
+ error_resolve_conflict: drop quotations around operation
+ error_resolve_conflict: rewrap advice message
+ Originally merged to 'next' on 2014-06-06
+
Will merge to 'master'.
* rs/read-ref-at (2014-06-03) 1 commit
- (merged to 'next' on 2014-06-06 at 30f9896)
+ (merged to 'next' on 2014-06-10 at f58f2fc)
+ refs.c: change read_ref_at to use the reflog iterators
+ Originally merged to 'next' on 2014-06-06
+
Will merge to 'master'.
* sh/enable-preloadindex (2014-06-03) 1 commit
- (merged to 'next' on 2014-06-06 at 0f0d7da)
+ (merged to 'next' on 2014-06-10 at 7cedf2d)
+ environment.c: enable core.preloadindex by default
+ Originally merged to 'next' on 2014-06-06
+
Will merge to 'master'.
* ta/string-list-init (2014-06-06) 1 commit
- (merged to 'next' on 2014-06-06 at f0f2abc)
+ (merged to 'next' on 2014-06-10 at bf209ff)
+ string-list: spell all values out that are given to a string_list initializer
+ Originally merged to 'next' on 2014-06-06
+
Will merge to 'master'.
* jk/daemon-tolower (2014-05-23) 1 commit
- (merged to 'next' on 2014-05-23 at 23c796d)
+ (merged to 'next' on 2014-06-10 at f3c549d)
+ daemon/config: factor out duplicate xstrdup_tolower
+ Originally merged to 'next' on 2014-05-23
+
Will merge to 'master'.
* jk/strbuf-tolower (2014-05-23) 1 commit
- (merged to 'next' on 2014-05-23 at b172137)
+ (merged to 'next' on 2014-06-10 at 01e6983)
+ strbuf: add strbuf_tolower function
+ Originally merged to 'next' on 2014-05-23
+
Will merge to 'master'.
* jk/http-errors (2014-05-27) 8 commits
- (merged to 'next' on 2014-06-06 at 1004dae)
+ (merged to 'next' on 2014-06-10 at 30e9212)
+ http: default text charset to iso-8859-1
+ remote-curl: reencode http error messages
+ strbuf: add strbuf_reencode helper
+ t/lib-httpd: use write_script to copy CGI scripts
+ test-lib: preserve GIT_CURL_VERBOSE from the environment
+ Originally merged to 'next' on 2014-06-06
+
Propagate the error messages from the webserver better to the
client coming over the HTTP transport.
* jm/format-patch-mail-sig (2014-05-27) 2 commits
- (merged to 'next' on 2014-06-06 at 0c8d703)
+ (merged to 'next' on 2014-06-10 at 310f59e)
+ format-patch: add "--signature-file=<file>" option
+ format-patch: make newline after signature conditional
+ Originally merged to 'next' on 2014-06-06
+
Will merge to 'master'.
* sk/wincred (2014-05-14) 2 commits
- (merged to 'next' on 2014-05-21 at a3b9ca3)
+ (merged to 'next' on 2014-06-10 at 8d03e5a)
+ wincred: avoid overwriting configured variables
+ wincred: add install target
+ Originally merged to 'next' on 2014-05-21
+
Will merge to 'master'.
* as/pretty-truncate (2014-05-21) 5 commits
- (merged to 'next' on 2014-05-23 at 94d4c51)
+ (merged to 'next' on 2014-06-10 at d8147a2)
+ pretty.c: format string with truncate respects logOutputEncoding
+ t4205, t6006: add tests that fail with i18n.logOutputEncoding set
+ t4205 (log-pretty-format): use `tformat` rather than `format`
+ t4041, t4205, t6006, t7102: don't hardcode tested encoding value
+ t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputs
+ Originally merged to 'next' on 2014-05-23
+
Will merge to 'master'.
-* cc/replace-graft (2014-06-05) 4 commits
+* cc/replace-graft (2014-06-09) 5 commits
+ - DONTMERGE: wise to wait for peff's commit->buffer length series
- contrib: add convert-grafts-to-replace-refs.sh
- Documentation: replace: add --graft option
- replace: add test for --graft
- replace: add --graft option
(this branch uses cc/replace-edit.)
+ "git replace" learned a "--graft" option to rewrite parents of a
+ commit.
+
* jk/argv-array-for-child-process (2014-05-15) 7 commits
- (merged to 'next' on 2014-05-21 at 5b2fa64)
+ (merged to 'next' on 2014-06-10 at 07a167b)
+ argv-array: drop "detach" code
+ get_importer: use run-command's internal argv_array
+ get_exporter: use argv_array
+ run_column_filter: use argv_array
+ run-command: store an optional argv_array
+ Originally merged to 'next' on 2014-05-21
+
Will merge to 'master'.
* jk/diff-files-assume-unchanged (2014-05-15) 1 commit
- (merged to 'next' on 2014-05-21 at 142d2c8)
+ (merged to 'next' on 2014-06-10 at 984862b)
+ run_diff_files: do not look at uninitialized stat data
+ Originally merged to 'next' on 2014-05-21
+
Will merge to 'master'.
* jk/report-fail-to-read-objects-better (2014-05-15) 1 commit
- (merged to 'next' on 2014-05-21 at 77c89fe)
+ (merged to 'next' on 2014-06-10 at 299ea28)
+ open_sha1_file: report "most interesting" errno
+ Originally merged to 'next' on 2014-05-21
+
Will merge to 'master'.
* rr/rebase-autostash-fix (2014-05-20) 2 commits
- (merged to 'next' on 2014-05-21 at ca4aa40)
+ (merged to 'next' on 2014-06-10 at afd0c29)
+ rebase -i: test "Nothing to do" case with autostash
+ rebase -i: handle "Nothing to do" case with autostash
+ Originally merged to 'next' on 2014-05-21
+
Will merge to 'master'.
-* sk/windows-unc-path (2014-05-20) 1 commit
- (merged to 'next' on 2014-05-21 at d1f1350)
- + Windows: Allow using UNC path for git repository
+* sk/windows-unc-path (2014-06-10) 1 commit
+ (merged to 'next' on 2014-06-10 at 3598cc6)
+ + Windows: allow using UNC path for git repository
+ (this branch is used by sk/mingw-main and sk/mingw-uni-console.)
+
+ Originally merged to 'next' on 2014-05-21
Will merge to 'master'.
* jk/diff-follow-must-take-one-pathspec (2014-05-20) 1 commit
- (merged to 'next' on 2014-05-23 at 4653133)
+ (merged to 'next' on 2014-06-10 at 0cd28d7)
+ move "--follow needs one pathspec" rule to diff_setup_done
- Will merge to 'master'.
-
+ Originally merged to 'next' on 2014-05-23
-* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits
- - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks
- - git-add--interactive: Preserve diff heading when splitting hunks
-
- Waiting for a reroll.
+ Will merge to 'master'.
* jk/do-not-run-httpd-tests-as-root (2014-05-12) 1 commit
- (merged to 'next' on 2014-05-21 at 676392b)
+ (merged to 'next' on 2014-06-10 at 745b05c)
+ t/lib-httpd: require SANITY prereq
+ Originally merged to 'next' on 2014-05-21
+
Will merge to 'master'.
* cb/byte-order (2014-05-30) 3 commits
- (merged to 'next' on 2014-05-30 at 857617e)
+ (merged to 'next' on 2014-06-10 at 63db8ee)
+ compat/bswap.h: fix endianness detection
- (merged to 'next' on 2014-05-07 at f55c040)
+ compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
+ compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
+ Originally merged to 'next' on 2014-05-30
+
Compatibility enhancement for Solaris.
Will merge to 'master'.
* cc/replace-edit (2014-05-19) 10 commits
- (merged to 'next' on 2014-05-19 at fcdd83f)
+ (merged to 'next' on 2014-06-10 at ff69722)
+ Documentation: replace: describe new --edit option
+ replace: add --edit to usage string
+ replace: add tests for --edit
+ replace: die early if replace ref already exists
+ replace: refactor checking ref validity
+ replace: make sure --edit results in a different object
- (merged to 'next' on 2014-05-12 at 71449bf)
+ replace: add --edit option
+ replace: factor object resolution out of replace_object
+ replace: use OPT_CMDMODE to handle modes
+ replace: refactor command-mode determination
(this branch is used by cc/replace-graft.)
+ Originally merged to 'next' on 2014-05-19
+
"git replace" learns a new "--edit" option.
Will merge to 'master'.
-* mt/send-email-cover-to-cc (2014-06-04) 3 commits
- (merged to 'next' on 2014-06-06 at 583f5fc)
+* mt/send-email-cover-to-cc (2014-06-10) 3 commits
+ (merged to 'next' on 2014-06-10 at 6bb1465)
+ t9001: avoid non-portable '\n' with sed
- (merged to 'next' on 2014-05-12 at b696006)
+ test/send-email: to-cover, cc-cover tests
+ git-send-email: two new options: to-cover, cc-cover
- Will merge to 'master'.
-
+ Originally merged to 'next' on 2014-06-10
-* nd/split-index (2014-06-02) 34 commits
- - fixup! read-cache: new API write_locked_index instead of write_index/write_cache
- - SQUASH???
- - t1700: new tests for split-index mode
- - t2104: make sure split index mode is off for the version test
- - read-cache: force split index mode with GIT_TEST_SPLIT_INDEX
- - read-tree: note about dropping split-index mode or index version
- - read-tree: force split-index mode off on --index-output
- - rev-parse: add --shared-index-path to get shared index path
- - update-index --split-index: do not split if $GIT_DIR is read only
- - update-index: new options to enable/disable split index mode
- - split-index: strip pathname of on-disk replaced entries
- - split-index: do not invalidate cache-tree at read time
- - split-index: the reading part
- - split-index: the writing part
- - read-cache: mark updated entries for split index
- - read-cache: save deleted entries in split index
- - read-cache: mark new entries for split index
- - read-cache: split-index mode
- - read-cache: save index SHA-1 after reading
- - entry.c: update cache_changed if refresh_cache is set in checkout_entry()
- - cache-tree: mark istate->cache_changed on prime_cache_tree()
- - cache-tree: mark istate->cache_changed on cache tree update
- - cache-tree: mark istate->cache_changed on cache tree invalidation
- - unpack-trees: be specific what part of the index has changed
- - resolve-undo: be specific what part of the index has changed
- - update-index: be specific what part of the index has changed
- - read-cache: be specific what part of the index has changed
- - read-cache: be strict about "changed" in remove_marked_cache_entries()
- - read-cache: store in-memory flags in the first 12 bits of ce_flags
- - read-cache: relocate and unexport commit_locked_index()
- - read-cache: new API write_locked_index instead of write_index/write_cache
- - sequencer: do not update/refresh index if the lock cannot be held
- - ewah: delete unused ewah_read_mmap_native declaration
- - ewah: fix constness of ewah_read_mmap
-
- The tip two remind us the need for a minor reroll. If I find time
- I could try to squash them myself, but it is low priority for me.
+ Will merge to 'master'.
* ib/test-selectively-run (2014-06-06) 4 commits
- (merged to 'next' on 2014-06-06 at d894205)
+ (merged to 'next' on 2014-06-10 at 1235570)
+ t0000-*.sh: fix the GIT_SKIP_TESTS sub-tests
+ test-lib: '--run' to run only specific tests
+ test-lib: tests skipped by GIT_SKIP_TESTS say so
+ test-lib: document short options in t/README
+ Originally merged to 'next' on 2014-06-06
+
Allow specifying only certain individual test pieces to be run
using a range notation (e.g. "t1234-test.sh --run='1-4 6 8 9-'").
* fc/remote-helper-refmap (2014-04-21) 8 commits
- (merged to 'next' on 2014-04-22 at fb5a4c2)
+ (merged to 'next' on 2014-06-10 at 8cd8cf8)
+ transport-helper: remove unnecessary strbuf resets
+ transport-helper: add support to delete branches
+ fast-export: add support to delete refs
+ fast-export: add new --refspec option
+ fast-export: improve argument parsing
+ Originally merged to 'next' on 2014-04-22
+
Allow remote-helper/fast-import based transport to rename the refs
while transferring the history.
-* jh/submodule-tests (2014-04-17) 1 commit
- - t7410: 210 tests for various 'git submodule update' scenarios
-
- What's the status of this one?
-
-
-* mt/patch-id-stable (2014-05-06) 6 commits
- (merged to 'next' on 2014-05-07 at 6ade68e)
- + test doc: test_write_lines does not split its arguments
- (merged to 'next' on 2014-05-02 at cfa251b)
- + t4204-patch-id.sh: default is now stable
- + patch-id: change default to stable
- (merged to 'next' on 2014-05-02 at b69326a)
+* mt/patch-id-stable (2014-06-10) 5 commits
+ - patch-id: change default to stable
+ (merged to 'next' on 2014-06-10 at b75e70f)
+ patch-id-test: test stable and unstable behaviour
- + test: add test_write_lines helper
+ patch-id: make it stable against hunk reordering
+ + test doc: test_write_lines does not split its arguments
+ + test: add test_write_lines helper
+
+ Originally merged to 'next' on 2014-05-07
Introduce a new way to compute patch-id for a patch that is not
affected by the order of the paths that appear in the input.
- Will merge to 'master'.
-
-
-* cc/interpret-trailers (2014-05-28) 11 commits
- - Documentation: add documentation for 'git interpret-trailers'
- - trailer: add tests for commands in config file
- - trailer: execute command from 'trailer.<name>.command'
- - trailer: add tests for "git interpret-trailers"
- - trailer: add interpret-trailers command
- - trailer: put all the processing together and print
- - trailer: parse trailers from file or stdin
- - trailer: process command line trailer arguments
- - trailer: read and process config information
- - trailer: process trailers from input message and arguments
- - trailer: add data structures and basic functions
-
- A new filter to programatically edit the tail end of the commit log
- messages.
+ Will merge to 'master' except for the last one.
projects / thirdparty / git.git / commitdiff
