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 tip of the 'master' branch has passed v2.0.0-rc1. Last minute
fixes to newly added code keep flowing in, which is good. I've
picked up some topics that will not be part of the upcoming release
to 'pu' not to lose them, but I didn't have time to give them a deep
reading.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
[Graduated to "master"]
* km/git-svn-workaround-older-getopt-long (2014-04-23) 1 commit
(merged to 'next' on 2014-04-23 at 3f35586)
+ t9117: use --prefix "" instead of --prefix=""
Finishing touches to a change that is already in 'master'.
* mk/doc-git-gui-display-untracked (2014-04-21) 1 commit
(merged to 'next' on 2014-04-22 at 385d39a)
+ Documentation: git-gui: describe gui.displayuntracked
* mw/symlinks (2014-04-24) 1 commit
(merged to 'next' on 2014-04-25 at 20b2af6)
+ setup: fix windows path buffer over-stepping
A finishing touch fix to a new change already in 'master'.
* rh/prompt-pcmode-avoid-eval-on-refname (2014-04-22) 1 commit
(merged to 'next' on 2014-04-22 at 3a1506f)
+ git-prompt.sh: don't put unsanitized branch names in $PS1
--------------------------------------------------
[New Topics]
* bg/strbuf-trim (2014-04-30) 2 commits
- api-strbuf.txt: Add docs for _trim and _ltrim
- strbuf: Use _rtrim and _ltrim in strbuf_trim
Will merge to 'next'.
* cb/byte-order (2014-05-02) 2 commits
- compat/bswap.h: restore preference __BIG_ENDIAN over BIG_ENDIAN
- compat/bswap.h: detect endianness on more platforms that don't use BYTE_ORDER
Will merge to 'next'.
* dt/api-doc-setup-gently (2014-04-30) 1 commit
- docs: document RUN_SETUP_GENTLY and clarify RUN_SETUP
Will merge to 'next'.
* dt/merge-recursive-case-insensitive (2014-05-06) 1 commit
- merge-recursive.c: Fix case-changing merge bug
* ew/config-protect-mode (2014-05-06) 1 commit
- config: preserve config file permissions on edits
Will merge to 'next'.
* fc/rerere-conflict-style (2014-04-30) 1 commit
- rerere: fix for merge.conflictstyle
Will merge to 'next'.
* jc/coding-guidelines (2014-05-02) 8 commits
- 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
Needs to be rerolled.
* jd/subtree (2014-05-06) 5 commits
- contrib/subtree/Makefile: clean rule cleanup
- contrib/subtree/Makefile: Doc-gen rules cleanup
- contrib/subtree/Makefile: s/libexecdir/gitexecdir
- contrib/subtree/Makefile: Use GIT-VERSION-FILE
- contrib/subtree/Makefile: scrap unused $(gitdir)
Will merge to 'next'.
* jk/commit-date-approxidate (2014-05-02) 4 commits
- commit: accept more date formats for "--date"
- commit: print "Date" line when the user has set date
- pretty: make show_ident_date public
- commit: use split_ident_line to compare author/committer
Will merge to 'next'.
* mm/pager-less-sans-S (2014-04-30) 1 commit
- pager: remove 'S' from $LESS by default
Will merge to 'next'.
* sk/msvc-dynlink-crt (2014-05-06) 1 commit
- MSVC: link dynamically to the CRT
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* tr/merge-recursive-index-only (2014-02-05) 3 commits
- merge-recursive: -Xindex-only to leave worktree unchanged
- merge-recursive: internal flag to avoid touching the worktree
- merge-recursive: remove dead conditional in update_stages()
(this branch is used by tr/remerge-diff.)
Will hold.
* tr/remerge-diff (2014-02-26) 5 commits
. log --remerge-diff: show what the conflict resolution changed
. name-hash: allow dir hashing even when !ignore_case
. merge-recursive: allow storing conflict hunks in index
. revision: fold all merge diff variants into an enum merge_diff_mode
. combine-diff: do not pass revs->dense_combined_merges redundantly
(this branch uses tr/merge-recursive-index-only.)
"log -p" output learns a new way to let users inspect a merge
commit by showing the differences between the automerged result
with conflicts the person who recorded the merge would have seen
and the final conflict resolution that was recorded in the merge.
Needs to be rebased, now kb/fast-hashmap topic is in.
* jk/makefile (2014-02-05) 16 commits
- FIXUP
- move LESS/LV pager environment to Makefile
- Makefile: teach scripts to include make variables
- FIXUP
- Makefile: auto-build C strings from make variables
- Makefile: drop *_SQ variables
- FIXUP
- Makefile: add c-quote helper function
- Makefile: introduce sq function for shell-quoting
- Makefile: always create files via make-var
- Makefile: store GIT-* sentinel files in MAKE/
- Makefile: prefer printf to echo for GIT-*
- Makefile: use tempfile/mv strategy for GIT-*
- Makefile: introduce make-var helper function
- Makefile: fix git-instaweb dependency on gitweb
- Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
Simplify the Makefile rules and macros that exist primarily for
quoting purposes, and make it easier to robustly express the
dependency rules.
Expecting a reroll.
* po/everyday-doc (2014-01-27) 1 commit
- Make 'git help everyday' work
This may make the said command to emit something, but the source is
not meant to be formatted into a manual pages to begin with, and
also its contents are a bit stale. It may be a good first step in
the right direction, but needs more work to at least get the
mark-up right before public consumption.
Will hold.
* jk/branch-at-publish-rebased (2014-01-17) 5 commits
. t1507 (rev-parse-upstream): fix typo in test title
. implement @{publish} shorthand
. branch_get: provide per-branch pushremote pointers
. branch_get: return early on error
. sha1_name: refactor upstream_mark
Give an easier access to the tracking branches from "other" side in
a triangular workflow by introducing B@{publish} that works in a
similar way to how B@{upstream} does.
Meant to be used as a basis for whatever Ram wants to build on.
Ejected from 'pu' to make room for fc/publish-vs-upstream topic.
* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits
- merge: drop unused arg from abort_commit method signature
- merge: make prepare_to_commit responsible for write_merge_state
- t7505: ensure cleanup after hook blocks merge
- t7505: add missing &&
Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that
run during "git merge". The log message stresses too much on one
hook, prepare-commit-msg, but it would equally apply to other hooks
like post-merge, I think.
Waiting for a reroll.
* jl/submodule-recursive-checkout (2013-12-26) 5 commits
- Teach checkout to recursively checkout submodules
- submodule: teach unpack_trees() to update submodules
- submodule: teach unpack_trees() to repopulate submodules
- submodule: teach unpack_trees() to remove submodule contents
- submodule: prepare for recursive checkout of submodules
An RFCv2 exists ($gmane/241455) with sizable review comments.
Expecting a reroll.
* jc/graph-post-root-gap (2013-12-30) 3 commits
- WIP: document what we want at the end
- graph: remove unused code a bit
- graph: stuff the current commit into graph->columns[]
This was primarily a RFH ($gmane/239580).
* np/pack-v4 (2013-09-18) 90 commits
. packv4-parse.c: add tree offset caching
. t1050: replace one instance of show-index with verify-pack
. index-pack, pack-objects: allow creating .idx v2 with .pack v4
. unpack-objects: decode v4 trees
. unpack-objects: allow to save processed bytes to a buffer
- ...
Nico and Duy advancing the eternal vaporware pack-v4. This is here
primarily for wider distribution of the preview edition.
Needs to be rebased, now the pack-bitmap series is in.
* tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits
- perf-lib: add test_perf_cleanup target
- perf-lib: split starting the test from the execution
Add test_perf_cleanup shell function to the perf suite, that allows
the script writers to define a test with a clean-up action.
Will hold.
* jc/show-branch (2014-03-24) 5 commits
- show-branch: use commit slab to represent bitflags of arbitrary width
- show-branch.c: remove "all_mask"
- show-branch.c: abstract out "flags" operation
- show-branch.c: lift all_mask/all_revs to a global static
- show-branch.c: update comment style
Waiting for the final step to lift the hard-limit before sending it out.
--------------------------------------------------
[Cooking]
* cc/replace-edit (2014-04-29) 4 commits
- replace: add --edit option
- replace: factor object resolution out of replace_object
- replace: use OPT_CMDMODE to handle modes
- replace: refactor command-mode determination
* da/imap-send-use-credential-helper (2014-04-29) 1 commit
- imap-send: use git-credential
* dk/blame-reorg (2014-04-28) 1 commit
- blame: large-scale performance rewrite
* je/pager-do-not-recurse (2014-04-28) 1 commit
- pager: do allow spawning pager recursively
* jk/commit-C-pick-empty (2014-04-28) 1 commit
- commit: do not complain of empty messages from -C
* jk/utf8-switch-between-nfd-and-nfc (2014-04-29) 1 commit
- t3910: show failure of core.precomposeunicode with decomposed filenames
* mt/send-email-cover-to-cc (2014-04-29) 2 commits
- test/send-email: to-cover, cc-cover tests
- git-send-email: two new options: to-cover, cc-cover
* nd/split-index (2014-04-29) 33 commits
- 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
* tl/relax-in-poll-emulation (2014-04-29) 1 commit
- compat/poll: sleep 1 millisecond to avoid busy wait
* bc/blame-crlf-test (2014-04-28) 1 commit
- blame: correctly handle files regardless of autocrlf.
* rs/ref-transaction (2014-04-29) 27 commits
- refs.c: make lock_ref_sha1 static
- refs.c: make write_ref_sha1 static
- walker.c: use ref transaction for ref updates
- fast-import.c: use a ref transaction when dumping tags
- receive-pack.c: use a reference transaction for updating the refs
- fetch.c: use a single ref transaction for all ref updates
- fetch.c: change s_update_ref to use a ref transaction
- fetch.c: clear errno before calling functions that might set it
- refs.c: ref_transaction_commit should not free the transaction
- refs.c: free the transaction before returning when number of updates is 0
- refs.c: change update_ref to use a transaction
- branch.c: use ref transaction for all ref updates
- fast-import.c: change update_branch to use ref transactions
- sequencer.c: use ref transactions for all ref updates
- commit.c: use ref transactions for updates
- replace.c: use the ref transaction functions for updates
- tag.c: use ref transactions when doing updates
- refs.c: ref_transaction_delete to check for error and return status
- refs.c: change ref_transaction_create to do error checking and return status
- refs.c: change ref_transaction_update() to do error checking and return status
- refs.c: remove the onerr argument to ref_transaction_commit
- refs.c: make update_ref_write update a strbuf on failure
- update-ref.c: log transaction error from the update_ref
- refs.c: make ref_update_reject_duplicates take a strbuf argument for errors
- refs.c: add a strbuf argument to ref_transaction_commit for error logging
- refs.c: allow passing NULL to ref_transaction_free
- refs.c: constify the sha arguments for ref_transaction_create|delete|update
(this branch uses mh/ref-transaction.)
Updates most of the callsites to write_sha1_ref(), the low-level
mechanism to update a ref, to use the ref-transaction API.
Expecting a reroll.
* ep/shell-command-substitution (2014-04-30) 41 commits
- t5000-tar-tree.sh: use the $( ... ) construct for command substitution
- t4204-patch-id.sh: use the $( ... ) construct for command substitution
- t4119-apply-config.sh: use the $( ... ) construct for command substitution
- t4116-apply-reverse.sh: use the $( ... ) construct for command substitution
- t4057-diff-combined-paths.sh: use the $( ... ) construct for command substitution
- t4038-diff-combined.sh: use the $( ... ) construct for command substitution
- t4036-format-patch-signer-mime.sh: use the $( ... ) construct for command substitution
- t4014-format-patch.sh: use the $( ... ) construct for command substitution
- t4013-diff-various.sh: use the $( ... ) construct for command substitution
- t4012-diff-binary.sh: use the $( ... ) construct for command substitution
- t4010-diff-pathspec.sh: use the $( ... ) construct for command substitution
- t4006-diff-mode.sh: use the $( ... ) construct for command substitution
- t3910-mac-os-precompose.sh: use the $( ... ) construct for command substitution
- t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution
- t1050-large.sh: use the $( ... ) construct for command substitution
- t1020-subdirectory.sh: use the $( ... ) construct for command substitution
- t1004-read-tree-m-u-wf.sh: use the $( ... ) construct for command substitution
- t1003-read-tree-prefix.sh: use the $( ... ) construct for command substitution
- t1002-read-tree-m-u-2way.sh: use the $( ... ) construct for command substitution
- t1001-read-tree-m-2way.sh: use the $( ... ) construct for command substitution
- t1000-read-tree-m-3way.sh: use the $( ... ) construct for command substitution
- t0300-credentials.sh: use the $( ... ) construct for command substitution
- t0030-stripspace.sh: use the $( ... ) construct for command substitution
- t0026-eol-config.sh: use the $( ... ) construct for command substitution
- t0025-crlf-auto.sh: use the $( ... ) construct for command substitution
- t0020-crlf.sh: use the $( ... ) construct for command substitution
- t0010-racy-git.sh: use the $( ... ) construct for command substitution
- t0001-init.sh: use the $( ... ) construct for command substitution
- p5302-pack-index.sh: use the $( ... ) construct for command substitution
- lib-gpg.sh: use the $( ... ) construct for command substitution
- lib-cvs.sh: use the $( ... ) construct for command substitution
- lib-credential.sh: use the $( ... ) construct for command substitution
- git-web--browse.sh: use the $( ... ) construct for command substitution
- git-stash.sh: use the $( ... ) construct for command substitution
- git-rebase.sh: use the $( ... ) construct for command substitution
- git-rebase--merge.sh: use the $( ... ) construct for command substitution
- git-pull.sh: use the $( ... ) construct for command substitution
- appp.sh: use the $( ... ) construct for command substitution
- t7900-subtree.sh: use the $( ... ) construct for command substitution
- test-gitmw-lib.sh: use the $( ... ) construct for command substitution
- t9365-continuing-queries.sh: use the $( ... ) construct for command substitution
Adjust shell scripts to use $(cmd) instead of `cmd`.
Will merge to 'next' and keep it there for the remainder of the cycle.
* ib/test-selectively-run (2014-05-06) 3 commits
- 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
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-'").
* mm/mediawiki-encoding-fix (2014-04-23) 2 commits
(merged to 'next' on 2014-05-02 at 7744361)
+ git-remote-mediawiki: fix encoding issue for UTF-8 media files
+ git-remote-mediawiki: allow stop/start-ing the test server
Will keep in 'next' for the remainder of the cycle.
* sk/tag-contains-wo-recursion (2014-04-25) 1 commit
(merged to 'next' on 2014-04-25 at f320750)
+ git tag --contains: avoid stack overflow
Will keep in 'next' for the remainder of the cycle.
* fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits
- remote-hg: trivial cleanups
- remote-hg: make sure we omit multiple heads
- git-remote-hg: use internal clone's hgrc
- t: remote-hg: split into setup test
- remote-hg: properly detect missing contexts
- remote-{hg,bzr}: store marks only on success
- remote-hg: update to 'public' phase when pushing
- remote-hg: fix parsing of custom committer
(merged to 'next' on 2014-04-22 at fed170a)
+ remote-helpers: move tests out of contrib
+ remote-helpers: move out of contrib
+ remote-helpers: squelch python import exceptions
Move remote-hg and remote-bzr out of contrib/. There were some
suggestions on the follow-up fix patches still not in 'next', which
may result in a reroll.
I tend to agree with John Keeping that remote helpers that are
actively maintained can and should aim to graduate from my tree and
given to the user directly.
Will hold.
* fc/remote-helper-refmap (2014-04-21) 8 commits
(merged to 'next' on 2014-04-22 at fb5a4c2)
+ transport-helper: remove unnecessary strbuf resets
+ transport-helper: add support to delete branches
+ fast-export: add support to delete refs
+ fast-import: add support to delete refs
+ transport-helper: add support to push symbolic refs
+ transport-helper: add support for old:new refspec
+ fast-export: add new --refspec option
+ fast-export: improve argument parsing
Allow remote-helper/fast-import based transport to rename the refs
while transferring the history.
Will keep in 'next' for the remainder of the cycle.
* jk/external-diff-use-argv-array (2014-04-21) 5 commits
(merged to 'next' on 2014-04-22 at e6d92d7)
+ run_external_diff: refactor cmdline setup logic
+ run_external_diff: hoist common bits out of conditional
+ run_external_diff: drop fflush(NULL)
+ run_external_diff: clean up error handling
+ run_external_diff: use an argv_array for the environment
Code clean-up (and a bugfix which has been merged for 2.0).
Will keep in 'next' for the remainder of the cycle.
* jx/blame-align-relative-time (2014-04-23) 2 commits
(merged to 'next' on 2014-04-23 at 858df39)
+ blame: dynamic blame_date_width for different locales
+ blame: fix broken time_buf paddings in relative timestamp
"git blame" miscounted number of columns needed to show localized
timestamps, resulting in jaggy left-side-edge of the source code
lines in its output.
Will keep in 'next' for the remainder of the cycle.
* fc/merge-default-to-upstream (2014-04-22) 1 commit
(merged to 'next' on 2014-04-22 at 4f98483)
+ merge: enable defaulttoupstream by default
"git merge" without argument, even when there is an upstream
defined for the current branch, refused to run until
merge.defaultToUpstream is set to true. Flip the default of that
configuration variable to true.
Will keep in 'next' for the remainder of the cycle.
* fc/mergetool-prompt (2014-04-24) 2 commits
(merged to 'next' on 2014-05-02 at a554691)
+ mergetool: document the default for --[no-]prompt
(merged to 'next' on 2014-04-22 at dcaec94)
+ mergetool: run prompt only if guessed tool
mergetool.prompt used to default to 'true', always causing a confirmation
"do you really want to run the tool on this path" to be shown.
Among the two purposes the prompt serves, ignore the use case to
confirm that the user wants to view particular path with the named
tool, and make the prompt only to confirm the choice of the tool
made by autodetection and defaulting. For those who configured the
tool explicitly, the prompt shown for the latter purpose is simply
annoying.
Strictly speaking, this is a backward incompatible change and the
users need to explicitly set the variable to 'true' if they want to
resurrect the now-ignored use case.
Will keep in 'next' for the remainder of the cycle.
* fc/mergetools-vimdiff3 (2014-04-22) 1 commit
(merged to 'next' on 2014-04-22 at d843e75)
+ mergetools: add vimdiff3 mode
Will keep in 'next' for the remainder of the cycle.
* lr/git-run-setup-gently (2014-04-22) 1 commit
(merged to 'next' on 2014-04-22 at 5c2523f)
+ git.c: treat RUN_SETUP_GENTLY and RUN_SETUP as mutually exclusive
Will keep in 'next' for the remainder of the cycle.
* fc/publish-vs-upstream (2014-04-21) 8 commits
- sha1_name: add support for @{publish} marks
- sha1_name: simplify track finding
- sha1_name: cleanup interpret_branch_name()
- branch: display publish branch
- push: add --set-publish option
- branch: add --set-publish-to option
- Add concept of 'publish' branch
- t5516 (fetch-push): fix test restoration
Add branch@{publish}; it seems that this is somewhat different from
Ram and Peff started working on. There were many discussion
messages going back and forth but it does not appear that the
design issues have been worked out among participants yet.
* jl/git-gui-show-added-submodule-changes (2014-04-15) 1 commit
- git-gui: show staged submodules regardless of ignore config
Tentatively queued what I expect to receive via Pat Thoyts.
* jl/gitk-show-added-submodule-changes (2014-04-15) 3 commits
- gitk: show staged submodules regardless of ignore config
- gitk: Merge branch 'new' of https://github.com/vnwildman/gitk
- l10n: Init Vietnamese translation
Tentatively queued what I expect to receive via Paul Mackerras.
* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit
- git-rebase: print name of rev when using shorthand
Teach "git rebase -" to report the concrete name of the branch
(i.e. the previous one).
But it stops short and does not do the same for "git rebase @{-1}".
Expecting a reroll.
* ef/send-email-absolute-path-to-the-command (2014-04-23) 2 commits
(merged to 'next' on 2014-04-23 at a657e5e)
+ send-email: windows drive prefix (e.g. C:) appears only at the beginning
(merged to 'next' on 2014-04-21 at 43bebb5)
+ send-email: recognize absolute path on Windows
Will keep in 'next' for the remainder of the cycle.
* jh/submodule-tests (2014-04-17) 1 commit
- t7410: 210 tests for various 'git submodule update' scenarios
* rs/ref-update-check-errors-early (2014-04-17) 2 commits
(merged to 'next' on 2014-04-21 at acc62aa)
+ commit.c: check for lock error and return early
+ sequencer.c: check for lock failure and bail early in fast_forward_to
Will keep in 'next' for the remainder of the cycle.
* sk/svn-parse-datestamp (2014-04-17) 1 commit
(merged to 'next' on 2014-04-21 at 5ff519f)
+ SVN.pm::parse_svn_date: allow timestamps with a single-digit hour
Will keep in 'next' for the remainder of the cycle.
* nd/index-pack-one-fd-per-thread (2014-04-16) 1 commit
(merged to 'next' on 2014-04-16 at b38d5a9)
+ index-pack: work around thread-unsafe pread()
Enable threaded index-pack on platforms without thread-unsafe
pread() emulation.
Will keep in 'next' for the remainder of the cycle.
* ym/fix-opportunistic-index-update-race (2014-04-10) 2 commits
(merged to 'next' on 2014-04-16 at cb92f4f)
+ read-cache.c: verify index file before we opportunistically update it
+ wrapper.c: add xpread() similar to xread()
Read-only operations such as "git status" that internally refreshes
the index write out the refreshed index to the disk to optimize
future accesses to the working tree, but this could race with a
"read-write" operation that modify the index while it is running.
Detect such a race and avoid overwriting the index.
Duy raised a good point that we may need to do the same for the
normal writeout codepath, not just the "opportunistic" update
codepath. While that is true, nobody sane would be running two
simultaneous operations that are clearly write-oriented competing
with each other against the same index file. So in that sense that
can be done as a less urgent follow-up for this topic.
Will keep in 'next' for the remainder of the cycle.
* jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits
- commit -m: commit staged submodules regardless of ignore config
- status/commit: show staged submodules regardless of ignore config
There also are a few patches Ronald Weiss and Jens are working on
polishing around this topic, and a patch from Jens each for gitk
and git-gui.
Waiting for the dust to settle until picking them up all.
* mh/lockfile (2014-04-15) 25 commits
- trim_last_path_elm(): replace last_path_elm()
- resolve_symlink(): take a strbuf parameter
- resolve_symlink(): use a strbuf for internal scratch space
- change lock_file::filename into a strbuf
- commit_lock_file(): use a strbuf to manage temporary space
- try_merge_strategy(): use a statically-allocated lock_file object
- try_merge_strategy(): remove redundant lock_file allocation
- struct lock_file: declare some fields volatile
- lockfile: avoid transitory invalid states
- commit_lock_file(): die() if called for unlocked lockfile object
- commit_lock_file(): inline temporary variable
- remove_lock_file(): call rollback_lock_file()
- lock_file(): exit early if lockfile cannot be opened
- write_packed_entry_fn(): convert cb_data into a (const int *)
- prepare_index(): declare return value to be (const char *)
- delete_ref_loose(): don't muck around in the lock_file's filename
- cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN
- lockfile.c: document the various states of lock_file objects
- lock_file(): always add lock_file object to lock_file_list
- hold_lock_file_for_append(): release lock on errors
- lockfile: unlock file if lockfile permissions cannot be adjusted
- rollback_lock_file(): set fd to -1
- rollback_lock_file(): do not clear filename redundantly
- api-lockfile: expand the documentation
- unable_to_lock_die(): rename function from unable_to_lock_index_die()
Refactor and fix corner-case bugs in the lockfile API, all looked
sensible.
Expecting a reroll.
* mt/patch-id-stable (2014-05-06) 6 commits
- 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)
+ patch-id-test: test stable and unstable behaviour
+ test: add test_write_lines helper
+ patch-id: make it stable against hunk reordering
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 'next' and keep it there for the remainder of the cycle.
* mh/ref-transaction (2014-04-07) 27 commits
(merged to 'next' on 2014-04-16 at a99f84d)
+ ref_transaction_commit(): work with transaction->updates in place
+ struct ref_update: add a type field
+ struct ref_update: add a lock field
+ ref_transaction_commit(): simplify code using temporary variables
+ struct ref_update: store refname as a FLEX_ARRAY
+ struct ref_update: rename field "ref_name" to "refname"
+ refs: remove API function update_refs()
+ update-ref --stdin: reimplement using reference transactions
+ refs: add a concept of a reference transaction
+ update-ref --stdin: harmonize error messages
+ update-ref --stdin: improve the error message for unexpected EOF
+ t1400: test one mistake at a time
+ update-ref --stdin -z: deprecate interpreting the empty string as zeros
+ update-ref.c: extract a new function, parse_next_sha1()
+ t1400: test that stdin -z update treats empty <newvalue> as zeros
+ update-ref --stdin: simplify error messages for missing oldvalues
+ update-ref --stdin: make error messages more consistent
+ update-ref --stdin: improve error messages for invalid values
+ update-ref.c: extract a new function, parse_refname()
+ parse_cmd_verify(): copy old_sha1 instead of evaluating <oldvalue> twice
+ update-ref --stdin: read the whole input at once
+ update_refs(): fix constness
+ refs.h: rename the action_on_err constants
+ t1400: add some more tests involving quoted arguments
+ parse_arg(): really test that argument is properly terminated
+ t1400: provide more usual input to the command
+ t1400: fix name and expected result of one test
(this branch is used by rs/ref-transaction.)
Update "update-ref --stdin [-z]" and then introduce a transactional
support for (multi-)reference updates.
Will keep in 'next' for the remainder of the cycle.
* jc/apply-ignore-whitespace (2014-03-26) 1 commit
(merged to 'next' on 2014-04-04 at 53779a7)
+ apply --ignore-space-change: lines with and without leading whitespaces do not match
"--ignore-space-change" option of "git apply" ignored the
spaces at the beginning of line too aggressively, which is
inconsistent with the option of the same name "diff" and "git diff"
have.
Will keep in 'next' for the remainder of the cycle.
* as/grep-fullname-config (2014-03-20) 1 commit
(merged to 'next' on 2014-03-28 at 810a076)
+ grep: add grep.fullName config variable
Add a configuration variable to force --full-name to be default for
"git grep".
This may cause regressions on scripted users that do not expect
this new behaviour.
Will keep in 'next' for the remainder of the cycle.
* nd/multiple-work-trees (2014-03-25) 28 commits
- count-objects: report unused files in $GIT_DIR/repos/...
- gc: support prune --repos
- gc: style change -- no SP before closing bracket
- prune: strategies for linked checkouts
- checkout: detach if the branch is already checked out elsewhere
- checkout: clean up half-prepared directories in --to mode
- checkout: support checking out into a new working directory
- use new wrapper write_file() for simple file writing
- wrapper.c: wrapper to open a file, fprintf then close
- setup.c: support multi-checkout repo setup
- setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()
- setup.c: convert check_repository_format_gently to use strbuf
- setup.c: detect $GIT_COMMON_DIR in is_git_directory()
- setup.c: convert is_git_directory() to use strbuf
- git-stash: avoid hardcoding $GIT_DIR/logs/....
- *.sh: avoid hardcoding $GIT_DIR/hooks/...
- git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects
- $GIT_COMMON_DIR: a new environment variable
- commit: use SEQ_DIR instead of hardcoding "sequencer"
- fast-import: use git_path() for accessing .git dir instead of get_git_dir()
- reflog: avoid constructing .lock path with git_path
- *.sh: respect $GIT_INDEX_FILE
- git_path(): be aware of file relocation in $GIT_DIR
- path.c: group git_path(), git_pathdup() and strbuf_git_path() together
- path.c: rename vsnpath() to do_git_path()
- git_snpath(): retire and replace with strbuf_git_path()
- path.c: make get_pathname() call sites return const char *
- path.c: make get_pathname() return strbuf instead of static buffer
A replacement for contrib/workdir/git-new-workdir that does not
rely on symbolic links and make sharing of objects and refs safer
by making the borrowee and borrowers aware of each other.
Will hold.
* ks/tree-diff-nway (2014-04-09) 20 commits
(merged to 'next' on 2014-04-09 at c17228e)
+ mingw: activate alloca
(merged to 'next' on 2014-04-08 at 6b74773)
+ combine-diff: speed it up, by using multiparent diff tree-walker directly
+ tree-diff: rework diff_tree() to generate diffs for multiparent cases as well
+ Portable alloca for Git
(merged to 'next' on 2014-03-31 at 16a7bd4)
+ tree-diff: reuse base str(buf) memory on sub-tree recursion
+ tree-diff: no need to call "full" diff_tree_sha1 from show_path()
+ tree-diff: rework diff_tree interface to be sha1 based
+ tree-diff: diff_tree() should now be static
+ tree-diff: remove special-case diff-emitting code for empty-tree cases
(merged to 'next' on 2014-03-25 at cfcbdac)
+ tree-diff: simplify tree_entry_pathcmp
+ tree-diff: show_path prototype is not needed anymore
+ tree-diff: rename compare_tree_entry -> tree_entry_pathcmp
+ tree-diff: move all action-taking code out of compare_tree_entry()
+ tree-diff: don't assume compare_tree_entry() returns -1,0,1
(merged to 'next' on 2014-03-21 at d872679)
+ tree-diff: consolidate code for emitting diffs and recursion in one place
+ tree-diff: show_tree() is not needed
+ tree-diff: no need to pass match to skip_uninteresting()
+ tree-diff: no need to manually verify that there is no mode change for a path
+ combine-diff: move changed-paths scanning logic into its own function
+ combine-diff: move show_log_first logic/action out of paths scanning
Instead of running N pair-wise diff-trees when inspecting a
N-parent merge, find the set of paths that were touched by walking
N+1 trees in parallel. These set of paths can then be turned into
N pair-wise diff-tree results to be processed through rename
detections and such. And N=2 case nicely degenerates to the usual
2-way diff-tree, which is very nice.
Will keep in 'next' for the remainder of the cycle.
* cc/interpret-trailers (2014-04-29) 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.
--------------------------------------------------
[Discarded]
* jc/format-patch (2013-04-22) 2 commits
. format-patch: --inline-single
. format-patch: rename "no_inline" field
A new option to send a single patch to the standard output to be
appended at the bottom of a message. I personally have no need for
this, but it was easy enough to cobble together. Tests, docs and
stripping out more MIMEy stuff are left as exercises to interested
parties.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html