mirror of
https://github.com/git/git.git
synced 2026-01-21 14:27:19 +09:00
What's cooking (2013/06 #06)
This commit is contained in:
Junio C Hamano
parent
27ef8a5faa
commit
b2e2b5cea3
@ -1,10 +1,10 @@
|
||||
To: git@vger.kernel.org
|
||||
Bcc: lwn@lwn.net
|
||||
Subject: What's cooking in git.git (Jun 2013, #05; Sat, 15)
|
||||
X-master-at: 0dbd81251dbc516bb3bf07862c369fc582a4e5e0
|
||||
X-next-at: 22819c950c7ed8ce0f8755d6134a6eae6064f6d0
|
||||
Subject: What's cooking in git.git (Jun 2013, #06; Tue, 18)
|
||||
X-master-at: fb7dfaa710da6f9ebb854f70ffc1c78668a1e70c
|
||||
X-next-at: 12cfec846bdac68981fbf455e2a638ddf5a6ef9c
|
||||
|
||||
What's cooking in git.git (Jun 2013, #05; Sat, 15)
|
||||
What's cooking in git.git (Jun 2013, #06; Tue, 18)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking. Commits prefixed with
|
||||
@ -16,256 +16,170 @@ of the repositories listed at
|
||||
|
||||
http://git-blame.blogspot.com/p/git-public-repositories.html
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to "master"]
|
||||
|
||||
* bp/mediawiki-credential (2013-06-05) 1 commit
|
||||
(merged to 'next' on 2013-06-05 at ea07ec1)
|
||||
+ git-remote-mediawiki: use Git.pm functions for credentials
|
||||
|
||||
The bridge to MediaWiki has been updated to use the credential
|
||||
helper interface in Git.pm, losing its own and the original
|
||||
implementation the former was based on.
|
||||
|
||||
|
||||
* kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits
|
||||
(merged to 'next' on 2013-06-05 at 193242b)
|
||||
+ revision.c: make default history consider bottom commits
|
||||
+ revision.c: don't show all merges for --parents
|
||||
+ revision.c: discount side branches when computing TREESAME
|
||||
+ revision.c: add BOTTOM flag for commits
|
||||
+ simplify-merges: drop merge from irrelevant side branch
|
||||
+ simplify-merges: never remove all TREESAME parents
|
||||
+ t6012: update test for tweaked full-history traversal
|
||||
+ revision.c: Make --full-history consider more merges
|
||||
+ Documentation: avoid "uninteresting"
|
||||
+ rev-list-options.txt: correct TREESAME for P
|
||||
+ t6111: add parents to tests
|
||||
+ t6111: allow checking the parents as well
|
||||
+ t6111: new TREESAME test set
|
||||
+ t6019: test file dropped in -s ours merge
|
||||
+ decorate.c: compact table when growing
|
||||
|
||||
Major update to a very core part of the revision traversal logic to
|
||||
improve culling of irrelevant parents while traversing a mergy
|
||||
history.
|
||||
|
||||
|
||||
* mh/reflife (2013-06-02) 25 commits
|
||||
(merged to 'next' on 2013-06-05 at 291d863)
|
||||
+ refs: document the lifetime of the args passed to each_ref_fn
|
||||
+ register_ref(): make a copy of the bad reference SHA-1
|
||||
+ exclude_existing(): set existing_refs.strdup_strings
|
||||
+ string_list_add_refs_by_glob(): add a comment about memory management
|
||||
+ string_list_add_one_ref(): rename first parameter to "refname"
|
||||
+ show_head_ref(): rename first parameter to "refname"
|
||||
+ show_head_ref(): do not shadow name of argument
|
||||
+ add_existing(): do not retain a reference to sha1
|
||||
+ do_fetch(): clean up existing_refs before exiting
|
||||
+ do_fetch(): reduce scope of peer_item
|
||||
+ object_array_entry: fix memory handling of the name field
|
||||
+ find_first_merges(): remove unnecessary code
|
||||
+ find_first_merges(): initialize merges variable using initializer
|
||||
+ fsck: don't put a void*-shaped peg in a char*-shaped hole
|
||||
+ object_array_remove_duplicates(): rewrite to reduce copying
|
||||
+ revision: use object_array_filter() in implementation of gc_boundary()
|
||||
+ object_array: add function object_array_filter()
|
||||
+ revision: split some overly-long lines
|
||||
+ cmd_diff(): make it obvious which cases are exclusive of each other
|
||||
+ cmd_diff(): rename local variable "list" -> "entry"
|
||||
+ cmd_diff(): use an object_array for holding trees
|
||||
+ builtin_diff_tree(): make it obvious that function wants two entries
|
||||
+ add_rev_cmdline(): make a copy of the name argument
|
||||
+ fetch: make own copies of refnames
|
||||
+ describe: make own copy of refname
|
||||
(this branch is used by mh/ref-races.)
|
||||
|
||||
Define memory ownership and lifetime rules for what for-each-ref
|
||||
feeds to its callbacks (in short, "you do not own it, so make a
|
||||
copy if you want to keep it").
|
||||
|
||||
|
||||
* mt/send-email-cc-match-fix (2013-06-05) 7 commits
|
||||
(merged to 'next' on 2013-06-06 at e4d0831)
|
||||
+ test-send-email: test for pre-sanitized self name
|
||||
+ t/send-email: test suppress-cc=self with non-ascii
|
||||
+ t/send-email: add test with quoted sender
|
||||
+ send-email: make --suppress-cc=self sanitize input
|
||||
+ t/send-email: test suppress-cc=self on cccmd
|
||||
+ send-email: fix suppress-cc=self on cccmd
|
||||
+ t/send-email.sh: add test for suppress-cc=self
|
||||
|
||||
Logic git-send-email used to suppress cc mishandled names like "A
|
||||
U. Thor" <author@example.xz>, where the human readable part needs
|
||||
to be quoted (the user input may not have the double quotes around
|
||||
the name, and comparison was done between quoted and unquoted
|
||||
strings).
|
||||
|
||||
|
||||
* rr/complete-difftool-fixup (2013-06-09) 2 commits
|
||||
(merged to 'next' on 2013-06-11 at fe91170)
|
||||
+ completion: show can take both revlist and paths
|
||||
+ completion: difftool takes both revs and files
|
||||
(this branch is tangled with rr/complete-difftool.)
|
||||
|
||||
"git difftool" can take both revs to be compared and pathspecs.
|
||||
"git show" takes revs, revs:path and pathspecs.
|
||||
|
||||
|
||||
* rr/remove-contrib-some (2013-06-12) 2 commits
|
||||
(merged to 'next' on 2013-06-12 at 797644c)
|
||||
+ contrib: drop blameview/ directory
|
||||
(merged to 'next' on 2013-06-05 at fc15705)
|
||||
+ contrib: remove continuous/ and patches/
|
||||
|
||||
Remove stale contrib/ material.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* rr/prompt-rebase-breakage-fix (2013-06-14) 1 commit
|
||||
- prompt: squelch error output from cat
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jh/libify-note-handling (2013-06-12) 3 commits
|
||||
- Move create_notes_commit() from notes-merge.c into notes-utils.c
|
||||
- Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
|
||||
- finish_copy_notes_for_rewrite(): Let caller provide commit message
|
||||
|
||||
|
||||
* jk/add-i-custom-diff-algo (2013-06-12) 1 commit
|
||||
- add--interactive: respect diff.algorithm
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* mh/ref-races (2013-06-11) 13 commits
|
||||
- refs: do not invalidate the packed-refs cache unnecessarily
|
||||
- for_each_ref: load all loose refs before packed refs
|
||||
- get_packed_ref_cache: reload packed-refs file when it changes
|
||||
- add a stat_validity struct
|
||||
- Extract a struct stat_data from cache_entry
|
||||
- packed_ref_cache: increment refcount when locked
|
||||
- do_for_each_entry(): increment the packed refs cache refcount
|
||||
- refs: manage lifetime of packed refs cache via reference counting
|
||||
- refs: implement simple transactions for the packed-refs file
|
||||
- refs: wrap the packed refs cache in a level of indirection
|
||||
- pack_refs(): split creation of packed refs and entry writing
|
||||
- repack_without_ref(): split list curation and entry writing
|
||||
- Merge branch 'mh/packed-refs-various' into mh/ref-races
|
||||
|
||||
|
||||
* mm/rm-coalesce-errors (2013-06-12) 2 commits
|
||||
- rm: introduce advice.rmHints to shorten messages
|
||||
- rm: better error message on failure for multiple files
|
||||
|
||||
|
||||
* rr/am-quit-empty-then-abort-fix (2013-06-14) 2 commits
|
||||
* rr/rebase-checkout-reflog (2013-06-17) 8 commits
|
||||
- SQUASH???
|
||||
- am: handle stray $dotest directory
|
||||
- rebase -i: use a better reflog message
|
||||
- rebase: use a better reflog message
|
||||
- checkout: respect GIT_REFLOG_ACTION
|
||||
- status: do not depend on rebase reflog messages
|
||||
- t/t2021-checkout-last: "checkout -" should work after a rebase finishes
|
||||
- wt-status: remove unused field in grab_1st_switch_cbdata
|
||||
- t7512: test "detached from" as well
|
||||
|
||||
Invocations of "git checkout" used internally by "git rebase" were
|
||||
counted as "checkout", and affected later "git checkout -" to the
|
||||
the user to an unexpected place.
|
||||
|
||||
Waiting for a reroll.
|
||||
$gmane/228271.
|
||||
|
||||
|
||||
* rs/logical-vs-binary-or (2013-06-13) 1 commit
|
||||
(merged to 'next' on 2013-06-14 at 2821441)
|
||||
+ use logical OR (||) instead of binary OR (|) in logical context
|
||||
* rr/rebase-stash-store (2013-06-17) 5 commits
|
||||
- rebase: use 'git stash store' to simplify logic
|
||||
- stash: introduce 'git stash store'
|
||||
- stash: simplify option parser for create
|
||||
- stash doc: document short form -p in synopsis
|
||||
- stash doc: add a warning about using create
|
||||
|
||||
Code cleanup.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* rs/match-trees-refactor (2013-06-13) 1 commit
|
||||
(merged to 'next' on 2013-06-14 at 1904928)
|
||||
+ match-trees: factor out fill_tree_desc_strict
|
||||
|
||||
Code cleanup.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* fg/submodule-non-ascii-path (2013-06-14) 1 commit
|
||||
- handle multibyte characters in name
|
||||
|
||||
Many "git submodule" operations do not work on a submodule at a
|
||||
path whose name is not in ASCII.
|
||||
Finishing touches for the "git rebase --autostash" feature
|
||||
introduced earlier.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* rr/rebase-autostash (2013-06-13) 3 commits
|
||||
- rebase: finish_rebase() in noop rebase
|
||||
- rebase: finish_rebase() in fast-forward rebase
|
||||
- rebase: guard against missing files in read_basic_state()
|
||||
* rs/unpack-trees-tree-walk-conflict-field (2013-06-17) 1 commit
|
||||
- unpack-trees: don't shift conflicts left and right
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* bp/remote-mw-tests (2013-06-14) 1 commit
|
||||
- git-remote-mediawiki: remove hardcoded version number in the test suite
|
||||
* dk/maint-t5150-dirname (2013-06-17) 1 commit
|
||||
- tests: allow sha1's as part of the path
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* cm/remote-mediawiki-perlcritique (2013-06-14) 31 commits
|
||||
- git-remote-mediawiki: make error message more precise
|
||||
- git-remote-mediawiki: add a perlcritic rule in Makefile
|
||||
- git-remote-mediawiki: add a .perlcriticrc file
|
||||
- git-remote-mediawiki: clearly rewrite double dereference
|
||||
- git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki")
|
||||
- git-remote-mediawiki: put non-trivial numeric values in constants.
|
||||
- git-remote-mediawiki: don't use quotes for empty strings
|
||||
- git-remote-mediawiki: replace "unless" statements with negated "if" statements
|
||||
- git-remote-mediawiki: brace file handles for print for more clarity
|
||||
- git-remote-mediawiki: modify strings for a better coding-style
|
||||
- git-remote-mediawiki: put long code into a subroutine
|
||||
- git-remote-mediawiki: remove import of unused open2
|
||||
- git-remote-mediawiki: check return value of open
|
||||
- git-remote-mediawiki: assign a variable as undef and make proper indentation
|
||||
- git-remote-mediawiki: rename a variable ($last) which has the name of a keyword
|
||||
- git-remote-mediawiki: remove unused variable $entry
|
||||
- git-remote-mediawiki: turn double-negated expressions into simple expressions
|
||||
- git-remote-mediawiki: change the name of a variable
|
||||
- git-remote-mediawiki: add newline in the end of die() error messages
|
||||
- git-remote-mediawiki: change style in a regexp
|
||||
- git-remote-mediawiki: change style in a regexp
|
||||
- git-remote-mediawiki: change separator of some regexps
|
||||
- git-remote-mediawiki: change the behaviour of a split
|
||||
- git-remote-mediawiki: remove useless regexp modifier (m)
|
||||
- git-remote-mediawiki: rewrite unclear line of instructions
|
||||
- git-remote-mediawiki: change syntax of map calls
|
||||
- git-remote-mediawiki: move a variable declaration at the top of the code
|
||||
- git-remote-mediawiki: always end a subroutine with a return
|
||||
- git-remote-mediawiki: replace :utf8 by :encoding(UTF-8)
|
||||
- git-remote-mediawiki: move "use warnings;" before any instruction
|
||||
- git-remote-mediawiki: make a regexp clearer
|
||||
* dk/version-gen-gitdir (2013-06-17) 1 commit
|
||||
- GIT-VERSION-GEN: support non-standard $GIT_DIR path
|
||||
|
||||
A comment and a counterproposal sent, which is queued here.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jk/apache-test-for-2.4 (2013-06-14) 4 commits
|
||||
- t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
|
||||
- t/lib-httpd/apache.conf: load compat access module in apache 2.4
|
||||
- t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
|
||||
- t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
|
||||
* fg/submodule-fixup (2013-06-17) 1 commit
|
||||
- git-submodule.sh: remove duplicate call to set_rev_name
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* rr/rebase-sha1-by-string-query (2013-06-14) 3 commits
|
||||
- rebase: use peel_committish() where appropriate
|
||||
- sh-setup: add new peel_committish() helper
|
||||
- t/rebase: add failing tests for a peculiar revision
|
||||
* jk/doc-build-move-infordir-def (2013-06-17) 2 commits
|
||||
- Documentation/Makefile: move infodir to be with other '*dir's
|
||||
- Documentation/Makefile: fix spaces around assignments
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jk/unpack-entry-fallback-to-another (2013-06-14) 2 commits
|
||||
- unpack_entry: do not die when we fail to apply a delta
|
||||
- t5303: drop "count=1" from corruption dd
|
||||
* jk/mergetool-lib-refactor (2013-06-17) 1 commit
|
||||
- mergetool--lib: refactor {diff,merge}_cmd logic
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* mm/push-force-is-dangerous (2013-06-18) 1 commit
|
||||
- Documentation/git-push.txt: explain better cases where --force is dangerous
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* nk/config-local-doc (2013-06-17) 1 commit
|
||||
- config: Add description of --local option
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits
|
||||
- ### DONTMERGE: needs better explanation on what config they need
|
||||
- pack-refs.c: Add missing call to git_config()
|
||||
- show-ref.c: Add missing call to git_config()
|
||||
|
||||
The changes themselves are probably good, but it is unclear what
|
||||
basic setting needs to be read for which exact operation.
|
||||
|
||||
Waiting for clarification.
|
||||
$gmane/228294
|
||||
|
||||
|
||||
* rt/cherry-pick-continue-advice-in-status (2013-06-17) 1 commit
|
||||
- wt-status: give better advice when cherry-pick is in progress
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* bc/checkout-tracking-name-plug-leak (2013-06-18) 2 commits
|
||||
- t/t9802: explicitly name the upstream branch to use as a base
|
||||
- builtin/checkout.c: don't leak memory in check_tracking_name
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* kb/diff-blob-blob-doc (2013-06-18) 1 commit
|
||||
- Documentation: Move "git diff <blob> <blob>"
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* mm/merge-in-dirty-worktree-doc (2013-06-18) 1 commit
|
||||
- Documentation/git-merge.txt: weaken warning about uncommited changes
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* mt/send-email-cc-match-fix (2013-06-18) 2 commits
|
||||
- send-email: add test for duplicate utf8 name
|
||||
- send-email: sanitize author when writing From line
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* nk/name-rev-abbreviated-refs (2013-06-18) 1 commit
|
||||
- name-rev: allow to specify a subpath for --refs option
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* ph/builtin-srcs-are-in-subdir-these-days (2013-06-18) 1 commit
|
||||
- fix "builtin-*" references to be "builtin/*"
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* fc/contrib-related (2013-06-09) 5 commits
|
||||
- contrib: related: print the amount of involvement
|
||||
- contrib: related: parse committish like format-patch
|
||||
- contrib: related: add option to parse from committish
|
||||
- contrib: related: add support for multiple patches
|
||||
- Add new git-related helper to contrib
|
||||
|
||||
Will discard.
|
||||
|
||||
|
||||
* hv/config-from-blob (2013-05-12) 5 commits
|
||||
- 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
|
||||
|
||||
Waiting for a reroll.
|
||||
$gmane/223964
|
||||
|
||||
|
||||
* rr/triangle-push-fix (2013-06-09) 4 commits
|
||||
- t/push-default: test pushdefault with all modes
|
||||
- t/push-default: generalize test_push_{success, commit}
|
||||
@ -276,6 +190,7 @@ of the repositories listed at
|
||||
triangular workflow where it does not quite apply.
|
||||
|
||||
Waiting for a reroll.
|
||||
$gmane/227313
|
||||
|
||||
|
||||
* jh/shorten-refname (2013-05-07) 4 commits
|
||||
@ -291,17 +206,7 @@ of the repositories listed at
|
||||
"origin/something" and it already does).
|
||||
|
||||
Expecting a reroll, as an early part of a larger series.
|
||||
|
||||
|
||||
* jk/submodule-subdirectory-ok (2013-04-24) 3 commits
|
||||
- submodule: fix quoting in relative_path()
|
||||
- submodule: drop the top-level requirement
|
||||
- rev-parse: add --prefix option
|
||||
|
||||
Allow various subcommands of "git submodule" to be run not from the
|
||||
top of the working tree of the superproject.
|
||||
|
||||
Waiting for a reroll.
|
||||
$gmane/225137
|
||||
|
||||
|
||||
* jl/submodule-mv (2013-04-23) 5 commits
|
||||
@ -316,6 +221,7 @@ of the repositories listed at
|
||||
the .gitmodules file.
|
||||
|
||||
Waiting for a reroll.
|
||||
$gmane/226294
|
||||
|
||||
|
||||
* jk/list-objects-sans-blobs (2013-06-06) 4 commits
|
||||
@ -330,15 +236,6 @@ of the repositories listed at
|
||||
Seems to break some tests in a trivial and obvious way.
|
||||
|
||||
|
||||
* jk/packed-refs-race (2013-05-06) 4 commits
|
||||
. for_each_ref: load all loose refs before packed refs
|
||||
. get_packed_refs: reload packed-refs file when it changes
|
||||
. add a stat_validity struct
|
||||
. resolve_ref: close race condition for packed refs
|
||||
|
||||
Will be rerolled.
|
||||
|
||||
|
||||
* mg/more-textconv (2013-05-10) 7 commits
|
||||
- grep: honor --textconv for the case rev:path
|
||||
- grep: allow to use textconv filters
|
||||
@ -352,7 +249,7 @@ of the repositories listed at
|
||||
dealing with blob objects.
|
||||
|
||||
I thought this was pretty well designed and executed, but it seems
|
||||
there are some doubts on the list; kicking back to 'pu'.
|
||||
there are some doubts on the list; kicked back to 'pu'.
|
||||
|
||||
|
||||
* mh/multimail (2013-04-21) 1 commit
|
||||
@ -403,6 +300,181 @@ of the repositories listed at
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* jk/submodule-subdirectory-ok (2013-06-17) 6 commits
|
||||
- submodule: drop the top-level requirement
|
||||
- rev-parse: add --prefix option
|
||||
- submodule: show full path in error message
|
||||
- t7403: add missing && chaining
|
||||
- t7403: modernize style
|
||||
- t7401: make indentation consistent
|
||||
|
||||
Allow various subcommands of "git submodule" to be run not from the
|
||||
top of the working tree of the superproject.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* rr/prompt-rebase-breakage-fix (2013-06-14) 1 commit
|
||||
(merged to 'next' on 2013-06-17 at 02957d8)
|
||||
+ prompt: squelch error output from cat
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jh/libify-note-handling (2013-06-12) 3 commits
|
||||
- Move create_notes_commit() from notes-merge.c into notes-utils.c
|
||||
- Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
|
||||
- finish_copy_notes_for_rewrite(): Let caller provide commit message
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jk/add-i-custom-diff-algo (2013-06-12) 1 commit
|
||||
(merged to 'next' on 2013-06-17 at 48d5d4e)
|
||||
+ add--interactive: respect diff.algorithm
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mh/ref-races (2013-06-11) 13 commits
|
||||
- refs: do not invalidate the packed-refs cache unnecessarily
|
||||
- for_each_ref: load all loose refs before packed refs
|
||||
- get_packed_ref_cache: reload packed-refs file when it changes
|
||||
- add a stat_validity struct
|
||||
- Extract a struct stat_data from cache_entry
|
||||
- packed_ref_cache: increment refcount when locked
|
||||
- do_for_each_entry(): increment the packed refs cache refcount
|
||||
- refs: manage lifetime of packed refs cache via reference counting
|
||||
- refs: implement simple transactions for the packed-refs file
|
||||
- refs: wrap the packed refs cache in a level of indirection
|
||||
- pack_refs(): split creation of packed refs and entry writing
|
||||
- repack_without_ref(): split list curation and entry writing
|
||||
- Merge branch 'mh/packed-refs-various' into mh/ref-races
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* mm/rm-coalesce-errors (2013-06-12) 2 commits
|
||||
- rm: introduce advice.rmHints to shorten messages
|
||||
- rm: better error message on failure for multiple files
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* rr/am-quit-empty-then-abort-fix (2013-06-17) 2 commits
|
||||
- t/am: use test_path_is_missing() where appropriate
|
||||
- am: handle stray $dotest directory
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* rs/logical-vs-binary-or (2013-06-13) 1 commit
|
||||
(merged to 'next' on 2013-06-14 at 2821441)
|
||||
+ use logical OR (||) instead of binary OR (|) in logical context
|
||||
|
||||
Code cleanup.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* rs/match-trees-refactor (2013-06-13) 1 commit
|
||||
(merged to 'next' on 2013-06-14 at 1904928)
|
||||
+ match-trees: factor out fill_tree_desc_strict
|
||||
|
||||
Code cleanup.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* fg/submodule-non-ascii-path (2013-06-14) 1 commit
|
||||
(merged to 'next' on 2013-06-17 at a0b9fa3)
|
||||
+ handle multibyte characters in name
|
||||
|
||||
Many "git submodule" operations do not work on a submodule at a
|
||||
path whose name is not in ASCII.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* rr/rebase-autostash (2013-06-13) 3 commits
|
||||
(merged to 'next' on 2013-06-17 at e692317)
|
||||
+ rebase: finish_rebase() in noop rebase
|
||||
+ rebase: finish_rebase() in fast-forward rebase
|
||||
+ rebase: guard against missing files in read_basic_state()
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* bp/remote-mw-tests (2013-06-14) 1 commit
|
||||
(merged to 'next' on 2013-06-17 at 2891373)
|
||||
+ git-remote-mediawiki: remove hardcoded version number in the test suite
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* cm/remote-mediawiki-perlcritique (2013-06-14) 31 commits
|
||||
(merged to 'next' on 2013-06-17 at a41a924)
|
||||
+ git-remote-mediawiki: make error message more precise
|
||||
+ git-remote-mediawiki: add a perlcritic rule in Makefile
|
||||
+ git-remote-mediawiki: add a .perlcriticrc file
|
||||
+ git-remote-mediawiki: clearly rewrite double dereference
|
||||
+ git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki")
|
||||
+ git-remote-mediawiki: put non-trivial numeric values in constants.
|
||||
+ git-remote-mediawiki: don't use quotes for empty strings
|
||||
+ git-remote-mediawiki: replace "unless" statements with negated "if" statements
|
||||
+ git-remote-mediawiki: brace file handles for print for more clarity
|
||||
+ git-remote-mediawiki: modify strings for a better coding-style
|
||||
+ git-remote-mediawiki: put long code into a subroutine
|
||||
+ git-remote-mediawiki: remove import of unused open2
|
||||
+ git-remote-mediawiki: check return value of open
|
||||
+ git-remote-mediawiki: assign a variable as undef and make proper indentation
|
||||
+ git-remote-mediawiki: rename a variable ($last) which has the name of a keyword
|
||||
+ git-remote-mediawiki: remove unused variable $entry
|
||||
+ git-remote-mediawiki: turn double-negated expressions into simple expressions
|
||||
+ git-remote-mediawiki: change the name of a variable
|
||||
+ git-remote-mediawiki: add newline in the end of die() error messages
|
||||
+ git-remote-mediawiki: change style in a regexp
|
||||
+ git-remote-mediawiki: change style in a regexp
|
||||
+ git-remote-mediawiki: change separator of some regexps
|
||||
+ git-remote-mediawiki: change the behaviour of a split
|
||||
+ git-remote-mediawiki: remove useless regexp modifier (m)
|
||||
+ git-remote-mediawiki: rewrite unclear line of instructions
|
||||
+ git-remote-mediawiki: change syntax of map calls
|
||||
+ git-remote-mediawiki: move a variable declaration at the top of the code
|
||||
+ git-remote-mediawiki: always end a subroutine with a return
|
||||
+ git-remote-mediawiki: replace :utf8 by :encoding(UTF-8)
|
||||
+ git-remote-mediawiki: move "use warnings;" before any instruction
|
||||
+ git-remote-mediawiki: make a regexp clearer
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jk/apache-test-for-2.4 (2013-06-14) 4 commits
|
||||
(merged to 'next' on 2013-06-17 at 290e72e)
|
||||
+ t/lib-httpd/apache.conf: configure an MPM module for apache 2.4
|
||||
+ t/lib-httpd/apache.conf: load compat access module in apache 2.4
|
||||
+ t/lib-httpd/apache.conf: load extra auth modules in apache 2.4
|
||||
+ t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* rr/rebase-sha1-by-string-query (2013-06-14) 3 commits
|
||||
- rebase: use peel_committish() where appropriate
|
||||
- sh-setup: add new peel_committish() helper
|
||||
- t/rebase: add failing tests for a peculiar revision
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jk/unpack-entry-fallback-to-another (2013-06-14) 2 commits
|
||||
(merged to 'next' on 2013-06-17 at 89e0eab)
|
||||
+ unpack_entry: do not die when we fail to apply a delta
|
||||
+ t5303: drop "count=1" from corruption dd
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jc/topo-author-date-sort (2013-06-11) 4 commits
|
||||
(merged to 'next' on 2013-06-15 at ad4fb48)
|
||||
+ log: --author-date-order
|
||||
@ -415,6 +487,8 @@ of the repositories listed at
|
||||
output is topologically sorted and commits in parallel histories
|
||||
are shown intermixed together based on the author timestamp.
|
||||
|
||||
Needs a test or two.
|
||||
|
||||
|
||||
* fc/makefile (2013-06-09) 4 commits
|
||||
(merged to 'next' on 2013-06-14 at 75b5f6b)
|
||||
@ -472,6 +546,8 @@ of the repositories listed at
|
||||
- resolve_ref_unsafe(): handle the case of an SHA-1 within loop
|
||||
- resolve_ref_unsafe(): extract function handle_missing_loose_ref()
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* jk/commit-info-slab (2013-06-07) 3 commits
|
||||
(merged to 'next' on 2013-06-15 at 908ab93)
|
||||
@ -486,18 +562,11 @@ of the repositories listed at
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* fc/sequencer-skip-quiet (2013-06-06) 5 commits
|
||||
- sequencer: run post-rewrite hook
|
||||
- cherry-pick: store rewritten commits
|
||||
- cherry-pick: add --skip-empty option
|
||||
* fc/sequencer-plug-leak (2013-06-06) 2 commits
|
||||
- sequencer: avoid leaking message buffer when refusing to create an empty commit
|
||||
- sequencer: remove useless indentation
|
||||
|
||||
The bottom three looked more or less reasonable. Execution of
|
||||
post-rewrite hook could use a better refactoring from the original
|
||||
code copied from builtin/commit.c, though.
|
||||
|
||||
Will discard the top 3, merge the rest to 'next'.
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* js/test-ln-s-add (2013-06-07) 10 commits
|
||||
@ -520,7 +589,9 @@ of the repositories listed at
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mz/rebase-tests (2013-06-07) 7 commits
|
||||
* mz/rebase-tests (2013-06-18) 8 commits
|
||||
(merged to 'next' on 2013-06-18 at 12cfec8)
|
||||
+ rebase topology tests: fix commit names on case-insensitive file systems
|
||||
(merged to 'next' on 2013-06-14 at 73f3318)
|
||||
+ tests: move test for rebase messages from t3400 to t3406
|
||||
+ t3406: modernize style
|
||||
@ -540,13 +611,18 @@ of the repositories listed at
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ap/diff-ignore-blank-lines (2013-06-10) 1 commit
|
||||
* ap/diff-ignore-blank-lines (2013-06-17) 1 commit
|
||||
- diff: add --ignore-blank-lines option
|
||||
|
||||
"git diff" learned a mode that ignores hunks whose change consists
|
||||
only of additions and removals of blank lines, which is the same as
|
||||
"diff -B" (ignore blank lines) of GNU diff.
|
||||
|
||||
There still is a small bug.
|
||||
|
||||
Waiting for a reroll.
|
||||
$gmane/228117
|
||||
|
||||
|
||||
* jx/clean-interactive (2013-06-03) 15 commits
|
||||
- test: add t7301 for git-clean--interactive
|
||||
@ -565,43 +641,26 @@ of the repositories listed at
|
||||
- path.c: refactor relative_path(), not only strip prefix
|
||||
- test: add test cases for relative_path
|
||||
|
||||
Waiting for a reroll.
|
||||
$gmane/227710
|
||||
|
||||
* tr/test-v-and-v-subtest-only (2013-05-16) 6 commits
|
||||
|
||||
* tr/test-v-and-v-subtest-only (2013-06-18) 8 commits
|
||||
- test-lib: support running tests under valgrind in parallel
|
||||
- test-lib: allow prefixing a custom string before "ok N" etc.
|
||||
- test-lib: valgrind for only tests matching a pattern
|
||||
- test-lib: verbose mode for only tests matching a pattern
|
||||
- test-lib: self-test that --verbose works
|
||||
- test-lib: rearrange start/end of test_expect_* and test_skip
|
||||
- test-lib: refactor $GIT_SKIP_TESTS matching
|
||||
- test-lib: enable MALLOC_* for the actual tests
|
||||
|
||||
Allows N instances of tests run in parallel, each running 1/N parts
|
||||
of the test suite under Valgrind, to speed things up.
|
||||
|
||||
The tip one may be useful in practice but is a tad ugly ;-)
|
||||
The tip two may be useful in practice but is a tad ugly ;-)
|
||||
|
||||
There seem to be some miscounting by toggling the verbose/valgrind
|
||||
mode at wrong places? Cf. $gmane/225735
|
||||
|
||||
Waiting for a reroll.
|
||||
|
||||
|
||||
* fc/contrib-related (2013-06-09) 5 commits
|
||||
- contrib: related: print the amount of involvement
|
||||
- contrib: related: parse committish like format-patch
|
||||
- contrib: related: add option to parse from committish
|
||||
- contrib: related: add support for multiple patches
|
||||
- Add new git-related helper to contrib
|
||||
|
||||
|
||||
* hv/config-from-blob (2013-05-12) 5 commits
|
||||
- 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
|
||||
|
||||
Waiting for a reroll.
|
||||
$gmane/223964
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* mm/color-auto-default (2013-06-10) 2 commits
|
||||
@ -627,7 +686,7 @@ of the repositories listed at
|
||||
Will cook in 'next' until Git 2.0.
|
||||
|
||||
|
||||
* jc/push-2.0-default-to-simple (2013-04-03) 1 commit
|
||||
* jc/push-2.0-default-to-simple (2013-06-18) 1 commit
|
||||
- push: switch default from "matching" to "simple"
|
||||
|
||||
Will cook in 'next' until Git 2.0.
|
||||
@ -666,3 +725,12 @@ of the repositories listed at
|
||||
- remote-helpers: generate scripts
|
||||
|
||||
Retracted.
|
||||
|
||||
|
||||
* jk/packed-refs-race (2013-05-06) 4 commits
|
||||
. for_each_ref: load all loose refs before packed refs
|
||||
. get_packed_refs: reload packed-refs file when it changes
|
||||
. add a stat_validity struct
|
||||
. resolve_ref: close race condition for packed refs
|
||||
|
||||
Superseded by mh/ref-races topic, I think.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user