* What's cooking in git.git (Nov 2018, #03; Wed, 7)
@ 2018-11-07 9:41 Junio C Hamano
2018-11-07 12:29 ` Ævar Arnfjörð Bjarmason
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Junio C Hamano @ 2018-11-07 9:41 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.
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"]
* en/merge-cleanup-more (2018-10-18) 2 commits
(merged to 'next' on 2018-10-26 at c706319c26)
+ merge-recursive: avoid showing conflicts with merge branch before HEAD
+ merge-recursive: improve auto-merging messages with path collisions
(this branch is used by en/merge-path-collision.)
Further clean-up of merge-recursive machinery.
* jc/http-curlver-warnings (2018-10-26) 1 commit
(merged to 'next' on 2018-10-26 at 870e125cec)
+ http: give curl version warnings consistently
(this branch uses js/mingw-http-ssl; is tangled with nd/config-split.)
Warning message fix.
* js/mingw-http-ssl (2018-10-26) 3 commits
(merged to 'next' on 2018-10-26 at 318e82e101)
+ http: when using Secure Channel, ignore sslCAInfo by default
+ http: add support for disabling SSL revocation checks in cURL
+ http: add support for selecting SSL backends at runtime
(this branch is used by jc/http-curlver-warnings and nd/config-split.)
On platforms with recent cURL library, http.sslBackend configuration
variable can be used to choose a different SSL backend at runtime.
The Windows port uses this mechanism to switch between OpenSSL and
Secure Channel while talking over the HTTPS protocol.
* js/mingw-ns-filetime (2018-10-24) 3 commits
(merged to 'next' on 2018-10-29 at 4563a0d9d0)
+ mingw: implement nanosecond-precision file times
+ mingw: replace MSVCRT's fstat() with a Win32-based implementation
+ mingw: factor out code to set stat() data
Windows port learned to use nano-second resolution file timestamps.
* js/remote-archive-dwimfix (2018-10-26) 1 commit
(merged to 'next' on 2018-10-26 at f5bf6946bd)
+ archive: initialize archivers earlier
The logic to determine the archive type "git archive" uses did not
correctly kick in for "git archive --remote", which has been
corrected.
* js/shallow-and-fetch-prune (2018-10-25) 3 commits
(merged to 'next' on 2018-10-26 at 93b7196560)
+ repack -ad: prune the list of shallow commits
+ shallow: offer to prune only non-existing entries
+ repack: point out a bug handling stale shallow info
"git repack" in a shallow clone did not correctly update the
shallow points in the repository, leading to a repository that
does not pass fsck.
* jt/upload-pack-v2-fix-shallow (2018-10-19) 3 commits
(merged to 'next' on 2018-10-29 at d9010b3c7b)
+ upload-pack: clear flags before each v2 request
+ upload-pack: make want_obj not global
+ upload-pack: make have_obj not global
"git fetch" over protocol v2 into a shallow repository failed to
fetch full history behind a new tip of history that was diverged
before the cut-off point of the history that was previously fetched
shallowly.
* jw/send-email-no-auth (2018-10-23) 1 commit
(merged to 'next' on 2018-10-29 at a3fbbdb889)
+ send-email: explicitly disable authentication
"git send-email" learned to disable SMTP authentication via the
"--smtp-auth=none" option, even when the smtp username is given
(which turns the authentication on by default).
* md/exclude-promisor-objects-fix (2018-10-23) 2 commits
(merged to 'next' on 2018-10-29 at fb36a5dcbe)
+ exclude-promisor-objects: declare when option is allowed
+ Documentation/git-log.txt: do not show --exclude-promisor-objects
Operations on promisor objects make sense in the context of only a
small subset of the commands that internally use the revisions
machinery, but the "--exclude-promisor-objects" option were taken
and led to nonsense results by commands like "log", to which it
didn't make much sense. This has been corrected.
* mg/gpg-fingerprint (2018-10-23) 3 commits
(merged to 'next' on 2018-10-26 at 1e219cb754)
+ gpg-interface.c: obtain primary key fingerprint as well
+ gpg-interface.c: support getting key fingerprint via %GF format
+ gpg-interface.c: use flags to determine key/signer info presence
(this branch uses mg/gpg-parse-tighten; is tangled with jc/gpg-cocci-preincr.)
New "--pretty=format:" placeholders %GF and %GP that show the GPG
key fingerprints have been invented.
* mg/gpg-parse-tighten (2018-10-22) 1 commit
(merged to 'next' on 2018-10-26 at efdec77193)
+ gpg-interface.c: detect and reject multiple signatures on commits
(this branch is used by jc/gpg-cocci-preincr and mg/gpg-fingerprint.)
Detect and reject a signature block that has more than one GPG
signature.
* nd/completion-negation (2018-10-22) 1 commit
(merged to 'next' on 2018-10-29 at 87e73b0c72)
+ completion: fix __gitcomp_builtin no longer consider extra options
The command line completion machinery (in contrib/) has been
updated to allow the completion script to tweak the list of options
that are reported by the parse-options machinery correctly.
* nd/submodule-unused-vars (2018-10-22) 1 commit
(merged to 'next' on 2018-10-29 at 33641dcc89)
+ submodule.c: remove some of the_repository references
Code clean-up.
* nd/unpack-trees-with-cache-tree (2018-10-22) 1 commit
(merged to 'next' on 2018-10-29 at de51b606da)
+ read-cache: use of memory after it is freed
Trivial bugfix.
* rj/header-cleanup (2018-10-29) 3 commits
(merged to 'next' on 2018-11-01 at 975e56048f)
+ commit-reach.h: add missing declarations (hdr-check)
+ ewok_rlw.h: add missing 'inline' to function definition
+ fetch-object.h: add missing declaration (hdr-check)
Code cleanup.
* sb/submodule-url-to-absolute (2018-10-18) 1 commit
(merged to 'next' on 2018-10-29 at 4264c150cb)
+ submodule helper: convert relative URL to absolute URL if needed
Some codepaths failed to form a proper URL when .gitmodules record
the URL to a submodule repository as relative to the repository of
superproject, which has been corrected.
* sg/test-rebase-editor-fix (2018-10-29) 1 commit
(merged to 'next' on 2018-11-01 at 271e0fc663)
+ t3404-rebase-interactive: test abbreviated commands
* sg/test-verbose-log (2018-10-30) 1 commit
(merged to 'next' on 2018-11-01 at 0c4a18a71f)
+ test-lib: introduce the '-V' short option for '--verbose-log'
Our test scripts can now take the '-V' option as a synonym for the
'--verbose-log' option.
* ss/travis-ci-force-vm-mode (2018-10-26) 1 commit
(merged to 'next' on 2018-11-01 at 8596bb2a65)
+ travis-ci: no longer use containers
(this branch is used by sg/travis-install-dependencies.)
The "container" mode of TravisCI is going away. Our .travis.yml
file is getting prepared for the transition.
* tb/char-may-be-unsigned (2018-10-26) 1 commit
(merged to 'next' on 2018-11-01 at 9e14f289f8)
+ path.c: char is not (always) signed
Build portability fix.
--------------------------------------------------
[New Topics]
* jk/misc-unused-fixes (2018-11-07) 4 commits
(merged to 'next' on 2018-11-07 at 8438c0b245)
+ approxidate: fix NULL dereference in date_time()
(merged to 'next' on 2018-11-05 at 03429f23c4)
+ pathspec: handle non-terminated strings with :(attr)
+ approxidate: handle pending number for "specials"
+ rev-list: handle flags for --indexed-objects
Assorted fixes for bugs found while auditing -Wunused-parameter
warnings.
Will merge to 'master'.
* jk/xdiff-interface (2018-11-05) 9 commits
(merged to 'next' on 2018-11-05 at 0edd69cdad)
+ xdiff-interface: drop parse_hunk_header()
+ range-diff: use a hunk callback
+ diff: convert --check to use a hunk callback
+ combine-diff: use an xdiff hunk callback
+ diff: use hunk callback for word-diff
+ diff: discard hunk headers for patch-ids earlier
+ diff: avoid generating unused hunk header lines
+ xdiff-interface: provide a separate consume callback for hunks
+ xdiff: provide a separate emit callback for hunks
The interface into "xdiff" library used to discover the offset and
size of a generated patch hunk by first formatting it into the
textual hunk header "@@ -n,m +k,l @@" and then parsing the numbers
out. A new interface has been introduced to allow callers a more
direct access to them.
Will merge to 'master'.
* al/send-email-auto-cte-fixup (2018-11-02) 1 commit
(merged to 'next' on 2018-11-05 at 4ecb1133ce)
+ send-email: avoid empty transfer encoding header
"git send-email --transfer-encoding=..." in recent versions of Git
sometimes produced an empty "Content-Transfer-Encoding:" header,
which has been corrected.
Will merge to 'master'.
* bp/add-diff-files-optim (2018-11-03) 1 commit
(merged to 'next' on 2018-11-06 at cdaeb7924a)
+ add: speed up cmd_add() by utilizing read_cache_preload()
"git add" needs to internally run "diff-files" equivalent, and the
codepath learned the same optimization as "diff-files" has to run
lstat(2) in parallel to find which paths have been updated in the
working tree.
Will merge to 'master'.
* ds/add-missing-tags (2018-11-03) 3 commits
(merged to 'next' on 2018-11-05 at 8388baf76d)
+ remote: make add_missing_tags() linear
+ test-reach: test get_reachable_subset
+ commit-reach: implement get_reachable_subset
The history traversal used to implement the tag-following has been
optimized by introducing a new helper.
Will merge to 'master'.
* ag/rebase-i-in-c (2018-11-05) 1 commit
(merged to 'next' on 2018-11-06 at 8fa9d64898)
+ sequencer.c: remove a stray semicolon
Code clean-up for a topic already in 'master'.
Will merge to 'master'.
* jk/curl-ldflags (2018-11-05) 1 commit
- build: link with curl-defined linker flags
The way -lcurl library gets linked has been simplified by taking
advantage of the fact that we can just ask curl-config command how.
Will merge to 'next'.
* mg/gpg-fingerprint-test (2018-11-05) 2 commits
- t/t7510-signed-commit.sh: add signing subkey to Eris Discordia key
- t/t7510-signed-commit.sh: Add %GP to custom format checks
Add a few tests for a topic already in 'master'.
Will merge to 'next'.
* nd/tree-walk-path-exclusion (2018-11-05) 1 commit
(merged to 'next' on 2018-11-06 at 6499b2d327)
+ tree-walk.c: fix overoptimistic inclusion in :(exclude) matching
Pathspec matching against a tree object were buggy when negative
pathspec elements were involved, which has been fixed.
Will merge to 'master'.
* sb/diff-color-moved-config-option-fixup (2018-11-05) 1 commit
- diff: differentiate error handling in parse_color_moved_ws
* ab/range-diff-no-patch (2018-11-07) 1 commit
- range-diff: add a --no-patch option to show a summary
"range-diff" learns the "--no-patch" option, which can be used to
get a high-level overview without the actual line-by-line patch
difference shown.
Will merge to 'next'.
* jk/unused-parameter-fixes (2018-11-06) 14 commits
- midx: double-check large object write loop
- assert NOARG/NONEG behavior of parse-options callbacks
- parse-options: drop OPT_DATE()
- apply: return -1 from option callback instead of calling exit(1)
- cat-file: report an error on multiple --batch options
- tag: mark "--message" option with NONEG
- show-branch: mark --reflog option as NONEG
- format-patch: mark "--no-numbered" option with NONEG
- status: mark --find-renames option with NONEG
- cat-file: mark batch options with NONEG
- pack-objects: mark index-version option as NONEG
- ls-files: mark exclude options as NONEG
- am: handle --no-patch-format option
- apply: mark include/exclude options as NONEG
Various functions have been audited for "-Wunused-parameter" warnings
and bugs in them got fixed.
Will merge to 'next'.
* ds/push-squelch-ambig-warning (2018-11-07) 1 commit
- pack-objects: ignore ambiguous object warnings
"git push" used to check ambiguities between object-names and
refnames while processing the list of refs' old and new values,
which was unnecessary (as it knew that it is feeding raw object
names). This has been optimized out.
* jk/verify-sig-merge-into-void (2018-11-07) 3 commits
- pull: handle --verify-signatures for unborn branch
- merge: handle --verify-signatures for unborn branch
- merge: extract verify_merge_signature() helper
"git merge" and "git pull" that merges into an unborn branch used
to completely ignore "--verify-signatures", which has been
corrected.
Will merge to 'next'.
* js/mingw-res-rebuild (2018-11-07) 1 commit
- Windows: force-recompile git.res for differing architectures
Windows build update.
Will merge to 'next'.
--------------------------------------------------
[Stalled]
* lt/date-human (2018-07-09) 1 commit
- Add 'human' date format
A new date format "--date=human" that morphs its output depending
on how far the time is from the current time has been introduced.
"--date=auto" can be used to use this new format when the output is
goint to the pager or to the terminal and otherwise the default
format.
--------------------------------------------------
[Cooking]
* ab/dynamic-gettext-poison (2018-11-02) 1 commit
- i18n: make GETTEXT_POISON a runtime option
On hold.
cf. <20181102163725.GY30222@szeder.dev>
* js/rebase-p-tests (2018-11-02) 3 commits
(merged to 'next' on 2018-11-03 at fc8d97465f)
+ tests: optionally skip `git rebase -p` tests
+ t3418: decouple test cases from a previous `rebase -p` test case
+ t3404: decouple some test cases from outcomes of previous test cases
In preparation to the day when we can deprecate and remove the
"rebase -p", make sure we can skip and later remove tests for
it.
Will merge to 'master'.
* sg/travis-install-dependencies (2018-11-02) 1 commit
(merged to 'next' on 2018-11-06 at b86e3a2792)
+ travis-ci: install packages in 'ci/install-dependencies.sh'
The procedure to install dependencies before testing at Travis CI
is getting revamped for both simplicity and flexibility, taking
advantage of the recent move to the vm-based environment.
Will merge to 'master'.
* ab/push-dwim-dst (2018-10-29) 9 commits
- SQUASH???
- push doc: document the DWYM behavior pushing to unqualified <dst>
- push: add DWYM support for "git push refs/remotes/...:<dst>"
- push: test that <src> doesn't DWYM if <dst> is unqualified
- push: add an advice on unqualified <dst> push
- push: move unqualified refname error into a function
- push: improve the error shown on unqualified <dst> push
- i18n: remote.c: mark error(...) messages for translation
- remote.c: add braces in anticipation of a follow-up change
"git push $there $src:$dst" rejects when $dst is not a fully
qualified refname and not clear what the end user meant. The
codepath has been taught to give a clearer error message, and also
guess where the push should go by taking the type of the pushed
object into account (e.g. a tag object would want to go under
refs/tags/).
The last few steps are questionable.
cf. <87in1lkw54.fsf@evledraar.gmail.com>
* md/list-lazy-objects-fix (2018-10-29) 1 commit
- list-objects.c: don't segfault for missing cmdline objects
"git rev-list --exclude-promissor-objects" had to take an object
that does not exist locally (and is lazily available) from the
command line without barfing, but the code dereferenced NULL.
That sympotom may be worth addressing, but I think the "fix" is
overly broad and is wrong. Giving a missing object should be
diagnosed as an error, not swept under the rug silently.
* nd/i18n (2018-11-06) 16 commits
- fsck: mark strings for translation
- fsck: reduce word legos to help i18n
- parse-options.c: mark more strings for translation
- parse-options.c: turn some die() to BUG()
- parse-options: replace opterror() with optname()
- repack: mark more strings for translation
- remote.c: mark messages for translation
- remote.c: turn some error() or die() to BUG()
- reflog: mark strings for translation
- read-cache.c: add missing colon separators
- read-cache.c: mark more strings for translation
- read-cache.c: turn die("internal error") to BUG()
- attr.c: mark more string for translation
- archive.c: mark more strings for translation
- alias.c: mark split_cmdline_strerror() strings for translation
- git.c: mark more strings for translation
More _("i18n") markings.
* nd/pthreads (2018-11-05) 14 commits
- Clean up pthread_create() error handling
- read-cache.c: initialize copy_len to shut up gcc 8
- read-cache.c: reduce branching based on HAVE_THREADS
- read-cache.c: remove #ifdef NO_PTHREADS
- pack-objects: remove #ifdef NO_PTHREADS
- preload-index.c: remove #ifdef NO_PTHREADS
- grep: clean up num_threads handling
- grep: remove #ifdef NO_PTHREADS
- attr.c: remove #ifdef NO_PTHREADS
- name-hash.c: remove #ifdef NO_PTHREADS
- index-pack: remove #ifdef NO_PTHREADS
- send-pack.c: move async's #ifdef NO_PTHREADS back to run-command.c
- run-command.h: include thread-utils.h instead of pthread.h
- thread-utils: macros to unconditionally compile pthreads API
The codebase has been cleaned up to reduce "#ifndef NO_PTHREADS".
Will merge to 'next'.
* nd/wildmatch-double-asterisk (2018-10-29) 1 commit
(merged to 'next' on 2018-11-01 at 627186d020)
+ wildmatch: change behavior of "foo**bar" in WM_PATHNAME mode
A pattern with '**' that does not have a slash on either side used
to be an invalid one, but the code now treats such double-asterisks
the same way as two normal asterisks that happen to be adjacent to
each other.
Will merge to 'master'.
* bp/refresh-index-using-preload (2018-11-06) 2 commits
(merged to 'next' on 2018-11-06 at d9b9d8f559)
+ refresh_index: remove unnecessary calls to preload_index()
(merged to 'next' on 2018-11-01 at 289e6bcece)
+ speed up refresh_index() by utilizing preload_index()
The helper function to refresh the cached stat information in the
in-core index has learned to perform the lstat() part of the
operation in parallel on multi-core platforms.
Will merge to 'master'.
* ab/pack-tests-cleanup (2018-10-31) 3 commits
(merged to 'next' on 2018-11-03 at b4a39595bb)
+ index-pack tests: don't leave test repo dirty at end
+ pack-objects tests: don't leave test .git corrupt at end
+ pack-objects test: modernize style
A couple of tests used to leave the repository in a state that is
deliberately corrupt, which have been corrected.
Will merge to 'master'.
* jk/detect-truncated-zlib-input (2018-10-31) 4 commits
(merged to 'next' on 2018-11-03 at 4952b4412b)
+ Adjust for 2.19.x series
+ cat-file: handle streaming failures consistently
+ check_stream_sha1(): handle input underflow
+ t1450: check large blob in trailing-garbage test
A regression in Git 2.12 era made "git fsck" fall into an infinite
loop while processing truncated loose objects.
Will merge to 'master'.
* jk/proto-v2-ref-prefix-fix (2018-10-31) 2 commits
(merged to 'next' on 2018-11-03 at 3a203db692)
+ ls-remote: pass heads/tags prefixes to transport
+ ls-remote: do not send ref prefixes for patterns
"git ls-remote $there foo" was broken by recent update for the
protocol v2 and stopped showing refs that match 'foo' that are not
refs/{heads,tags}/foo, which has been fixed.
Will merge to 'master'.
* jk/stream-pack-non-delta-clarification (2018-10-31) 1 commit
(merged to 'next' on 2018-11-03 at bd386692c8)
+ read_istream_pack_non_delta(): document input handling
Additional comment on a tricky piece of code to help developers.
Will merge to 'master'.
* js/mingw-isatty-and-dup2 (2018-10-31) 1 commit
(merged to 'next' on 2018-11-03 at 0616899d9e)
+ mingw: fix isatty() after dup2()
Windows fix.
Will merge to 'master'.
* js/mingw-perl5lib (2018-10-31) 4 commits
(merged to 'next' on 2018-11-03 at 2fa516f3ae)
+ mingw: unset PERL5LIB by default
+ config: move Windows-specific config settings into compat/mingw.c
+ config: allow for platform-specific core.* config settings
+ config: rename `dummy` parameter to `cb` in git_default_config()
Windows fix.
Will merge to 'master'.
* js/mingw-utf8-env (2018-10-31) 2 commits
(merged to 'next' on 2018-11-03 at f6c5a8b609)
+ mingw: reencode environment variables on the fly (UTF-16 <-> UTF-8)
+ t7800: fix quoting
Windows fix.
Will merge to 'master'.
* ma/sequencer-do-reset-saner-loop-termination (2018-10-31) 1 commit
(merged to 'next' on 2018-11-03 at 99da78997d)
+ sequencer: break out of loop explicitly
Code readability fix.
Will merge to 'master'.
* nb/worktree-api-doc (2018-10-31) 2 commits
(merged to 'next' on 2018-11-03 at de9befb1f3)
+ worktree: rename is_worktree_locked to worktree_lock_reason
+ worktree: update documentation for lock_reason and lock_reason_valid
Code readability fix.
Will merge to 'master'.
* sh/mingw-safer-compat-poll (2018-11-05) 1 commit
(merged to 'next' on 2018-11-05 at 933a940a68)
+ poll: use GetTickCount64() to avoid wrap-around issues
Windows fix.
Will merge to 'master'.
* sb/more-repo-in-api (2018-10-19) 19 commits
- submodule: don't add submodule as odb for push
- submodule: use submodule repos for object lookup
- pretty: prepare format_commit_message to handle arbitrary repositories
- commit: prepare logmsg_reencode to handle arbitrary repositories
- commit: prepare repo_unuse_commit_buffer to handle arbitrary repositories
- commit: prepare get_commit_buffer to handle arbitrary repositories
- commit-reach: prepare in_merge_bases[_many] to handle arbitrary repositories
- commit-reach: prepare get_merge_bases to handle arbitrary repositories
- commit-reach.c: allow get_merge_bases_many_0 to handle arbitrary repositories
- commit-reach.c: allow remove_redundant to handle arbitrary repositories
- commit-reach.c: allow merge_bases_many to handle arbitrary repositories
- commit-reach.c: allow paint_down_to_common to handle arbitrary repositories
- commit: allow parse_commit* to handle arbitrary repositories
- object: parse_object to honor its repository argument
- object-store: prepare has_{sha1, object}_file[_with_flags] to handle arbitrary repositories
- object-store: prepare read_object_file to deal with arbitrary repositories
- object-store: allow read_object_file_extended to read from arbitrary repositories
- packfile: allow has_packed_and_bad to handle arbitrary repositories
- sha1_file: allow read_object to read objects in arbitrary repositories
The in-core repository instances are passed through more codepaths.
On hold.
Not quite correct?
cf. <20181025091406.GK30222@szeder.dev>
Reroll being worked on.
cf. <20181030220817.61691-1-sbeller@google.com>
* en/merge-path-collision (2018-11-05) 10 commits
- fixup! merge-recursive: improve rename/rename(1to2)/add[/add] handling
- fixup! merge-recursive: fix rename/add conflict handling
- merge-recursive: improve rename/rename(1to2)/add[/add] handling
- merge-recursive: use handle_file_collision for add/add conflicts
- merge-recursive: improve handling for rename/rename(2to1) conflicts
- merge-recursive: fix rename/add conflict handling
- merge-recursive: new function for better colliding conflict resolutions
- merge-recursive: increase marker length with depth of recursion
- t6036, t6042: testcases for rename collision of already conflicting files
- Add testcases for consistency in file collision conflict handling
Updates for corner cases in merge-recursive.
* jt/tighten-fetch-proto-v2-response (2018-11-01) 1 commit
(merged to 'next' on 2018-11-03 at 310fe3f2c3)
+ fetch-pack: be more precise in parsing v2 response
"git fetch" was a bit loose in parsing resposes from the other side
when talking over the protocol v2.
Will merge to 'master'.
* nd/complete-format-patch (2018-11-06) 1 commit
(merged to 'next' on 2018-11-06 at 7f4c58c9d0)
+ completion: use __gitcomp_builtin for format-patch
The support for format-patch (and send-email) by the command-line
completion script (in contrib/) has been simplified a bit.
Will merge to 'master'.
* nd/config-split (2018-10-29) 79 commits
(merged to 'next' on 2018-11-03 at a336559101)
+ config.txt: remove config/dummy.txt
+ config.txt: move worktree.* to a separate file
+ config.txt: move web.* to a separate file
+ config.txt: move versionsort.* to a separate file
+ config.txt: move user.* to a separate file
+ config.txt: move url.* to a separate file
+ config.txt: move uploadpack.* to a separate file
+ config.txt: move uploadarchive.* to a separate file
+ config.txt: move transfer.* to a separate file
+ config.txt: move tag.* to a separate file
+ config.txt: move submodule.* to a separate file
+ config.txt: move stash.* to a separate file
+ config.txt: move status.* to a separate file
+ config.txt: move splitIndex.* to a separate file
+ config.txt: move showBranch.* to a separate file
+ config.txt: move sequencer.* to a separate file
+ config.txt: move sendemail-config.txt to config/
+ config.txt: move reset.* to a separate file
+ config.txt: move rerere.* to a separate file
+ config.txt: move repack.* to a separate file
+ config.txt: move remotes.* to a separate file
+ config.txt: move remote.* to a separate file
+ config.txt: move receive-config.txt to config/
+ config.txt: move rebase-config.txt to config/
+ config.txt: move push-config.txt to config/
+ config.txt: move pull-config.txt to config/
+ config.txt: move protocol.* to a separate file
+ config.txt: move pretty.* to a separate file
+ config.txt: move pager.* to a separate file
+ config.txt: move pack.* to a separate file
+ config.txt: move notes.* to a separate file
+ config.txt: move mergetool.* to a separate file
+ config.txt: move merge-config.txt to config/
+ config.txt: move man.* to a separate file
+ config.txt: move mailmap.* to a separate file
+ config.txt: move mailinfo.* to a separate file
+ config.txt: move log.* to a separate file
+ config.txt: move interactive.* to a separate file
+ config.txt: move instaweb.* to a separate file
+ config.txt: move init.* to a separate file
+ config.txt: move index.* to a separate file
+ git-imap-send.txt: move imap.* to a separate file
+ config.txt: move i18n.* to a separate file
+ config.txt: move http.* to a separate file
+ config.txt: move ssh.* to a separate file
+ config.txt: move help.* to a separate file
+ config.txt: move guitool.* to a separate file
+ config.txt: move gui-config.txt to config/
+ config.txt: move gpg.* to a separate file
+ config.txt: move grep.* to a separate file
+ config.txt: move gitweb.* to a separate file
+ config.txt: move gitcvs-config.txt to config/
+ config.txt: move gc.* to a separate file
+ config.txt: move fsck.* to a separate file
+ config.txt: move fmt-merge-msg-config.txt to config/
+ config.txt: move format-config.txt to config/
+ config.txt: move filter.* to a separate file
+ config.txt: move fetch-config.txt to config/
+ config.txt: move fastimport.* to a separate file
+ config.txt: move difftool.* to a separate file
+ config.txt: move diff-config.txt to config/
+ config.txt: move completion.* to a separate file
+ config.txt: move credential.* to a separate file
+ config.txt: move commit.* to a separate file
+ config.txt: move column.* to a separate file
+ config.txt: move color.* to a separate file
+ config.txt: move clean.* to a separate file
+ config.txt: move checkout.* to a separate file
+ config.txt: move browser.* to a separate file
+ config.txt: move branch.* to a separate file
+ config.txt: move blame.* to a separate file
+ config.txt: move apply.* to a separate file
+ config.txt: move am.* to a separate file
+ config.txt: move alias.* to a separate file
+ config.txt: move add.* to a separate file
+ config.txt: move core.* to a separate file
+ config.txt: move advice.* to a separate file
+ Update makefile in preparation for Documentation/config/*.txt
+ Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split
(this branch uses bp/reset-quiet.)
Split the overly large Documentation/config.txt file into million
little pieces. This potentially allows each individual piece
included into the manual page of the command it affects more easily.
Will merge to 'master'.
This is a painful conversions while many other topics in flight
wants to add to or edit the documentation of configuration
variables.
* nd/per-worktree-config (2018-10-22) 2 commits
(merged to 'next' on 2018-11-01 at 3746343ca8)
+ worktree: add per-worktree config files
+ t1300: extract and use test_cmp_config()
A fourth class of configuration files (in addition to the
traditional "system wide", "per user in the $HOME directory" and
"per repository in the $GIT_DIR/config") has been introduced so
that different worktrees that share the same repository (hence the
same $GIT_DIR/config file) can use different customization.
Will merge to 'master'.
* ag/rev-parse-all-exclude-fix (2018-11-01) 1 commit
(merged to 'next' on 2018-11-03 at 49730558fa)
+ rev-parse: clear --exclude list after 'git rev-parse --all'
"git rev-parse --exclude=* --branches --branches" (i.e. first
saying "add only things that do not match '*' out of all branches"
and then adding all branches, without any exclusion this time")
worked as expected, but "--exclude=* --all --all" did not work the
same way, which has been fixed.
Will merge to 'master'.
* bp/reset-quiet (2018-10-24) 3 commits
(merged to 'next' on 2018-10-29 at 71f4fbc802)
+ reset: warn when refresh_index() takes more than 2 seconds
+ reset: add new reset.quiet config setting
+ reset: don't compute unstaged changes after reset when --quiet
(this branch is used by nd/config-split.)
"git reset --quiet" no longer runs "update-index --refresh"
internally, which shifts the refresh cost away from the command.
Will merge to 'master'.
* sd/stash-wo-user-name (2018-11-02) 1 commit
- t3903-stash: test without configured user.name and user.email
An early part of a wip.
* pw/am-rebase-read-author-script (2018-11-01) 5 commits
(merged to 'next' on 2018-11-03 at bb6c32fe16)
+ sequencer: use read_author_script()
+ add read_author_script() to libgit
+ am: rename read_author_script()
+ am: improve author-script error reporting
+ am: don't die in read_author_script()
Unify code to read the author-script used in "git am" and the
commands that use the sequencer machinery, e.g. "git rebase -i".
Will merge to 'master'.
* bc/sha-256 (2018-11-05) 12 commits
- hash: add an SHA-256 implementation using OpenSSL
- sha256: add an SHA-256 implementation using libgcrypt
- Add a base implementation of SHA-256 support
- commit-graph: convert to using the_hash_algo
- t/helper: add a test helper to compute hash speed
- sha1-file: add a constant for hash block size
- t: make the sha1 test-tool helper generic
- t: add basic tests for our SHA-1 implementation
- cache: make hashcmp and hasheq work with larger hashes
- hex: introduce functions to print arbitrary hashes
- sha1-file: provide functions to look up hash algorithms
- sha1-file: rename algorithm to "sha1"
Add sha-256 hash and plug it through the code to allow building Git
with the "NewHash".
* js/vsts-ci (2018-10-16) 13 commits
- travis: fix skipping tagged releases
- README: add a build badge (status of the Azure Pipelines build)
- tests: record more stderr with --write-junit-xml in case of failure
- tests: include detailed trace logs with --write-junit-xml upon failure
- git-p4: use `test_atexit` to kill the daemon
- git-daemon: use `test_atexit` in the tests
- tests: introduce `test_atexit`
- ci: add a build definition for Azure DevOps
- ci/lib.sh: add support for Azure Pipelines
- tests: optionally write results as JUnit-style .xml
- test-date: add a subcommand to measure times in shell scripts
- ci/lib.sh: encapsulate Travis-specific things
- ci: rename the library of common functions
Prepare to run test suite on Azure DevOps.
On hold, monitoring the discussion.
cf. <nycvar.QRO.7.76.6.1810151657080.4546@tvgsbejvaqbjf.bet>
cf. <nycvar.QRO.7.76.6.1810261033440.4546@tvgsbejvaqbjf.bet>
* du/branch-show-current (2018-10-26) 1 commit
- branch: introduce --show-current display option
"git branch" learned a new subcommand "--show-current".
On hold, monitoring the discussion.
cf. <CAPig+cRVdogY8VLXcftbY=n9tQ9wDo4YrnrdU6+pZ3ch6uhZGA@mail.gmail.com>
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- zlib.c: use size_t for size
The wrapper to call into zlib followed our long tradition to use
"unsigned long" for sizes of regions in memory, which have been
updated to use "size_t".
* jc/war-on-string-list (2018-11-01) 1 commit
(merged to 'next' on 2018-11-03 at 2ff65073f1)
+ fetch: replace string-list used as a look-up table with a hashmap
Replace three string-list instances used as look-up tables in "git
fetch" with hashmaps.
Will merge to 'master'.
* js/remote-archive-v2 (2018-09-28) 4 commits
(merged to 'next' on 2018-10-12 at 5f34377f60)
+ archive: allow archive over HTTP(S) with proto v2
+ archive: implement protocol v2 archive command
+ archive: use packet_reader for communications
+ archive: follow test standards around assertions
The original implementation of "git archive --remote" more or less
bypassed the transport layer and did not work over http(s). The
version 2 of the protocol is defined to allow going over http(s) as
well as Git native transport.
Will hold.
cf. <20181016212008.GA249669@google.com>
Breaks interoperability.
* ag/sequencer-reduce-rewriting-todo (2018-10-09) 16 commits
. rebase--interactive: move transform_todo_file() to rebase--interactive.c
. sequencer: fix a call to error() in transform_todo_file()
. sequencer: use edit_todo_list() in complete_action()
. rebase-interactive: rewrite edit_todo_list() to handle the initial edit
. rebase-interactive: append_todo_help() changes
. rebase-interactive: use todo_list_transform() in edit_todo_list()
. sequencer: refactor skip_unnecessary_picks() to work on a todo_list
. sequencer: change complete_action() to use the refactored functions
. sequencer: make sequencer_make_script() write its script to a strbuf
. sequencer: refactor transform_todos() to work on a todo_list
. sequencer: refactor rearrange_squash() to work on a todo_list
. sequencer: refactor sequencer_add_exec_commands() to work on a todo_list
. sequencer: refactor check_todo_list() to work on a todo_list
. sequencer: make the todo_list structure public
. sequencer: clear the number of items of a todo_list before parsing
. Merge branch 'ag/rebase-i-in-c' into ag/sequencer-reduce-rewriting-todo
The scripted version of "git rebase -i" wrote and rewrote the todo
list many times during a single step of its operation, and the
recent C-rewrite made a faithful conversion of the logic to C. The
implementation has been updated to carry necessary information
around in-core to avoid rewriting the same file over and over
unnecessarily.
A reroll exists but is based on a stale codebase and is painful to
merge.
* ds/test-multi-pack-index (2018-10-26) 4 commits
(merged to 'next' on 2018-11-03 at 624c415a45)
+ packfile: close multi-pack-index in close_all_packs
+ multi-pack-index: define GIT_TEST_MULTI_PACK_INDEX
+ midx: close multi-pack-index on repack
+ midx: fix broken free() in close_midx()
Tests for the recently introduced multi-pack index machinery.
Will merge to 'master'.
* nd/per-worktree-ref-iteration (2018-11-05) 9 commits
(merged to 'next' on 2018-11-06 at 53803cedf3)
+ git-worktree.txt: correct linkgit command name
(merged to 'next' on 2018-11-03 at 4cbe49a704)
+ reflog expire: cover reflog from all worktrees
+ fsck: check HEAD and reflog from other worktrees
+ fsck: move fsck_head_link() to get_default_heads() to avoid some globals
+ revision.c: better error reporting on ref from different worktrees
+ revision.c: correct a parameter name
+ refs: new ref types to make per-worktree refs visible to all worktrees
+ Add a place for (not) sharing stuff between worktrees
+ refs.c: indent with tabs, not spaces
The code to traverse objects for reachability, used to decide what
objects are unreferenced and expendable, have been taught to also
consider per-worktree refs of other worktrees as starting points to
prevent data loss.
Will merge to 'master'.
* ds/reachable-topo-order (2018-11-02) 7 commits
- t6012: make rev-list tests more interesting
- revision.c: generation-based topo-order algorithm
- commit/revisions: bookkeeping before refactoring
- revision.c: begin refactoring --topo-order logic
- test-reach: add rev-list tests
- test-reach: add run_three_modes method
- prio-queue: add 'peek' operation
The revision walker machinery learned to take advantage of the
commit generation numbers stored in the commit-graph file.
Will merge to 'next'.
* sb/submodule-recursive-fetch-gets-the-tip (2018-10-31) 11 commits
- builtin/fetch: check for submodule updates in any ref update
- fetch: try fetching submodules if needed objects were not fetched
- submodule.c: fetch in submodules git directory instead of in worktree
- submodule: migrate get_next_submodule to use repository structs
- repository: repo_submodule_init to take a submodule struct
- submodule: store OIDs in changed_submodule_names
- submodule.c: tighten scope of changed_submodule_names struct
- submodule.c: sort changed_submodule_names before searching it
- submodule.c: fix indentation
- sha1-array: provide oid_array_filter
- Merge branch 'ao/submodule-wo-gitmodules-checked-out' into sb/submodule-recursive-fetch-gets-the-tip
(this branch uses ao/submodule-wo-gitmodules-checked-out.)
"git fetch --recurse-submodules" may not fetch the necessary commit
that is bound to the superproject, which is getting corrected.
On hold, monitoring the discussion.
cf. <20181025233231.102245-1-sbeller@google.com>
* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
- add -p: coalesce hunks before testing applicability
Applicability check after a patch is edited in a "git add -i/p"
session has been improved.
Will hold.
cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>
* ao/submodule-wo-gitmodules-checked-out (2018-10-31) 10 commits
(merged to 'next' on 2018-11-03 at 00c3377ef0)
+ t/helper: add test-submodule-nested-repo-config
+ submodule: support reading .gitmodules when it's not in the working tree
+ submodule: add a helper to check if it is safe to write to .gitmodules
+ t7506: clean up .gitmodules properly before setting up new scenario
+ submodule: use the 'submodule--helper config' command
+ submodule--helper: add a new 'config' subcommand
+ t7411: be nicer to future tests and really clean things up
+ t7411: merge tests 5 and 6
+ submodule: factor out a config_set_in_gitmodules_file_gently function
+ submodule: add a print_config_from_gitmodules() helper
(this branch is used by sb/submodule-recursive-fetch-gets-the-tip.)
The submodule support has been updated to read from the blob at
HEAD:.gitmodules when the .gitmodules file is missing from the
working tree.
Will merge to 'master'.
* ps/stash-in-c (2018-10-15) 21 commits
- stash: replace all `write-tree` child processes with API calls
- stash: optimize `get_untracked_files()` and `check_changes()`
- stash: convert `stash--helper.c` into `stash.c`
- stash: convert save to builtin
- stash: make push -q quiet
- stash: convert push to builtin
- stash: convert create to builtin
- stash: convert store to builtin
- stash: convert show to builtin
- stash: convert list to builtin
- stash: convert pop to builtin
- stash: convert branch to builtin
- stash: convert drop and clear to builtin
- stash: convert apply to builtin
- stash: mention options in `show` synopsis
- stash: add tests for `git stash show` config
- stash: rename test cases to be more descriptive
- t3903: modernize style
- stash: improve option parsing test coverage
- strbuf.c: add `strbuf_join_argv()`
- sha1-name.c: add `get_oidf()` which acts like `get_oid()`
"git stash" rewritten in C.
Almost there.
cf. <20181015221040.GD4883@hank.intra.tgummerer.com>
* pw/add-p-select (2018-07-26) 4 commits
- add -p: optimize line selection for short hunks
- add -p: allow line selection to be inverted
- add -p: select modified lines correctly
- add -p: select individual hunk lines
"git add -p" interactive interface learned to let users choose
individual added/removed lines to be used in the operation, instead
of accepting or rejecting a whole hunk.
Will discard.
No further feedbacks on the topic for quite some time.
cf. <d622a95b-7302-43d4-4ec9-b2cf3388c653@talktalk.net>
I found the feature to be hard to explain, and may result in more
end-user complaints, but let's see.
--------------------------------------------------
[Discarded]
* ab/reject-alias-loop (2018-10-19) 1 commit
(merged to 'next' on 2018-10-26 at bc213f1bef)
+ alias: detect loops in mixed execution mode
Two (or more) aliases that mutually refer to each other can form an
infinite loop; we now attempt to notice and stop.
Discarded.
Reverted out of 'next'.
cf. <87sh0slvxm.fsf@evledraar.gmail.com>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: What's cooking in git.git (Nov 2018, #03; Wed, 7)
2018-11-07 9:41 What's cooking in git.git (Nov 2018, #03; Wed, 7) Junio C Hamano
@ 2018-11-07 12:29 ` Ævar Arnfjörð Bjarmason
2018-11-07 12:38 ` Junio C Hamano
2018-11-07 13:09 ` SZEDER Gábor
2018-11-08 16:31 ` Phillip Wood
2 siblings, 1 reply; 9+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2018-11-07 12:29 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Johannes Schindelin
On Wed, Nov 07 2018, Junio C Hamano wrote:
> * ab/range-diff-no-patch (2018-11-07) 1 commit
> - range-diff: add a --no-patch option to show a summary
>
> "range-diff" learns the "--no-patch" option, which can be used to
> get a high-level overview without the actual line-by-line patch
> difference shown.
>
> Will merge to 'next'.
Per <20181107122202.1813-1-avarab@gmail.com> it turns out this whole
thing should have been a bugfix instead, sent a v2.
> * ab/dynamic-gettext-poison (2018-11-02) 1 commit
> - i18n: make GETTEXT_POISON a runtime option
>
> On hold.
> cf. <20181102163725.GY30222@szeder.dev>
Hope to sent update soon...
> * ab/push-dwim-dst (2018-10-29) 9 commits
> - SQUASH???
> - push doc: document the DWYM behavior pushing to unqualified <dst>
> - push: add DWYM support for "git push refs/remotes/...:<dst>"
> - push: test that <src> doesn't DWYM if <dst> is unqualified
> - push: add an advice on unqualified <dst> push
> - push: move unqualified refname error into a function
> - push: improve the error shown on unqualified <dst> push
> - i18n: remote.c: mark error(...) messages for translation
> - remote.c: add braces in anticipation of a follow-up change
>
> "git push $there $src:$dst" rejects when $dst is not a fully
> qualified refname and not clear what the end user meant. The
> codepath has been taught to give a clearer error message, and also
> guess where the push should go by taking the type of the pushed
> object into account (e.g. a tag object would want to go under
> refs/tags/).
>
> The last few steps are questionable.
> cf. <87in1lkw54.fsf@evledraar.gmail.com>
...ditto...
> * ab/pack-tests-cleanup (2018-10-31) 3 commits
> (merged to 'next' on 2018-11-03 at b4a39595bb)
> + index-pack tests: don't leave test repo dirty at end
> + pack-objects tests: don't leave test .git corrupt at end
> + pack-objects test: modernize style
>
> A couple of tests used to leave the repository in a state that is
> deliberately corrupt, which have been corrected.
>
> Will merge to 'master'.
Thanks!
> * nd/config-split (2018-10-29) 79 commits
> (merged to 'next' on 2018-11-03 at a336559101)
> + config.txt: remove config/dummy.txt
> + config.txt: move worktree.* to a separate file
> + config.txt: move web.* to a separate file
> + config.txt: move versionsort.* to a separate file
> + config.txt: move user.* to a separate file
> + config.txt: move url.* to a separate file
> + config.txt: move uploadpack.* to a separate file
> + config.txt: move uploadarchive.* to a separate file
> + config.txt: move transfer.* to a separate file
> + config.txt: move tag.* to a separate file
> + config.txt: move submodule.* to a separate file
> + config.txt: move stash.* to a separate file
> + config.txt: move status.* to a separate file
> + config.txt: move splitIndex.* to a separate file
> + config.txt: move showBranch.* to a separate file
> + config.txt: move sequencer.* to a separate file
> + config.txt: move sendemail-config.txt to config/
> + config.txt: move reset.* to a separate file
> + config.txt: move rerere.* to a separate file
> + config.txt: move repack.* to a separate file
> + config.txt: move remotes.* to a separate file
> + config.txt: move remote.* to a separate file
> + config.txt: move receive-config.txt to config/
> + config.txt: move rebase-config.txt to config/
> + config.txt: move push-config.txt to config/
> + config.txt: move pull-config.txt to config/
> + config.txt: move protocol.* to a separate file
> + config.txt: move pretty.* to a separate file
> + config.txt: move pager.* to a separate file
> + config.txt: move pack.* to a separate file
> + config.txt: move notes.* to a separate file
> + config.txt: move mergetool.* to a separate file
> + config.txt: move merge-config.txt to config/
> + config.txt: move man.* to a separate file
> + config.txt: move mailmap.* to a separate file
> + config.txt: move mailinfo.* to a separate file
> + config.txt: move log.* to a separate file
> + config.txt: move interactive.* to a separate file
> + config.txt: move instaweb.* to a separate file
> + config.txt: move init.* to a separate file
> + config.txt: move index.* to a separate file
> + git-imap-send.txt: move imap.* to a separate file
> + config.txt: move i18n.* to a separate file
> + config.txt: move http.* to a separate file
> + config.txt: move ssh.* to a separate file
> + config.txt: move help.* to a separate file
> + config.txt: move guitool.* to a separate file
> + config.txt: move gui-config.txt to config/
> + config.txt: move gpg.* to a separate file
> + config.txt: move grep.* to a separate file
> + config.txt: move gitweb.* to a separate file
> + config.txt: move gitcvs-config.txt to config/
> + config.txt: move gc.* to a separate file
> + config.txt: move fsck.* to a separate file
> + config.txt: move fmt-merge-msg-config.txt to config/
> + config.txt: move format-config.txt to config/
> + config.txt: move filter.* to a separate file
> + config.txt: move fetch-config.txt to config/
> + config.txt: move fastimport.* to a separate file
> + config.txt: move difftool.* to a separate file
> + config.txt: move diff-config.txt to config/
> + config.txt: move completion.* to a separate file
> + config.txt: move credential.* to a separate file
> + config.txt: move commit.* to a separate file
> + config.txt: move column.* to a separate file
> + config.txt: move color.* to a separate file
> + config.txt: move clean.* to a separate file
> + config.txt: move checkout.* to a separate file
> + config.txt: move browser.* to a separate file
> + config.txt: move branch.* to a separate file
> + config.txt: move blame.* to a separate file
> + config.txt: move apply.* to a separate file
> + config.txt: move am.* to a separate file
> + config.txt: move alias.* to a separate file
> + config.txt: move add.* to a separate file
> + config.txt: move core.* to a separate file
> + config.txt: move advice.* to a separate file
> + Update makefile in preparation for Documentation/config/*.txt
> + Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split
> (this branch uses bp/reset-quiet.)
>
> Split the overly large Documentation/config.txt file into million
> little pieces. This potentially allows each individual piece
> included into the manual page of the command it affects more easily.
>
> Will merge to 'master'.
>
> This is a painful conversions while many other topics in flight
> wants to add to or edit the documentation of configuration
> variables.
Yeah the sooner this lands in master the better. I stopped deploying
internal versions of git while this is in flight. Having topics I want
to apply (based off master) + deploying next + resolving conflicts was
too painful to bother with.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: What's cooking in git.git (Nov 2018, #03; Wed, 7)
2018-11-07 12:29 ` Ævar Arnfjörð Bjarmason
@ 2018-11-07 12:38 ` Junio C Hamano
0 siblings, 0 replies; 9+ messages in thread
From: Junio C Hamano @ 2018-11-07 12:38 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: git, Johannes Schindelin
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> On Wed, Nov 07 2018, Junio C Hamano wrote:
>
>> * ab/range-diff-no-patch (2018-11-07) 1 commit
>> - range-diff: add a --no-patch option to show a summary
>>
>> "range-diff" learns the "--no-patch" option, which can be used to
>> get a high-level overview without the actual line-by-line patch
>> difference shown.
>>
>> Will merge to 'next'.
>
> Per <20181107122202.1813-1-avarab@gmail.com> it turns out this whole
> thing should have been a bugfix instead, sent a v2.
Thanks.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: What's cooking in git.git (Nov 2018, #03; Wed, 7)
2018-11-07 9:41 What's cooking in git.git (Nov 2018, #03; Wed, 7) Junio C Hamano
2018-11-07 12:29 ` Ævar Arnfjörð Bjarmason
@ 2018-11-07 13:09 ` SZEDER Gábor
2018-11-07 15:09 ` Duy Nguyen
2018-11-08 16:31 ` Phillip Wood
2 siblings, 1 reply; 9+ messages in thread
From: SZEDER Gábor @ 2018-11-07 13:09 UTC (permalink / raw)
To: Junio C Hamano, Nguyễn Thái Ngọc Duy; +Cc: git
On Wed, Nov 07, 2018 at 06:41:45PM +0900, Junio C Hamano wrote:
> * nd/i18n (2018-11-06) 16 commits
> - fsck: mark strings for translation
> - fsck: reduce word legos to help i18n
> - parse-options.c: mark more strings for translation
> - parse-options.c: turn some die() to BUG()
> - parse-options: replace opterror() with optname()
> - repack: mark more strings for translation
> - remote.c: mark messages for translation
> - remote.c: turn some error() or die() to BUG()
> - reflog: mark strings for translation
> - read-cache.c: add missing colon separators
> - read-cache.c: mark more strings for translation
> - read-cache.c: turn die("internal error") to BUG()
> - attr.c: mark more string for translation
> - archive.c: mark more strings for translation
> - alias.c: mark split_cmdline_strerror() strings for translation
> - git.c: mark more strings for translation
>
> More _("i18n") markings.
When this patch is merged into 'pu' all four tests added to
't1450-fsck.sh' in b29759d89a (fsck: check HEAD and reflog from other
worktrees, 2018-10-21) as part of 'nd/per-worktree-ref-iteration'
below fail when run with GETTEXT_POISON=y. The test suite passes in
both of these topics on their own, even with GETTEXT_POISON, it's
their merge that is somehow problematic.
> * nd/per-worktree-ref-iteration (2018-11-05) 9 commits
> (merged to 'next' on 2018-11-06 at 53803cedf3)
> + git-worktree.txt: correct linkgit command name
> (merged to 'next' on 2018-11-03 at 4cbe49a704)
> + reflog expire: cover reflog from all worktrees
> + fsck: check HEAD and reflog from other worktrees
> + fsck: move fsck_head_link() to get_default_heads() to avoid some globals
> + revision.c: better error reporting on ref from different worktrees
> + revision.c: correct a parameter name
> + refs: new ref types to make per-worktree refs visible to all worktrees
> + Add a place for (not) sharing stuff between worktrees
> + refs.c: indent with tabs, not spaces
>
> The code to traverse objects for reachability, used to decide what
> objects are unreferenced and expendable, have been taught to also
> consider per-worktree refs of other worktrees as starting points to
> prevent data loss.
>
> Will merge to 'master'.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: What's cooking in git.git (Nov 2018, #03; Wed, 7)
2018-11-07 13:09 ` SZEDER Gábor
@ 2018-11-07 15:09 ` Duy Nguyen
2018-11-07 22:09 ` Junio C Hamano
0 siblings, 1 reply; 9+ messages in thread
From: Duy Nguyen @ 2018-11-07 15:09 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: Junio C Hamano, Git Mailing List
On Wed, Nov 7, 2018 at 2:09 PM SZEDER Gábor <szeder.dev@gmail.com> wrote:
>
> On Wed, Nov 07, 2018 at 06:41:45PM +0900, Junio C Hamano wrote:
> > * nd/i18n (2018-11-06) 16 commits
> > - fsck: mark strings for translation
> > - fsck: reduce word legos to help i18n
> > - parse-options.c: mark more strings for translation
> > - parse-options.c: turn some die() to BUG()
> > - parse-options: replace opterror() with optname()
> > - repack: mark more strings for translation
> > - remote.c: mark messages for translation
> > - remote.c: turn some error() or die() to BUG()
> > - reflog: mark strings for translation
> > - read-cache.c: add missing colon separators
> > - read-cache.c: mark more strings for translation
> > - read-cache.c: turn die("internal error") to BUG()
> > - attr.c: mark more string for translation
> > - archive.c: mark more strings for translation
> > - alias.c: mark split_cmdline_strerror() strings for translation
> > - git.c: mark more strings for translation
> >
> > More _("i18n") markings.
>
> When this patch is merged into 'pu' all four tests added to
> 't1450-fsck.sh' in b29759d89a (fsck: check HEAD and reflog from other
> worktrees, 2018-10-21) as part of 'nd/per-worktree-ref-iteration'
> below fail when run with GETTEXT_POISON=y. The test suite passes in
> both of these topics on their own, even with GETTEXT_POISON, it's
> their merge that is somehow problematic.
Not surprising. The i18n series makes fsck output localized strings
and without updating grep to test_i18ngrep, new tests will fail. If
'pu' was passing before, I'm ok with just ejecting this series for
now. Then I wait for the other to land, rebase, fixup and resubmit.
--
Duy
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: What's cooking in git.git (Nov 2018, #03; Wed, 7)
2018-11-07 15:09 ` Duy Nguyen
@ 2018-11-07 22:09 ` Junio C Hamano
2018-11-08 6:09 ` Junio C Hamano
0 siblings, 1 reply; 9+ messages in thread
From: Junio C Hamano @ 2018-11-07 22:09 UTC (permalink / raw)
To: Duy Nguyen; +Cc: SZEDER Gábor, Git Mailing List
Duy Nguyen <pclouds@gmail.com> writes:
> On Wed, Nov 7, 2018 at 2:09 PM SZEDER Gábor <szeder.dev@gmail.com> wrote:
>>
>> On Wed, Nov 07, 2018 at 06:41:45PM +0900, Junio C Hamano wrote:
>> > * nd/i18n (2018-11-06) 16 commits
>> > - fsck: mark strings for translation
>> > - fsck: reduce word legos to help i18n
>> > ...
>> > More _("i18n") markings.
>>
>> When this patch is merged into 'pu' all four tests added to
>> 't1450-fsck.sh' in b29759d89a (fsck: check HEAD and reflog from other
>> worktrees, 2018-10-21) as part of 'nd/per-worktree-ref-iteration'
>> below fail when run with GETTEXT_POISON=y. The test suite passes in
>> both of these topics on their own, even with GETTEXT_POISON, it's
>> their merge that is somehow problematic.
>
> Not surprising. The i18n series makes fsck output localized strings
> and without updating grep to test_i18ngrep, new tests will fail. If
> 'pu' was passing before, I'm ok with just ejecting this series for
> now. Then I wait for the other to land, rebase, fixup and resubmit.
Let me first see if I can come up with a merge-fix that can be
carried around during the time this topic cooks, before talking
about dropping and reattempting the series.
For a change like this, a time-window in which the codebase is
quiescent enough may never come, and because the changes go all over
the place, mostly but not entirely repetitive, it costs a lot, not
just to write but also to review them.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: What's cooking in git.git (Nov 2018, #03; Wed, 7)
2018-11-07 22:09 ` Junio C Hamano
@ 2018-11-08 6:09 ` Junio C Hamano
0 siblings, 0 replies; 9+ messages in thread
From: Junio C Hamano @ 2018-11-08 6:09 UTC (permalink / raw)
To: Duy Nguyen; +Cc: SZEDER Gábor, Git Mailing List
Junio C Hamano <gitster@pobox.com> writes:
>> Not surprising. The i18n series makes fsck output localized strings
>> and without updating grep to test_i18ngrep, new tests will fail. If
>> 'pu' was passing before, I'm ok with just ejecting this series for
>> now. Then I wait for the other to land, rebase, fixup and resubmit.
>
> Let me first see if I can come up with a merge-fix that can be
> carried around during the time this topic cooks, before talking
> about dropping and reattempting the series.
>
> For a change like this, a time-window in which the codebase is
> quiescent enough may never come, and because the changes go all over
> the place, mostly but not entirely repetitive, it costs a lot, not
> just to write but also to review them.
I have configured the machinery used to rebuild integration branches
so that the following is squashed in when the nd/i18n topic is
merged.
The part that touches t1450 needs to be split out and squashed when
nd/per-worktree-ref-iteration gets merged, *if* the nd/i18n topic
needs to jump over the other topic, but I'll worry about it when it
happens---I think per-worktree ref iteration series that is in next
should be ready enough that we do not mind having nd/i18n waiting
for it.
Anyway, here is what is in refs/merge-fix/nd/i18n, which gets
cherry-picked and squashed into the merge when nd/i18n is merged.
t/t1450-fsck.sh | 8 ++++----
t/t5616-partial-clone.sh | 2 +-
t/t5703-upload-pack-ref-in-want.sh | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 8a5f4c7189..2e5e979336 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -109,7 +109,7 @@ test_expect_success 'HEAD link pointing at a funny object (from different wt)' '
echo $ZERO_OID >.git/HEAD &&
# avoid corrupt/broken HEAD from interfering with repo discovery
test_must_fail git -C wt fsck 2>out &&
- grep "main-worktree/HEAD: detached HEAD points" out
+ test_i18ngrep "main-worktree/HEAD: detached HEAD points" out
'
test_expect_success 'other worktree HEAD link pointing at a funny object' '
@@ -117,7 +117,7 @@ test_expect_success 'other worktree HEAD link pointing at a funny object' '
git worktree add other &&
echo $ZERO_OID >.git/worktrees/other/HEAD &&
test_must_fail git fsck 2>out &&
- grep "worktrees/other/HEAD: detached HEAD points" out
+ test_i18ngrep "worktrees/other/HEAD: detached HEAD points" out
'
test_expect_success 'other worktree HEAD link pointing at missing object' '
@@ -125,7 +125,7 @@ test_expect_success 'other worktree HEAD link pointing at missing object' '
git worktree add other &&
echo "Contents missing from repo" | git hash-object --stdin >.git/worktrees/other/HEAD &&
test_must_fail git fsck 2>out &&
- grep "worktrees/other/HEAD: invalid sha1 pointer" out
+ test_i18ngrep "worktrees/other/HEAD: invalid sha1 pointer" out
'
test_expect_success 'other worktree HEAD link pointing at a funny place' '
@@ -133,7 +133,7 @@ test_expect_success 'other worktree HEAD link pointing at a funny place' '
git worktree add other &&
echo "ref: refs/funny/place" >.git/worktrees/other/HEAD &&
test_must_fail git fsck 2>out &&
- grep "worktrees/other/HEAD points to something strange" out
+ test_i18ngrep "worktrees/other/HEAD points to something strange" out
'
test_expect_success 'email without @ is okay' '
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index 336f02a41a..9643acb161 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -281,7 +281,7 @@ test_expect_success 'upon cloning, check that all refs point to objects' '
test_must_fail git -c protocol.version=2 clone \
--filter=blob:none $HTTPD_URL/one_time_sed/server repo 2>err &&
- grep "did not send all necessary objects" err &&
+ test_i18ngrep "did not send all necessary objects" err &&
# Ensure that the one-time-sed script was used.
! test -e "$HTTPD_ROOT_PATH/one-time-sed"
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh
index 3f58f05cbb..7053899cb5 100755
--- a/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@@ -208,7 +208,7 @@ test_expect_success 'server is initially ahead - no ref in want' '
cp -r "$LOCAL_PRISTINE" local &&
inconsistency master 1234567890123456789012345678901234567890 &&
test_must_fail git -C local fetch 2>err &&
- grep "ERR upload-pack: not our ref" err
+ test_i18ngrep "ERR upload-pack: not our ref" err
'
test_expect_success 'server is initially ahead - ref in want' '
@@ -254,7 +254,7 @@ test_expect_success 'server loses a ref - ref in want' '
echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-sed" &&
test_must_fail git -C local fetch 2>err &&
- grep "ERR unknown ref refs/heads/raster" err
+ test_i18ngrep "ERR unknown ref refs/heads/raster" err
'
stop_httpd
--
2.19.1-856-g8858448bb4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: What's cooking in git.git (Nov 2018, #03; Wed, 7)
2018-11-07 9:41 What's cooking in git.git (Nov 2018, #03; Wed, 7) Junio C Hamano
2018-11-07 12:29 ` Ævar Arnfjörð Bjarmason
2018-11-07 13:09 ` SZEDER Gábor
@ 2018-11-08 16:31 ` Phillip Wood
2018-11-09 12:02 ` Johannes Schindelin
2 siblings, 1 reply; 9+ messages in thread
From: Phillip Wood @ 2018-11-08 16:31 UTC (permalink / raw)
To: Junio C Hamano, git
On 07/11/2018 09:41, Junio C Hamano 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.
>
> 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
>
> --------------------------------------------------
>
> * pw/add-p-select (2018-07-26) 4 commits
> - add -p: optimize line selection for short hunks
> - add -p: allow line selection to be inverted
> - add -p: select modified lines correctly
> - add -p: select individual hunk lines
>
> "git add -p" interactive interface learned to let users choose
> individual added/removed lines to be used in the operation, instead
> of accepting or rejecting a whole hunk.
>
> Will discard.
> No further feedbacks on the topic for quite some time.
Unfortunately I've not found time to work on this recently and don't see
myself doing so before the new year so I think it makes sense to drop
it. Hopefully I can come up with something next year, it would be nice
for users to avoid having to edit patches where possible.
Best Wishes
Phillip
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: What's cooking in git.git (Nov 2018, #03; Wed, 7)
2018-11-08 16:31 ` Phillip Wood
@ 2018-11-09 12:02 ` Johannes Schindelin
0 siblings, 0 replies; 9+ messages in thread
From: Johannes Schindelin @ 2018-11-09 12:02 UTC (permalink / raw)
To: phillip.wood; +Cc: Junio C Hamano, git
Hi Phillip,
On Thu, 8 Nov 2018, Phillip Wood wrote:
> On 07/11/2018 09:41, Junio C Hamano 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.
> >
> > 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
> >
> > --------------------------------------------------
> >
> > * pw/add-p-select (2018-07-26) 4 commits
> > - add -p: optimize line selection for short hunks
> > - add -p: allow line selection to be inverted
> > - add -p: select modified lines correctly
> > - add -p: select individual hunk lines
> >
> > "git add -p" interactive interface learned to let users choose
> > individual added/removed lines to be used in the operation, instead
> > of accepting or rejecting a whole hunk.
> >
> > Will discard.
> > No further feedbacks on the topic for quite some time.
>
> Unfortunately I've not found time to work on this recently and don't see
> myself doing so before the new year so I think it makes sense to drop it.
> Hopefully I can come up with something next year, it would be nice for users
> to avoid having to edit patches where possible.
If I understand correctly, this patch series essentially imitates on the
console what you can do in Git GUI by selecting multiple lines in the diff
and then "Stage Selected Lines"?
If my understanding is correct, then yes, I would be very much in favor of
having this feature, too.
Thanks,
Dscho
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-11-09 12:02 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-07 9:41 What's cooking in git.git (Nov 2018, #03; Wed, 7) Junio C Hamano
2018-11-07 12:29 ` Ævar Arnfjörð Bjarmason
2018-11-07 12:38 ` Junio C Hamano
2018-11-07 13:09 ` SZEDER Gábor
2018-11-07 15:09 ` Duy Nguyen
2018-11-07 22:09 ` Junio C Hamano
2018-11-08 6:09 ` Junio C Hamano
2018-11-08 16:31 ` Phillip Wood
2018-11-09 12:02 ` Johannes Schindelin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).