* What's cooking in git.git (Jan 2016, #04; Wed, 20)
@ 2016-01-20 23:33 Junio C Hamano
2016-01-21 12:09 ` jc/rerere-multi (was: What's cooking in git.git (Jan 2016, #04; Wed, 20)) Johannes Sixt
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Junio C Hamano @ 2016-01-20 23:33 UTC (permalink / raw)
To: git
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 ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The tip of 'master' now has second batch of topics merged, some of
which should later be merged to 'maint'. There are a few topics
that are v2.7.0 regression fixes still cooking outside 'master',
which also need to be merged to 'maint' for the maintenance release.
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"]
* dk/reflog-walk-with-non-commit (2016-01-05) 1 commit
(merged to 'next' on 2016-01-12 at 5f7b10e)
+ reflog-walk: don't segfault on non-commit sha1's in the reflog
"git reflog" incorrectly assumed that all objects that used to be
at the tip of a ref must be commits, which caused it to segfault.
* dw/signoff-doc (2016-01-05) 1 commit
(merged to 'next' on 2016-01-12 at 1b08b48)
+ Expand documentation describing --signoff
The documentation has been updated to hint the connection between
the '--signoff' option and DCO.
* ew/for-each-ref-doc (2016-01-05) 1 commit
(merged to 'next' on 2016-01-12 at e5c4e75)
+ for-each-ref: document `creatordate` and `creator` fields
* ew/send-email-mutt-alias-fix (2016-01-04) 1 commit
(merged to 'next' on 2016-01-12 at 84d1329)
+ git-send-email: do not double-escape quotes from mutt
"git send-email" was confused by escaped quotes stored in the alias
files saved by "mutt", which has been corrected.
* ho/gitweb-squelch-undef-warning (2016-01-12) 1 commit
(merged to 'next' on 2016-01-12 at ef4fc5f)
+ gitweb: squelch "uninitialized value" warning
Asking gitweb for a nonexistent commit left a warning in the server
log.
Somebody may want to follow this up with a new test, perhaps?
IIRC, we do test that no Perl warnings are given to the server log,
so this should have been caught if our test coverage were good.
* jk/clang-pedantic (2016-01-04) 2 commits
(merged to 'next' on 2016-01-12 at b5be271)
+ bswap: add NO_UNALIGNED_LOADS define
+ avoid shifting signed integers 31 bits
A few unportable C construct have been spotted by clang compiler
and have been fixed.
* jk/pack-revindex (2015-12-21) 2 commits
(merged to 'next' on 2016-01-12 at 2e39a16)
+ pack-revindex: store entries directly in packed_git
+ pack-revindex: drop hash table
In-core storage of the reverse index for .pack files (which lets
you go from a pack offset to an object name) has been streamlined.
* js/fopen-harder (2016-01-11) 2 commits
(merged to 'next' on 2016-01-12 at c6ef194)
+ Handle more file writes correctly in shared repos
+ commit: allow editing the commit message even in shared repos
Some codepaths used fopen(3) when opening a fixed path in $GIT_DIR
(e.g. COMMIT_EDITMSG) that is meant to be left after the command is
done. This however did not work well if the repository is set to
be shared with core.sharedRepository and the umask of the previous
user is tighter. They have been made to work better by calling
unlink(2) and retrying after fopen(3) fails with EPERM.
* mh/notes-allow-reading-treeish (2016-01-12) 1 commit
(merged to 'next' on 2016-01-12 at 7aa311f)
+ notes: allow treeish expressions as notes ref
Originally merged to 'next' on 2015-10-23
Some "git notes" operations, e.g. "git log --notes=<note>", should
be able to read notes from any tree-ish that is shaped like a notes
tree, but the notes infrastructure required that the argument must
be a ref under refs/notes/. Loosen it to require a valid ref only
when the operation would update the notes (in which case we must
have a place to store the updated notes tree, iow, a ref).
* nd/clear-gitenv-upon-use-of-alias (2015-12-29) 5 commits
(merged to 'next' on 2016-01-12 at 696b1f5)
+ run-command: don't warn on SIGPIPE deaths
+ git.c: make sure we do not leak GIT_* to alias scripts
+ setup.c: re-fix d95138e (setup: set env $GIT_WORK_TREE when ..
+ git.c: make it clear save_env() is for alias handling only
+ Merge branch 'nd/stop-setenv-work-tree' into nd/clear-gitenv-upon-use-of-alias
d95138e6 (setup: set env $GIT_WORK_TREE when work tree is set, like
$GIT_DIR, 2015-06-26) attempted to work around a glitch in alias
handling by overwriting GIT_WORK_TREE environment variable to
affect subprocesses when set_git_work_tree() gets called, which
resulted in a rather unpleasant regression to "clone" and "init".
Try to address the same issue by always restoring the environment
and respawning the real underlying command when handling alias.
* nd/dir-exclude-cleanup (2015-12-28) 1 commit
(merged to 'next' on 2016-01-12 at e6584c9)
+ dir.c: clean the entire struct in clear_exclude_list()
The "exclude_list" structure has the usual "alloc, nr" pair of
fields to be used by ALLOC_GROW(), but clear_exclude_list() forgot
to reset 'alloc' to 0 when it cleared 'nr' to discard the managed
array.
* nd/exclusion-regression-fix (2016-01-08) 1 commit
(merged to 'next' on 2016-01-12 at 0eb98a5)
+ Revert "dir.c: don't exclude whole dir prematurely if neg pattern may match"
The ignore mechanism saw a few regressions around untracked file
listing and sparse checkout selection areas in 2.7.0; the change
that is responsible for the regression has been reverted.
* nd/ita-cleanup (2015-12-28) 3 commits
(merged to 'next' on 2016-01-12 at 008a6e3)
+ grep: make it clear i-t-a entries are ignored
+ add and use a convenience macro ce_intent_to_add()
+ blame: remove obsolete comment
Paths that have been told the index about with "add -N" are not
quite yet in the index, but a few commands behaved as if they
already are in a harmful way.
* sg/t6050-failing-editor-test-fix (2016-01-05) 1 commit
(merged to 'next' on 2016-01-12 at dc08a19)
+ t6050-replace: make failing editor test more robust
* ss/clone-depth-single-doc (2016-01-08) 3 commits
(merged to 'next' on 2016-01-12 at 16ded8c)
+ docs: clarify that --depth for git-fetch works with newly initialized repos
+ docs: say "commits" in the --depth option wording for git-clone
+ docs: clarify that passing --depth to git-clone implies --single-branch
Documentation for "git fetch --depth" has been updated for clarity.
* ss/user-manual (2015-12-30) 4 commits
(merged to 'next' on 2016-01-12 at c7f0328)
+ user-manual: add addition gitweb information
+ user-manual: add section documenting shallow clones
+ glossary: define the term shallow clone
+ user-manual: remove temporary branch entry from todo list
Drop a few old "todo" items by deciding that the change one of them
suggests is not such a good idea, and doing the change the other
one suggested to do.
* tg/grep-no-index-fallback (2016-01-12) 2 commits
(merged to 'next' on 2016-01-12 at 8960bdd)
+ builtin/grep: add grep.fallbackToNoIndex config
+ t7810: correct --no-index test
"git grep" by default does not fall back to its "--no-index"
behaviour outside a directory under Git's control (otherwise the
user may by mistake end up running a huge recursive search); with a
new configuration (set in $HOME/.gitconfig--by definition this
cannot be set in the config file per project), this safety can be
disabled.
--------------------------------------------------
[New Topics]
* dg/subtree-rebase-test (2016-01-19) 1 commit
- contrib/subtree: Add a test for subtree rebase that loses commits
Reviewed up to v5.
Will be rerolled.
($gmane/284426)
* jk/shortlog (2016-01-19) 7 commits
- shortlog: don't warn on empty author
- shortlog: optimize out useless string list
- shortlog: optimize out useless "<none>" normalization
- shortlog: optimize "--summary" mode
- shortlog: replace hand-parsing of author with pretty-printer
- shortlog: use strbufs to read from stdin
- shortlog: match both "Author:" and "author" on stdin
"git shortlog" used to accumulate various pieces of information
regardless of what was asked to be shown in the final output. It
has been optimized by noticing what need not to be collected
(e.g. there is no need to collect the log messages when showing
only the number of changes).
Will merge to 'next'.
* jc/peace-with-crlf (2016-01-15) 12 commits
- test-sha1-array: read command stream with strbuf_getline()
- grep: read -f file with strbuf_getline()
- send-pack: read list of refs with strbuf_getline()
- column: read lines with strbuf_getline()
- cat-file: read batch stream with strbuf_getline()
- transport-helper: read helper response with strbuf_getline()
- clone/sha1_file: read info/alternates with strbuf_getline()
- remote.c: read $GIT_DIR/remotes/* with strbuf_getline()
- ident.c: read /etc/mailname with strbuf_getline()
- rev-parse: read parseopt spec with strbuf_getline()
- revision: read --stdin with strbuf_getline()
- hash-object: read --stdin-paths with strbuf_getline()
(this branch uses jc/strbuf-getline.)
Teach codepaths that communicate with users by reading text files
to be more lenient to editors that write CRLF-terminated lines.
Note that this is only about communication with Git, like feeding
list of object names from the standard input instead of from the
command line, and does not involve files in the working tree.
Will merge to 'next'.
* dg/subtree-test (2016-01-19) 1 commit
- contrib/subtree: Make testing easier
Needs review.
($gmane/284277)
* jk/filter-branch-no-index (2016-01-19) 1 commit
- filter-branch: resolve $commit^{tree} in no-index case
A recent optimization to filter-branch in v2.7.0 introduced a
regression when --prune-empty filter is used, which has been
corrected.
Will merge to 'next'.
* jk/sanity (2016-01-19) 1 commit
- test-lib: clarify and tighten SANITY
The description for SANITY prerequisite the test suite uses has
been clarified both in the comment and in the implementation.
Will merge to 'next'.
* ls/travis-prove-order (2016-01-19) 1 commit
- travis-ci: run previously failed tests first, then slowest to fastest
By persisting runtime statistics of previous "prove" run, execute
tests that take longer before other ones, to reduce the total
wallclock time when running with Travis CI.
Waiting for a reroll.
($gmane/284431)
* nd/do-not-move-worktree-manually (2016-01-19) 2 commits
- worktree: stop supporting moving worktrees manually
- worktree.c: fix indentation
"git worktree" had a broken code that attempted to auto-fix
possible inconsistency that results from end-users moving a
worktree to different places without telling Git (the original
repository needs to maintain backpointers to its worktrees, but
"mv" run by end-users who are not familiar with that fact will
obviously not adjust them), which actually made things worse
when triggered.
Will merge to 'next'.
* sb/submodule-init (2016-01-20) 2 commits
- submodule: port init from shell to C
- submodule: port resolve_relative_url from shell to C
(this branch uses sb/submodule-parallel-update.)
Needs review.
($gmane/284419)
--------------------------------------------------
[Stalled]
* kf/http-proxy-auth-methods (2015-11-04) 3 commits
. SQUASH???
. http: use credential API to handle proxy authentication
. http: allow selection of proxy authentication method
New http.proxyAuthMethod configuration variable can be used to
specify what authentication method to use, as a way to work around
proxies that do not give error response expected by libcurl when
CURLAUTH_ANY is used. Also, the codepath for proxy authentication
has been taught to use credential API to store the authentication
material in user's keyrings.
I ejected this from pu for the moment, as it conflicts with the
pt/http-socks-proxy topic. That is now in master, so it can
be re-rolled on top.
Anybody wants to help rerolling this? Otherwise will discard.
* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits
- t/lib-git-svn: check same httpd module dirs as lib-httpd
- t/lib-httpd: load mod_unixd
This is the first two commits in a three-patch series $gmane/266962
Becoming tired of waiting for a reroll.
with updated log message ($gmane/268061).
Will discard.
* jc/diff-b-m (2015-02-23) 5 commits
. WIPWIP
. WIP: diff-b-m
- diffcore-rename: allow easier debugging
- diffcore-rename.c: add locate_rename_src()
- diffcore-break: allow debugging
"git diff -B -M" produced incorrect patch when the postimage of a
completely rewritten file is similar to the preimage of a removed
file; such a resulting file must not be expressed as a rename from
other place.
The fix in this patch is broken, unfortunately.
Will discard.
--------------------------------------------------
[Cooking]
* js/pull-rebase-i (2016-01-13) 3 commits
(merged to 'next' on 2016-01-20 at a0c5440)
+ completion: add missing branch.*.rebase values
+ remote: handle the config setting branch.*.rebase=interactive
+ pull: allow interactive rebase with --rebase=interactive
"git pull --rebase" has been extended to allow invoking
"rebase -i".
Will merge to 'master'.
* jk/ok-to-fail-gc-auto-in-rebase (2016-01-13) 1 commit
(merged to 'next' on 2016-01-20 at c9a8e82)
+ rebase: ignore failures from "gc --auto"
"git rebase", unlike all other callers of "gc --auto", did not
ignore the exit code from "gc --auto".
Will merge to 'master'.
* js/close-packs-before-gc (2016-01-13) 4 commits
(merged to 'next' on 2016-01-20 at 16cf87b)
+ receive-pack: release pack files before garbage-collecting
+ merge: release pack files before garbage-collecting
+ am: release pack files before garbage-collecting
+ fetch: release pack files before garbage-collecting
Many codepaths that run "gc --auto" before exiting kept packfiles
mapped and left the file descriptors to them open, which was not
friendly to systems that cannot remove files that are open. They
now close the packs before doing so.
Will merge to 'master'.
* js/msys2 (2016-01-15) 9 commits
- mingw: uglify (a, 0) definitions to shut up warnings
- mingw: squash another warning about a cast
- mingw: avoid warnings when casting HANDLEs to int
- mingw: avoid redefining S_* constants
- compat/winansi: support compiling with MSys2
- compat/mingw: support MSys2-based MinGW build
- nedmalloc: allow compiling with MSys2's compiler
- config.mak.uname: supporting 64-bit MSys2
- config.mak.uname: support MSys2
Beginning of the upstreaming process of Git for Windows effort.
Will merge to 'next'.
* rp/p4-filetype-change (2016-01-13) 1 commit
(merged to 'next' on 2016-01-20 at 7b5954b)
+ git-p4.py: add support for filetype change
Will merge to 'master'.
* tk/interpret-trailers-in-place (2016-01-14) 2 commits
- interpret-trailers: add option for in-place editing
- trailer: allow to write to files other than stdout
"interpret-trailers" has been taught to optionally update a file in
place, instead of always writing the result to the standard output.
Will merge to 'next'.
* js/dirname-basename (2016-01-15) 5 commits
(merged to 'next' on 2016-01-20 at d198512)
+ t0060: loosen overly strict expectations
(merged to 'next' on 2016-01-12 at c3c970a)
+ t0060: verify that basename() and dirname() work as expected
+ compat/basename.c: provide a dirname() compatibility function
+ compat/basename: make basename() conform to POSIX
+ Refactor skipping DOS drive prefixes
dirname() emulation has been added, as Msys2 lacks it.
Will merge to 'master'.
* wp/sha1-name-negative-match (2016-01-13) 2 commits
- object name: introduce '^{/!-<negative pattern>}' notation
- test for '!' handling in rev-parse's named commits
Introduce "<branch>^{/!-<pattern>}" notation to name a commit
reachable from <branch> that does not match the given <pattern>.
A questionable corner case where commit has no message remains.
Waiting for review.
($gmane/283971)
* ak/format-patch-odir-config (2016-01-13) 1 commit
(merged to 'next' on 2016-01-20 at 97c699b)
+ format-patch: introduce format.outputDirectory configuration
Allow "-o <dir>" option to be omitted on the command line of "git
format-patch" if you always use the same directory in your
workflow.
Will merge to 'master'.
* jk/notes-merge-from-anywhere (2016-01-17) 1 commit
- notes: allow merging from arbitrary references
"git notes merge" used to limit the source of the merged notes tree
to somewhere under refs/notes/ hierarchy, which was too limiting
when inventing a workflow to exchange notes with remote
repositories using remote-tracking notes trees (located in e.g.
refs/remote-notes/ or somesuch).
Will merge to 'next'.
* dt/unpack-compare-entry-optim (2016-01-05) 1 commit
(merged to 'next' on 2016-01-20 at 180dccf)
+ do_compare_entry: use already-computed path
Will merge to 'master'.
* jk/symbolic-ref (2016-01-13) 6 commits
(merged to 'next' on 2016-01-20 at 30b5408)
+ lock_ref_sha1_basic: handle REF_NODEREF with invalid refs
+ lock_ref_sha1_basic: always fill old_oid while holding lock
+ checkout,clone: check return value of create_symref
+ create_symref: write reflog while holding lock
+ create_symref: use existing ref-lock code
+ create_symref: modernize variable names
The low-level code that is used to create symbolic references has
been updated to share more code with the code that deals with
normal references.
Will merge to 'master'.
* ep/shell-command-substitution-style (2016-01-12) 92 commits
(merged to 'next' on 2016-01-20 at ae1b1d8)
+ t9901-git-web--browse.sh: use the $( ... ) construct for command substitution
+ t9501-gitweb-standalone-http-status.sh: use the $( ... ) construct for command substitution
+ t9350-fast-export.sh: use the $( ... ) construct for command substitution
+ t9300-fast-import.sh: use the $( ... ) construct for command substitution
+ t9150-svk-mergetickets.sh: use the $( ... ) construct for command substitution
+ t9145-git-svn-master-branch.sh: use the $( ... ) construct for command substitution
+ t9138-git-svn-authors-prog.sh: use the $( ... ) construct for command substitution
+ t9137-git-svn-dcommit-clobber-series.sh: use the $( ... ) construct for command substitution
+ t9132-git-svn-broken-symlink.sh: use the $( ... ) construct for command substitution
+ t9130-git-svn-authors-file.sh: use the $( ... ) construct for command substitution
+ t9129-git-svn-i18n-commitencoding.sh: use the $( ... ) construct for command substitution
+ t9119-git-svn-info.sh: use the $( ... ) construct for command substitution
+ t9118-git-svn-funky-branch-names.sh: use the $( ... ) construct for command substitution
+ t9114-git-svn-dcommit-merge.sh: use the $( ... ) construct for command substitution
+ t9110-git-svn-use-svm-props.sh: use the $( ... ) construct for command substitution
+ t9109-git-svn-multi-glob.sh: use the $( ... ) construct for command substitution
+ t9108-git-svn-glob.sh: use the $( ... ) construct for command substitution
+ t9107-git-svn-migrate.sh: use the $( ... ) construct for command substitution
+ t9105-git-svn-commit-diff.sh: use the $( ... ) construct for command substitution
+ t9104-git-svn-follow-parent.sh: use the $( ... ) construct for command substitution
+ t9101-git-svn-props.sh: use the $( ... ) construct for command substitution
+ t9100-git-svn-basic.sh: use the $( ... ) construct for command substitution
+ t/t9001-send-email.sh: use the $( ... ) construct for command substitution
+ t/t8003-blame-corner-cases.sh: use the $( ... ) construct for command substitution
+ t/t7700-repack.sh: use the $( ... ) construct for command substitution
+ t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substitution
+ t/t7505-prepare-commit-msg-hook.sh: use the $( ... ) construct for command substitution
+ t/t7504-commit-msg-hook.sh: use the $( ... ) construct for command substitution
+ t/t7408-submodule-reference.sh: use the $( ... ) construct for command substitution
+ t/t7406-submodule-update.sh: use the $( ... ) construct for command substitution
+ t/t7103-reset-bare.sh: use the $( ... ) construct for command substitution
+ t/t7006-pager.sh: use the $( ... ) construct for command substitution
+ t/t7004-tag.sh: use the $( ... ) construct for command substitution
+ t/t7003-filter-branch.sh: use the $( ... ) construct for command substitution
+ t/t7001-mv.sh: use the $( ... ) construct for command substitution
+ t/t6132-pathspec-exclude.sh: use the $( ... ) construct for command substitution
+ t/t6032-merge-large-rename.sh: use the $( ... ) construct for command substitution
+ t/t6015-rev-list-show-all-parents.sh: use the $( ... ) construct for command substitution
+ t/t6002-rev-list-bisect.sh: use the $( ... ) construct for command substitution
+ t/t6001-rev-list-graft.sh: use the $( ... ) construct for command substitution
+ t/t5900-repo-selection.sh: use the $( ... ) construct for command substitution
+ t/t5710-info-alternate.sh: use the $( ... ) construct for command substitution
+ t/t5700-clone-reference.sh: use the $( ... ) construct for command substitution
+ t/t5601-clone.sh: use the $( ... ) construct for command substitution
+ t/t5570-git-daemon.sh: use the $( ... ) construct for command substitution
+ t/t5550-http-fetch-dumb.sh: use the $( ... ) construct for command substitution
+ t/t5538-push-shallow.sh: use the $( ... ) construct for command substitution
+ t/t5537-fetch-shallow.sh: use the $( ... ) construct for command substitution
+ t/t5532-fetch-proxy.sh: use the $( ... ) construct for command substitution
+ t/t5530-upload-pack-error.sh: use the $( ... ) construct for command substitution
+ t/t5522-pull-symlink.sh: use the $( ... ) construct for command substitution
+ t/t5517-push-mirror.sh: use the $( ... ) construct for command substitution
+ t/t5516-fetch-push.sh: use the $( ... ) construct for command substitution
+ t/t5515-fetch-merge-logic.sh: use the $( ... ) construct for command substitution
+ t/t5510-fetch.sh: use the $( ... ) construct for command substitution
+ t/t5506-remote-groups.sh: use the $( ... ) construct for command substitution
+ t/t5505-remote.sh: use the $( ... ) construct for command substitution
+ t/t5500-fetch-pack.sh: use the $( ... ) construct for command substitution
+ t/t5305-include-tag.sh: use the $( ... ) construct for command substitution
+ t/t5304-prune.sh: use the $( ... ) construct for command substitution
+ t/t5303-pack-corruption-resilience.sh: use the $( ... ) construct for command substitution
+ t/t5100: no need to use 'echo' command substitutions for globbing
+ t/t5302-pack-index.sh: use the $( ... ) construct for command substitution
+ t/t5301-sliding-window.sh: use the $( ... ) construct for command substitution
+ t/t5300-pack-object.sh: use the $( ... ) construct for command substitution
+ t/t5100-mailinfo.sh: use the $( ... ) construct for command substitution
+ t/t3700-add.sh: use the $( ... ) construct for command substitution
+ t/t3600-rm.sh: use the $( ... ) construct for command substitution
+ t/t3511-cherry-pick-x.sh: use the $( ... ) construct for command substitution
+ t/t3403-rebase-skip.sh: use the $( ... ) construct for command substitution
+ t/t3210-pack-refs.sh: use the $( ... ) construct for command substitution
+ t/t3101-ls-tree-dirname.sh: use the $( ... ) construct for command substitution
+ t/t3100-ls-tree-restrict.sh: use the $( ... ) construct for command substitution
+ t/t3030-merge-recursive.sh: use the $( ... ) construct for command substitution
+ t/t2102-update-index-symlinks.sh: use the $( ... ) construct for command substitution
+ t/t2025-worktree-add.sh: use the $( ... ) construct for command substitution
+ t/t1700-split-index.sh: use the $( ... ) construct for command substitution
+ t/t1512-rev-parse-disambiguation.sh: use the $( ... ) construct for command substitution
+ t/t1511-rev-parse-caret.sh: use the $( ... ) construct for command substitution
+ t/t1410-reflog.sh: use the $( ... ) construct for command substitution
+ t/t1401-symbolic-ref.sh: use the $( ... ) construct for command substitution
+ t/t1100-commit-tree-options.sh: use the $( ... ) construct for command substitution
+ unimplemented.sh: use the $( ... ) construct for command substitution
+ test-sha1.sh: use the $( ... ) construct for command substitution
+ t/lib-httpd.sh: use the $( ... ) construct for command substitution
+ git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution
+ contrib/thunderbird-patch-inline/appp.sh: use the $( ... ) construct for command substitution
+ contrib/examples/git-revert.sh: use the $( ... ) construct for command substitution
+ contrib/examples/git-repack.sh: use the $( ... ) construct for command substitution
+ contrib/examples/git-merge.sh: use the $( ... ) construct for command substitution
+ contrib/examples/git-fetch.sh: use the $( ... ) construct for command substitution
+ contrib/examples/git-commit.sh: use the $( ... ) construct for command substitution
A shell script style update to change `command substitution` into
$(command substitution). Coverts contrib/ and much of the t/
directory contents.
Will merge to 'master'.
* cc/untracked (2016-01-20) 11 commits
- t7063: add tests for core.untrackedCache
- test-dump-untracked-cache: don't modify the untracked cache
- config: add core.untrackedCache
- dir: simplify untracked cache "ident" field
- dir: add remove_untracked_cache()
- dir: add {new,add}_untracked_cache()
- update-index: move 'uc' var declaration
- update-index: add untracked cache notifications
- update-index: add --test-untracked-cache
- update-index: use enum for untracked cache options
- dir: free untracked cache when removing it
Update the untracked cache subsystem and change its primary UI from
"git update-index" to "git config".
Will merge to 'next'.
* dt/refs-backend-lmdb (2016-01-12) 22 commits
. DONTMERGE: compilation fix
. refs: tests for lmdb backend
. refs: add LMDB refs backend
. svn: learn ref-storage argument
. refs: allow ref backend to be set for clone
. clone: use child_process for recursive checkouts
. refs: check submodules ref storage config
. init: allow alternate backends to be set for new repos
. refs: always handle non-normal refs in files backend
. refs: resolve symbolic refs first
. refs: allow log-only updates
. refs: move duplicate check to common code
. refs: make lock generic
. refs: add method to rename refs
. refs: add methods to init refs db
. refs: add method for delete_refs
. refs: add method for initial ref transaction commit
. refs: add methods for reflog
. refs: add do_for_each_per_worktree_ref
. refs: add methods for the ref iterators
. refs: add methods for misc ref operations
. refs: add a backend method structure with transaction functions
Building on top of a few refs-backend preparatory series, LMDB
based refs backend has been plugged into the system.
Rerolled, but left out of 'pu' for now due to conflicts.
* dw/subtree-split-do-not-drop-merge (2016-01-20) 1 commit
- contrib/subtree: fix "subtree split" skipped-merge bug
The "split" subcommand of "git subtree" (in contrib/) incorrectly
skipped merges when it shouldn't, which was corrected.
Will merge to 'next'.
* kn/ref-filter-atom-parsing (2016-01-05) 15 commits
- ref-filter: introduce objectname_atom_parser()
- ref-filter: introduce contents_atom_parser()
- ref-filter: introduce remote_ref_atom_parser()
- ref-filter: align: introduce long-form syntax
- ref-filter: convert variable 'width' to an unsigned int
- ref-filter: introduce parse_align_position()
- ref-filter: introduce align_atom_parser()
- ref-filter: introduce color_atom_parser()
- ref-filter: skip deref specifier in match_atom_name()
- ref-fitler: bump match_atom() name to the top
- ref-filter: introduce parsing functions for each valid atom
- ref-filter: introduce struct used_atom
- ref-filter: bump 'used_atom' and related code to the top
- ref-filter: use strbuf_split_str_omit_term()
- strbuf: introduce strbuf_split_str_omit_term()
Refactoring of ref-filter's format-parsing code, in preparation
for "branch --format" and friends.
This replaces (for now) kn/for-each-ref-remainder, which will be built
on top.
Still being discussed and worked on.
* bb/merge-marker-crlf (2015-11-24) 1 commit
- merge-file: consider core.crlf when writing merge markers
Write out merge markers using system end-of-line convention.
Waiting for a re-roll to handle gitattributes.
($gmane/281701)
* dk/gc-more-wo-pack (2016-01-13) 4 commits
- gc: clean garbage .bitmap files from pack dir
- t5304: ensure non-garbage files are not deleted
- t5304: test .bitmap garbage files
- prepare_packed_git(): find more garbage
Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Waiting for a reroll.
($gmane/284368).
* rm/subtree-unwrap-tags (2015-11-24) 1 commit
(merged to 'next' on 2016-01-20 at 6373d95)
+ contrib/subtree: unwrap tag refs
"git subtree" (in contrib/) records the tag object name in the
commit log message when a subtree is added using a tag, without
peeling it down to the underlying commit. The tag needs to be
peeled when "git subtree split" wants to work on the commit, but
the command forgot to do so.
Will merge to 'master'.
* sg/sh-require-clean-orphan (2015-11-24) 2 commits
- sh-setup: make require_clean_work_tree() work on orphan branches
- Add tests for git-sh-setup's require_clean_work_tree()
Allow users of git-sh-setup to handle orphan branch state.
This series takes the conservative route of requiring scripts to opt
into the looser behavior, at the expense of carrying around a new
option-flag forever. I'm not sure if we need to do so.
Needs review.
* tb/ls-files-eol (2016-01-18) 1 commit
- ls-files: add eol diagnostics
Add options to ls-files to help diagnose end-of-line problems.
Will merge to 'next'.
* ec/annotate-deleted (2015-11-20) 1 commit
- annotate: skip checking working tree if a revision is provided
Usability fix for annotate-specific "<file> <rev>" syntax with deleted
files.
Waiting for review.
* sb/submodule-parallel-update (2016-01-12) 8 commits
- clone: allow an explicit argument for parallel submodule clones
- submodule update: expose parallelism to the user
- git submodule update: have a dedicated helper for cloning
- fetching submodules: respect `submodule.fetchJobs` config option
- submodule-config: introduce parse_generic_submodule_config
- submodule-config: remove name_and_item_from_var
- submodule-config: drop check against NULL
- submodule-config: keep update strategy around
(this branch is used by sb/submodule-init.)
Builds on top of the "fetch --recurse-submodules" work to introduce
parallel downloading into multiple submodules for "submodule update".
Needs review.
* jc/strbuf-getline (2016-01-15) 9 commits
- strbuf: give strbuf_getline() to the "most text friendly" variant
- checkout-index: there are only two possible line terminations
- update-index: there are only two possible line terminations
- check-ignore: there are only two possible line terminations
- check-attr: there are only two possible line terminations
- mktree: there are only two possible line terminations
- strbuf: introduce strbuf_getline_{lf,nul}()
- strbuf: make strbuf_getline_crlf() global
- strbuf: miniscule style fix
(this branch is used by jc/peace-with-crlf.)
The preliminary clean-up for jc/peace-with-crlf topic.
Will merge to 'next'.
* js/am-3-merge-recursive-direct (2015-10-12) 2 commits
- am: make a direct call to merge_recursive
- merge_recursive_options: introduce the "gently" flag
The merge_recursive_generic() function has been made a bit safer to
call from inside a process. "git am -3" was taught to make a direct
call to the function when falling back to three-way merge.
Being able to make a direct call would be good in general, but as a
performance thing, the change needs to be backed up by numbers.
Needs review.
I haven't gone through the "gently" change with fine toothed comb;
I can see that the change avoids calling die(), but I haven't made
sure that the program states (e.g. what's in the in-core index) are
adjusted sensibly when it returns to the caller instead of dying,
or the codepaths that used to die() are free of resource leaks.
The original code certainly did not care the program states at the
point of dying exactly because it knew it is going to exit, but now
they have to care, and they need to be audited.
* ad/cygwin-wants-rename (2015-08-07) 1 commit
- config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES
Will hold.
($gmane/275680).
* jc/rerere-multi (2015-09-14) 7 commits
- rerere: do use multiple variants
- t4200: rerere a merge with two identical conflicts
- rerere: allow multiple variants to exist
- rerere: delay the recording of preimage
- rerere: handle leftover rr-cache/$ID directory and postimage files
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
- rerere: split conflict ID further
"git rerere" can encounter two or more files with the same conflict
signature that have to be resolved in different ways, but there was
no way to record these separate resolutions.
Needs review.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- merge: drop 'git merge <message> HEAD <commit>' syntax
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007. It has been reported that
git-gui still uses the deprecated syntax, which needs to be fixed
before this final step can proceed.
($gmane/282594)
^ permalink raw reply [flat|nested] 10+ messages in thread
* jc/rerere-multi (was: What's cooking in git.git (Jan 2016, #04; Wed, 20))
2016-01-20 23:33 What's cooking in git.git (Jan 2016, #04; Wed, 20) Junio C Hamano
@ 2016-01-21 12:09 ` Johannes Sixt
2016-01-21 22:07 ` jc/rerere-multi Junio C Hamano
2016-01-22 16:58 ` What's cooking in git.git (Jan 2016, #04; Wed, 20) Johannes Schindelin
2016-01-26 9:47 ` Lars Schneider
2 siblings, 1 reply; 10+ messages in thread
From: Johannes Sixt @ 2016-01-21 12:09 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Am 21.01.2016 um 00:33 schrieb Junio C Hamano:
> * jc/rerere-multi (2015-09-14) 7 commits
> - rerere: do use multiple variants
> - t4200: rerere a merge with two identical conflicts
> - rerere: allow multiple variants to exist
> - rerere: delay the recording of preimage
> - rerere: handle leftover rr-cache/$ID directory and postimage files
> - rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
> - rerere: split conflict ID further
>
> "git rerere" can encounter two or more files with the same conflict
> signature that have to be resolved in different ways, but there was
> no way to record these separate resolutions.
>
> Needs review.
I finally found some time to test and review this series. I have one
case where there are many identical conflicts (up to 15!) that rerere
was unable to resolve. But with this series applied, all of them are
now resolved automatically and correctly. That's a nice achievement!
Tested-by: Johannes Sixt <j6t@kdbg.org>
I don't have the original submission anymore. So, I'm responding here.
Generally, the patches make sense.
Except for 510936082eb4 "handle leftover rr-cache/$ID directory and
postimage files": After the subsequent e2a6344cca47 "delay the
recording of preimage" is in place, nothing of what the former patch
changed (except test cases) remains, and the problem that the former
solved is still solved, and in addition the NEEDSWORK that the former
introduced is resolved by the latter. I think the two should be
squashed together.
e2a6344cca47 (rerere: delay the recording of preimage) needs this
fixup, I think:
diff --git a/rerere.c b/rerere.c
index c0482b8..33b1348 100644
--- a/rerere.c
+++ b/rerere.c
@@ -765,7 +765,7 @@ static void do_rerere_one_path(struct string_list_item *rr_item,
const char *path = rerere_path(id, "postimage");
if (unlink(path))
die_errno("cannot unlink stray '%s'", path);
- id->collection->status &= ~RR_HAS_PREIMAGE;
+ id->collection->status &= ~RR_HAS_POSTIMAGE;
}
id->collection->status |= RR_HAS_PREIMAGE;
fprintf(stderr, "Recorded preimage for '%s'\n", path);
and perhaps this change:
diff --git a/rerere.c b/rerere.c
index fbdade8..df6beb9 100644
--- a/rerere.c
+++ b/rerere.c
@@ -1005,11 +1005,6 @@ static void unlink_rr_item(struct rerere_id *id)
unlink(rerere_path(id, "thisimage"));
unlink(rerere_path(id, "preimage"));
unlink(rerere_path(id, "postimage"));
- /*
- * NEEDSWORK: what if this rmdir() fails? Wouldn't we then
- * assume that we already have preimage recorded in
- * do_plain_rerere()?
- */
rmdir(rerere_path(id, NULL));
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: jc/rerere-multi
2016-01-21 12:09 ` jc/rerere-multi (was: What's cooking in git.git (Jan 2016, #04; Wed, 20)) Johannes Sixt
@ 2016-01-21 22:07 ` Junio C Hamano
2016-03-08 22:15 ` jc/rerere-multi Junio C Hamano
0 siblings, 1 reply; 10+ messages in thread
From: Junio C Hamano @ 2016-01-21 22:07 UTC (permalink / raw)
To: Johannes Sixt; +Cc: git
Johannes Sixt <j6t@kdbg.org> writes:
> I finally found some time to test and review this series. I have one
> case where there are many identical conflicts (up to 15!) that rerere
> was unable to resolve. But with this series applied, all of them are
> now resolved automatically and correctly. That's a nice achievement!
>
> Tested-by: Johannes Sixt <j6t@kdbg.org>
>
> I don't have the original submission anymore. So, I'm responding here.
>
> Generally, the patches make sense.
Thanks. As the tip commit says, this is still incomplete in that
"record and replay" part should work reasonably well, but things
like "forget" and "gc" are areas that needs further looking into.
> Except for 510936082eb4 "handle leftover rr-cache/$ID directory and
> postimage files": After the subsequent e2a6344cca47 "delay the
> recording of preimage" is in place, nothing of what the former patch
> changed (except test cases) remains, and the problem that the former
> solved is still solved, and in addition the NEEDSWORK that the former
> introduced is resolved by the latter. I think the two should be
> squashed together.
Yeah, they were originally done as separate patches as I felt 'delay
the recording' step was much riskier and I was shooting for a series
whose earlier parts can be moved forward independently if necessary
in order to keep the size of the really hard part that has to be in
flight longer time manageably small.
But re-reading these two with fresh eyes, I think it is OK to squash
them into one.
> e2a6344cca47 (rerere: delay the recording of preimage) needs this
> fixup, I think:
Thanks for catching this (and this needs to be carried forward to
7/7 as well, I think). This shows how little testing the new code
has gone through--a test certainly would have prepared an entry in
the rerere database with a stale postimage without the matching
preimage and noticed that things going wrong.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)
2016-01-20 23:33 What's cooking in git.git (Jan 2016, #04; Wed, 20) Junio C Hamano
2016-01-21 12:09 ` jc/rerere-multi (was: What's cooking in git.git (Jan 2016, #04; Wed, 20)) Johannes Sixt
@ 2016-01-22 16:58 ` Johannes Schindelin
2016-01-22 17:57 ` Junio C Hamano
2016-01-26 9:47 ` Lars Schneider
2 siblings, 1 reply; 10+ messages in thread
From: Johannes Schindelin @ 2016-01-22 16:58 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Hi Junio,
On Wed, 20 Jan 2016, Junio C Hamano wrote:
> * bb/merge-marker-crlf (2015-11-24) 1 commit
> - merge-file: consider core.crlf when writing merge markers
>
> Write out merge markers using system end-of-line convention.
>
> Waiting for a re-roll to handle gitattributes.
> ($gmane/281701)
For the record, it is $gmane/281700.
I will send out a replacement series shortly.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)
2016-01-22 16:58 ` What's cooking in git.git (Jan 2016, #04; Wed, 20) Johannes Schindelin
@ 2016-01-22 17:57 ` Junio C Hamano
0 siblings, 0 replies; 10+ messages in thread
From: Junio C Hamano @ 2016-01-22 17:57 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> On Wed, 20 Jan 2016, Junio C Hamano wrote:
>
>> * bb/merge-marker-crlf (2015-11-24) 1 commit
>> - merge-file: consider core.crlf when writing merge markers
>>
>> Write out merge markers using system end-of-line convention.
>>
>> Waiting for a re-roll to handle gitattributes.
>> ($gmane/281701)
>
> For the record, it is $gmane/281700.
Not quite; 281701 is a more correct reference than 281700 at two
counts. One of them is not your fault, as I haven't explained what
these references _mean_. These references are not about "Go there
to get the original e-mail of the patch." And 281700 is wrong by
being off by 100, as the original patch is $gmane/281600, even if
these references meant what you thought they did ;-).
These are "Go there to learn more about the reason behind the
statement above." I (or anybody) visits 281701 and sees an
unresolved comment in the discussion thread to realize that the
maintainer is doing the right thing by not moving the version that
is queued forward prematurely before issues are resolved.
> I will send out a replacement series shortly.
Thanks.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)
2016-01-20 23:33 What's cooking in git.git (Jan 2016, #04; Wed, 20) Junio C Hamano
2016-01-21 12:09 ` jc/rerere-multi (was: What's cooking in git.git (Jan 2016, #04; Wed, 20)) Johannes Sixt
2016-01-22 16:58 ` What's cooking in git.git (Jan 2016, #04; Wed, 20) Johannes Schindelin
@ 2016-01-26 9:47 ` Lars Schneider
2016-01-26 22:58 ` Junio C Hamano
2 siblings, 1 reply; 10+ messages in thread
From: Lars Schneider @ 2016-01-26 9:47 UTC (permalink / raw)
To: Junio C Hamano, Stefan Beller; +Cc: Git Users
On 21 Jan 2016, at 00:33, Junio C Hamano <gitster@pobox.com> wrote:
> 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 ones marked with '.' do not appear in any of
> the integration branches, but I am still holding onto them.
>
> The tip of 'master' now has second batch of topics merged, some of
> which should later be merged to 'maint'. There are a few topics
> that are v2.7.0 regression fixes still cooking outside 'master',
> which also need to be merged to 'maint' for the maintenance release.
>
> 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
Hi Junio,
Did you miss the topic "submodule: extend die message on failed checkout with depth argument" or do you not agree with it ($gmane/282779)? Stefan Beller reviewed the commits ($gmane/283666 and $gmane/283851).
Thanks,
Lars
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)
2016-01-26 9:47 ` Lars Schneider
@ 2016-01-26 22:58 ` Junio C Hamano
2016-01-27 8:46 ` Lars Schneider
0 siblings, 1 reply; 10+ messages in thread
From: Junio C Hamano @ 2016-01-26 22:58 UTC (permalink / raw)
To: Lars Schneider; +Cc: Stefan Beller, Git Users
Lars Schneider <larsxschneider@gmail.com> writes:
> Hi Junio,
>
> Did you miss the topic "submodule: extend die message on failed
> checkout with depth argument" or do you not agree with it
> ($gmane/282779)? Stefan Beller reviewed the commits ($gmane/283666
> and $gmane/283851).
No, these three are still in my inbox.
Quite honestly, "test to demonstrate breakage" alone is not all that
interesting to me unless I get a firm impression that somebody is
(or will soon be) working on fixing the breakage--which would make
it worth keeping track of it in my tree, to allow the eventual fix
to be more easily verified and protected from getting broken again.
Also "these look good to me" without much explanation is not much of
a review, and such a comment on a "demonstrate breakage" did not add
to the sense of urgency to the issue, either.
That was why it has been sitting near the bottom of the pile.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)
2016-01-26 22:58 ` Junio C Hamano
@ 2016-01-27 8:46 ` Lars Schneider
2016-01-27 18:03 ` Stefan Beller
0 siblings, 1 reply; 10+ messages in thread
From: Lars Schneider @ 2016-01-27 8:46 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Stefan Beller, Git Users
On 26 Jan 2016, at 23:58, Junio C Hamano <gitster@pobox.com> wrote:
> Lars Schneider <larsxschneider@gmail.com> writes:
>
>> Hi Junio,
>>
>> Did you miss the topic "submodule: extend die message on failed
>> checkout with depth argument" or do you not agree with it
>> ($gmane/282779)? Stefan Beller reviewed the commits ($gmane/283666
>> and $gmane/283851).
>
> No, these three are still in my inbox.
>
> Quite honestly, "test to demonstrate breakage" alone is not all that
> interesting to me unless I get a firm impression that somebody is
> (or will soon be) working on fixing the breakage--which would make
> it worth keeping track of it in my tree, to allow the eventual fix
> to be more easily verified and protected from getting broken again.
> Also "these look good to me" without much explanation is not much of
> a review, and such a comment on a "demonstrate breakage" did not add
> to the sense of urgency to the issue, either.
>
> That was why it has been sitting near the bottom of the pile.
OK, I get your point. I got the impression that Stefan is on to a fix ($gmane/281260). Looks like he is not and I need to learn more about Git to tackle fixes of this scope. Would it be an option for you to just drop patch 1/3 from this series and look at the remaining ones? 2/3 fixes an "&& chain issue" ($gmane/282776) and 3/3 prints a explanatory user warning instead of an incomprehensible error ($gmane/282777).
Thanks,
Lars
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)
2016-01-27 8:46 ` Lars Schneider
@ 2016-01-27 18:03 ` Stefan Beller
0 siblings, 0 replies; 10+ messages in thread
From: Stefan Beller @ 2016-01-27 18:03 UTC (permalink / raw)
To: Lars Schneider; +Cc: Junio C Hamano, Git Users
On Wed, Jan 27, 2016 at 12:46 AM, Lars Schneider
<larsxschneider@gmail.com> wrote:
>
> On 26 Jan 2016, at 23:58, Junio C Hamano <gitster@pobox.com> wrote:
>
>> Lars Schneider <larsxschneider@gmail.com> writes:
>>
>>> Hi Junio,
>>>
>>> Did you miss the topic "submodule: extend die message on failed
>>> checkout with depth argument" or do you not agree with it
>>> ($gmane/282779)? Stefan Beller reviewed the commits ($gmane/283666
>>> and $gmane/283851).
>>
>> No, these three are still in my inbox.
>>
>> Quite honestly, "test to demonstrate breakage" alone is not all that
>> interesting to me unless I get a firm impression that somebody is
>> (or will soon be) working on fixing the breakage--which would make
>> it worth keeping track of it in my tree, to allow the eventual fix
>> to be more easily verified and protected from getting broken again.
>> Also "these look good to me" without much explanation is not much of
>> a review, and such a comment on a "demonstrate breakage" did not add
>> to the sense of urgency to the issue, either.
>>
>> That was why it has been sitting near the bottom of the pile.
>
> OK, I get your point. I got the impression that Stefan is on to a fix ($gmane/281260). Looks like he is not and I need to learn more about Git to tackle fixes of this scope.
I was on it and I put it on hold as I wanted to prioritize
sb/submodule-parallel-update,
sb/submodule-init and the upcoming sb/submodule-groups (maybe that's called
sb/submodule-autoInit, its scope is still being bikehedded)
Coming back to $gmane/281260 with a fresh mind, I think
this is what we want on the client side:
1) fetch as we always did. During this fetch we learn from the
servers capabilities list, if it supports fetching direct sha1s.
2) if the needed sha1 has been fetched in step 1, stop.
3) fetch the needed sha1 directly if the server supports it.
4) if the server doesn't support it, display a message like:
"Please ask your Git server admin, to run at least Git 2.4.0
and enable uploadpack.allowReachableSHA1InWant to have
submodules working properly"
Currently we only perform step 1 and this yields the error when
fetching too shallow to have the needed sha1 included.
The server side should be ok as soon as uploadpack.allowReachableSHA1InWant
is enabled. I thought we would need to add another option, but it
looks like that
option is exactly what we need here.
If you want to give it a try, I'll be happy to review patches!
(with more than "these look good to me" ;)
Thanks,
Stefan
> Would it be an option for you to just drop patch 1/3 from this series and look at the remaining ones? 2/3 fixes an "&& chain issue" ($gmane/282776) and 3/3 prints a explanatory user warning instead of an incomprehensible error ($gmane/282777).
>
> Thanks,
> Lars
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: jc/rerere-multi
2016-01-21 22:07 ` jc/rerere-multi Junio C Hamano
@ 2016-03-08 22:15 ` Junio C Hamano
0 siblings, 0 replies; 10+ messages in thread
From: Junio C Hamano @ 2016-03-08 22:15 UTC (permalink / raw)
To: git; +Cc: Johannes Sixt
Junio C Hamano <gitster@pobox.com> writes:
> Johannes Sixt <j6t@kdbg.org> writes:
>
>> Generally, the patches make sense.
>
> Thanks. As the tip commit says, this is still incomplete in that
> "record and replay" part should work reasonably well, but things
> like "forget" and "gc" are areas that needs further looking into.
So here is "gc" and "clear" bits. I still need to see if I need to
do anything with "forget" for the series to be complete.
Of course, this is not urgent.
-- >8 --
Subject: [PATCH] rerere: gc and clear
Adjust "git rerere gc" and "git rerere clear" to the new world order
with rerere database with multiple variants for the same shape of
conflicts.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
rerere.c | 87 ++++++++++++++++++++++++++++++-------------------------
t/t4200-rerere.sh | 82 ++++++++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 123 insertions(+), 46 deletions(-)
diff --git a/rerere.c b/rerere.c
index 7b9007a..7a657d4 100644
--- a/rerere.c
+++ b/rerere.c
@@ -1077,29 +1077,16 @@ int rerere_forget(struct pathspec *pathspec)
* Garbage collection support
*/
-/*
- * Note that this is not reentrant but is used only one-at-a-time
- * so it does not matter right now.
- */
-static struct rerere_id *dirname_to_id(const char *name)
-{
- static struct rerere_id id;
- id.collection = find_rerere_dir(name);
- return &id;
-}
-
-static time_t rerere_created_at(const char *dir_name)
+static time_t rerere_created_at(struct rerere_id *id)
{
struct stat st;
- struct rerere_id *id = dirname_to_id(dir_name);
return stat(rerere_path(id, "preimage"), &st) ? (time_t) 0 : st.st_mtime;
}
-static time_t rerere_last_used_at(const char *dir_name)
+static time_t rerere_last_used_at(struct rerere_id *id)
{
struct stat st;
- struct rerere_id *id = dirname_to_id(dir_name);
return stat(rerere_path(id, "postimage"), &st) ? (time_t) 0 : st.st_mtime;
}
@@ -1109,15 +1096,28 @@ static time_t rerere_last_used_at(const char *dir_name)
*/
static void unlink_rr_item(struct rerere_id *id)
{
- unlink(rerere_path(id, "thisimage"));
- unlink(rerere_path(id, "preimage"));
- unlink(rerere_path(id, "postimage"));
- /*
- * NEEDSWORK: what if this rmdir() fails? Wouldn't we then
- * assume that we already have preimage recorded in
- * do_plain_rerere()?
- */
- rmdir(rerere_path(id, NULL));
+ unlink_or_warn(rerere_path(id, "thisimage"));
+ remove_variant(id);
+ id->collection->status[id->variant] = 0;
+}
+
+static void prune_one(struct rerere_id *id, time_t now,
+ int cutoff_resolve, int cutoff_noresolve)
+{
+ time_t then;
+ int cutoff;
+
+ then = rerere_last_used_at(id);
+ if (then)
+ cutoff = cutoff_resolve;
+ else {
+ then = rerere_created_at(id);
+ if (!then)
+ return;
+ cutoff = cutoff_noresolve;
+ }
+ if (then < now - cutoff * 86400)
+ unlink_rr_item(id);
}
void rerere_gc(struct string_list *rr)
@@ -1125,8 +1125,8 @@ void rerere_gc(struct string_list *rr)
struct string_list to_remove = STRING_LIST_INIT_DUP;
DIR *dir;
struct dirent *e;
- int i, cutoff;
- time_t now = time(NULL), then;
+ int i;
+ time_t now = time(NULL);
int cutoff_noresolve = 15;
int cutoff_resolve = 60;
@@ -1138,25 +1138,32 @@ void rerere_gc(struct string_list *rr)
die_errno("unable to open rr-cache directory");
/* Collect stale conflict IDs ... */
while ((e = readdir(dir))) {
+ struct rerere_dir *rr_dir;
+ struct rerere_id id;
+ int now_empty;
+
if (is_dot_or_dotdot(e->d_name))
continue;
-
- then = rerere_last_used_at(e->d_name);
- if (then) {
- cutoff = cutoff_resolve;
- } else {
- then = rerere_created_at(e->d_name);
- if (!then)
- continue;
- cutoff = cutoff_noresolve;
+ rr_dir = find_rerere_dir(e->d_name);
+ if (!rr_dir)
+ continue; /* or should we remove e->d_name? */
+
+ now_empty = 1;
+ for (id.variant = 0, id.collection = rr_dir;
+ id.variant < id.collection->status_nr;
+ id.variant++) {
+ prune_one(&id, now, cutoff_resolve, cutoff_noresolve);
+ if (id.collection->status[id.variant])
+ now_empty = 0;
}
- if (then < now - cutoff * 86400)
+ if (now_empty)
string_list_append(&to_remove, e->d_name);
}
closedir(dir);
- /* ... and then remove them one-by-one */
+
+ /* ... and then remove the empty directories */
for (i = 0; i < to_remove.nr; i++)
- unlink_rr_item(dirname_to_id(to_remove.items[i].string));
+ rmdir(git_path("rr-cache/%s", to_remove.items[i].string));
string_list_clear(&to_remove, 0);
}
@@ -1173,8 +1180,10 @@ void rerere_clear(struct string_list *merge_rr)
for (i = 0; i < merge_rr->nr; i++) {
struct rerere_id *id = merge_rr->items[i].util;
- if (!has_rerere_resolution(id))
+ if (!has_rerere_resolution(id)) {
unlink_rr_item(id);
+ rmdir(rerere_path(id, NULL));
+ }
}
unlink_or_warn(git_path("MERGE_RR"));
}
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 5649829..38bf45c 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -413,6 +413,39 @@ concat_insert () {
cat early && printf "%s\n" "$@" && cat late "$last"
}
+count_pre_post () {
+ find .git/rr-cache/ -type f -name "preimage*" >actual &&
+ test_line_count = "$1" actual &&
+ find .git/rr-cache/ -type f -name "postimage*" >actual &&
+ test_line_count = "$2" actual
+}
+
+test_expect_success 'rerere gc' '
+ find .git/rr-cache -type f >original &&
+ xargs test-chmtime -172800 <original &&
+
+ git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+ find .git/rr-cache -type f >actual &&
+ test_cmp original actual &&
+
+ git -c gc.rerereresolved=5 -c gc.rerereunresolved=0 rerere gc &&
+ find .git/rr-cache -type f >actual &&
+ test_cmp original actual &&
+
+ git -c gc.rerereresolved=0 -c gc.rerereunresolved=0 rerere gc &&
+ find .git/rr-cache -type f >actual &&
+ >expect &&
+ test_cmp expect actual
+'
+
+merge_conflict_resolve () {
+ git reset --hard &&
+ test_must_fail git merge six.1 &&
+ # Resolution is to replace 7 with 6.1 and 6.2 (i.e. take both)
+ concat_insert short 6.1 6.2 >file1 &&
+ concat_insert long 6.1 6.2 >file2
+}
+
test_expect_success 'multiple identical conflicts' '
git reset --hard &&
@@ -442,10 +475,9 @@ test_expect_success 'multiple identical conflicts' '
# - six.1 replaces these 7s with 6.1
# - six.2 replaces these 7s with 6.2
- test_must_fail git merge six.1 &&
+ merge_conflict_resolve &&
# Check that rerere knows that file1 and file2 have conflicts
-
printf "%s\n" file1 file2 >expect &&
git ls-files -u | sed -e "s/^.* //" | sort -u >actual &&
test_cmp expect actual &&
@@ -453,19 +485,43 @@ test_expect_success 'multiple identical conflicts' '
git rerere status | sort >actual &&
test_cmp expect actual &&
- # Resolution is to replace 7 with 6.1 and 6.2 (i.e. take both)
- concat_insert short 6.1 6.2 >file1 &&
- concat_insert long 6.1 6.2 >file2 &&
-
git rerere remaining >actual &&
test_cmp expect actual &&
+ count_pre_post 2 0 &&
+
+ # Pretend that the conflicts were made quite some time ago
+ find .git/rr-cache/ -type f | xargs test-chmtime -172800 &&
+
+ # Unresolved entries have not expired yet
+ git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+ count_pre_post 2 0 &&
+
+ # Unresolved entries have expired
+ git -c gc.rerereresolved=5 -c gc.rerereunresolved=1 rerere gc &&
+ count_pre_post 0 0 &&
+
+ # Recreate the conflicted state
+ merge_conflict_resolve &&
+ count_pre_post 2 0 &&
+
+ # Clear it
+ git rerere clear &&
+ count_pre_post 0 0 &&
+
+ # Recreate the conflicted state
+ merge_conflict_resolve &&
+ count_pre_post 2 0 &&
+
# We resolved file1 and file2
git rerere &&
>expect &&
git rerere remaining >actual &&
test_cmp expect actual &&
+ # We must have recorded both of them
+ count_pre_post 2 2 &&
+
# Now we should be able to resolve them both
git reset --hard &&
test_must_fail git merge six.1 &&
@@ -478,7 +534,19 @@ test_expect_success 'multiple identical conflicts' '
concat_insert short 6.1 6.2 >file1.expect &&
concat_insert long 6.1 6.2 >file2.expect &&
test_cmp file1.expect file1 &&
- test_cmp file2.expect file2
+ test_cmp file2.expect file2 &&
+
+ # Pretend again
+ find .git/rr-cache/ -type f | xargs test-chmtime -172800 &&
+
+ # Resolved entries have not expired yet
+ git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
+
+ count_pre_post 2 2 &&
+
+ # Resolved entries have expired
+ git -c gc.rerereresolved=1 -c gc.rerereunresolved=5 rerere gc &&
+ count_pre_post 0 0
'
test_done
--
2.8.0-rc1-141-gbaa22e3
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-03-08 22:15 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-20 23:33 What's cooking in git.git (Jan 2016, #04; Wed, 20) Junio C Hamano
2016-01-21 12:09 ` jc/rerere-multi (was: What's cooking in git.git (Jan 2016, #04; Wed, 20)) Johannes Sixt
2016-01-21 22:07 ` jc/rerere-multi Junio C Hamano
2016-03-08 22:15 ` jc/rerere-multi Junio C Hamano
2016-01-22 16:58 ` What's cooking in git.git (Jan 2016, #04; Wed, 20) Johannes Schindelin
2016-01-22 17:57 ` Junio C Hamano
2016-01-26 9:47 ` Lars Schneider
2016-01-26 22:58 ` Junio C Hamano
2016-01-27 8:46 ` Lars Schneider
2016-01-27 18:03 ` Stefan Beller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).