What's cooking in git.git (Dec 2017, #03; Wed, 13)

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"]

* ab/pcre2-grep (2017-11-24) 2 commits
(merged to 'next' on 2017-12-05 at 88f1927207)
+ grep: fix segfault under -P + PCRE2 <=10.30 + (*NO_JIT)
+ test-lib: add LIBPCRE1 & LIBPCRE2 prerequisites

"git grep" compiled with libpcre2 sometimes triggered a segfault, which is being fixed.

* bc/hash-algo (2017-11-28) 5 commits
(merged to 'next' on 2017-11-28 at 5c74632345)
+ repository: fix a sparse 'using integer as NULL pointer' warning (merged to 'next' on 2017-11-27 at 98cc9ef2a8)
+ Switch empty tree and blob lookups to use hash abstraction
+ Integrate hash algorithm support with repo setup
+ Add structure representing hash algorithm
+ setup: expose enumerated repo info

An infrastructure to define what hash function is used in Git is introduced, and an effort to plumb that throughout various codepaths has been started.

* ds/for-each-file-in-obj-micro-optim (2017-12-04) 1 commit (merged to 'next' on 2017-12-05 at 55ba487ccd)
+ sha1_file: use strbuf_add() instead of strbuf_addf()

The code to iterate over loose object files got optimized.

* en/remove-stripspace (2017-12-05) 1 commit (merged to 'next' on 2017-12-06 at c926373a49)
+ strbuf: remove unused stripspace function alias

An internal function that was left for backward compatibility has been removed, as there is no remaining callers.

* fk/sendmail-from-path (2017-11-28) 1 commit (merged to 'next' on 2017-12-05 at deb7a5f4a8)
+ git-send-email: honor $PATH for sendmail binary

"git send-email" tries to see if the sendmail program is available in /usr/lib and /usr/sbin; extend the list of locations to be checked to also include directories on $PATH.

* jc/receive-pack-hook-doc (2017-11-24) 1 commit (merged to 'next' on 2017-12-05 at ffa14b1d48)
+ hooks doc: clarify when receive-pack invokes its hooks

Doc update.

* jk/no-optional-locks (2017-11-27) 1 commit
(merged to 'next' on 2017-12-06 at e642dde605)
+ git-status.txt: mention --no-optional-locks

Doc update for a feature available in Git v2.14 and upwards.

* jk/progress-delay-fix (2017-12-04) 2 commits (merged to 'next' on 2017-12-05 at 8e62c2b18b)
+ progress: drop delay-threshold code
+ progress: set default delay threshold to 100%, not 0%

A regression in the progress eye-candy was fixed.

* js/hashmap-update-sample (2017-12-05) 1 commit (merged to 'next' on 2017-12-06 at 40ceee9a18)
+ hashmap: adjust documentation to reflect reality

Code comment update.

* ks/doc-checkout-previous (2017-11-28) 1 commit
(merged to 'next' on 2017-12-05 at 02f17e3c55)
+ Doc/checkout: checking out using @{-N} can lead to detached state

@{-N} in "git checkout @{-N}" may refer to a detached HEAD state, but the documentation was not clear about it, which has been fixed.

* pc/submodule-helper (2017-11-26) 1 commit (merged to 'next' on 2017-12-05 at fdf56787be)
+ submodule--helper.c: i18n: add a missing space in message

A message fix.

* ra/decorate-limit-refs (2017-11-22) 1 commit (merged to 'next' on 2017-12-05 at 02c66aa4e0)
+ log: add option to choose which refs to decorate

The tagnames "git log --decorate" uses to annotate the commits can now be limited to subset of available refs with the two additional options, --decorate-refs[-exclude]=<pattern>.

* tg/t-readme-updates (2017-11-27) 2 commits (merged to 'next' on 2017-12-05 at c0b0e2d65b)
+ t/README: document test_cmp_rev
+ t/README: remove mention of adding copyright notices

Developer doc updates.

--------------------------------------------------
[New Topics]

* es/worktree-checkout-hook (2017-12-07) 1 commit
- worktree: invoke post-checkout hook (unless --no-checkout)

"git worktree add" learned to run the post-checkout hook, just like "git checkout" does, after the initial checkout.

Will merge to 'next'.

* rs/am-builtin-leakfix (2017-12-07) 1 commit
- am: release strbuf after use in split_mail_mbox()

Leakfix.

Will merge to 'next'.

* rs/fmt-merge-msg-string-leak-fix (2017-12-07) 1 commit
- fmt-merge-msg: avoid leaking strbuf in shortlog()

Leakfix.

Will merge to 'next'.

* rs/strbuf-read-once-reset-length (2017-12-07) 1 commit
- strbuf: release memory on read error in strbuf_read_once()

Leakfix.

Will merge to 'next'.

* db/doc-workflows-neuter-the-maintainer (2017-12-08) 1 commit
- doc: reword gitworkflows.txt for neutrality

Docfix.

Will merge to 'next'.

* es/clone-shared-worktree (2017-12-11) 1 commit
- clone: support 'clone --shared' from a worktree

"git clone --shared" to borrow from a (secondary) worktree did not work, even though "git clone --local" did. Both are now accepted.

Will merge to 'next'.

* jh/partial-clone-doc (2017-12-08) 1 commit
- partial-clone: design doc

Will merge to 'next'.

* jk/cvsimport-quoting (2017-12-08) 1 commit
- cvsimport: apply shell-quoting regex globally

Typo/Logico fix.

Will merge to 'next'.

* jk/test-suite-tracing (2017-12-08) 4 commits
- t/Makefile: introduce TEST_SHELL_PATH
- test-lib: make "-x" work with "--verbose-log"
- t5615: avoid re-using descriptor 4
- test-lib: silence "-x" cleanup under bash

Assorted fixes around running tests with "-x" tracing option.

* jt/decorate-api (2017-12-08) 1 commit
- decorate: clean up and document API

A few structures and variables that are implementation details of the decorate API have been renamed and then the API got documented better.

Will merge to 'next'.

* ks/branch-cleanup (2017-12-07) 4 commits
- builtin/branch: strip refs/heads/ using skip_prefix
- branch: update warning message shown when copying a misnamed branch
- branch: group related arguments of create_branch()
- branch: improve documentation and naming of create_branch() parameters

Code clean-up.

Will merge to 'next'.

* rs/fmt-merge-msg-leakfix (2017-12-08) 1 commit
- transport-helper: plug strbuf and string_list leaks

Leakfix.

Will merge to 'next'.

* tb/delimit-pretty-trailers-args-with-comma (2017-12-08) 1 commit
- docs/pretty-formats: mention commas in %(trailers) syntax

Doc updates.

Will merge to 'next'.

* bw/submodule-sans-cache-compat (2017-12-12) 3 commits
- submodule: convert get_next_submodule to not rely on the_index
- submodule: used correct index in is_staging_gitmodules_ok
- submodule: convert stage_updated_gitmodules to take a struct index_state

Code clean-up.

Will merge to 'next'.

* hi/merge-verify-sig-config (2017-12-12) 2 commits
- t: add tests for pull --verify-signatures
- merge: add config option for verifySignatures

"git merge" learned to pay attention to merge.verifySignatures configuration variable and pretend as if '--verify-signatures' option was given from the command line.

Will merge to 'next'.

* ot/pretty (2017-12-12) 2 commits
- format: create docs for pretty.h
- format: create pretty.h file

Code clean-up.

Will merge to 'next'.

* sb/test-helper-excludes (2017-12-12) 1 commit
- t/helper: ignore everything but sources

Simplify the ignore rules for t/helper directory.

Will merge to 'next'.

* sg/travis-fixes (2017-12-12) 4 commits
- travis-ci: use 'set -x' in 'ci/*' scripts for extra tracing output
- travis-ci: set GIT_TEST_HTTPD in 'ci/lib-travisci.sh'
- travis-ci: move setting environment variables to 'ci/lib-travisci.sh'
- travis-ci: introduce a $jobname variable for 'ci/*' scripts

Assorted updates for TravisCI integration.

Will merge to 'next'.

* bw/path-doc (2017-12-13) 1 commit
- path: document path functions

Doc updates.

Will merge to 'next'.

* jt/transport-no-more-rsync (2017-12-12) 1 commit
- transport: remove unused "push" in vtable

Code clean-up.

Will merge to 'next'.

* rb/quick-install-doc (2017-12-12) 1 commit
- install-doc-quick: allow specifying what ref to install

The build procedure now allows not just the repositories but also the refs to be used to take pre-formatted manpages and html documents to install.

Will merge to 'next'.

--------------------------------------------------
[Stalled]

* jc/merge-symlink-ours-theirs (2017-09-26) 1 commit
- merge: teach -Xours/-Xtheirs to symbolic link merge

"git merge -Xours/-Xtheirs" learned to use our/their version when resolving a conflicting updates to a symbolic link.

Needs review.

* mg/merge-base-fork-point (2017-09-17) 3 commits
- merge-base: find fork-point outside partial reflog
- merge-base: return fork-point outside reflog
- t6010: test actual test output

"merge-base --fork-point $branch $commit" is used to guess on which commit among the commits that were once at the tip of the $branch the $commit was built on top of, and it learns these historical tips from the reflog of the $branch. When the true fork-point is lost due to pruning of old reflog entries, the command does not give any output, because it has no way to guess correctly and does not want to mislead the user with a wrong guess.

The command has been updated to give the best but not known to be correct guess, based on a hope that a merge-base between $commit and a virtual merge across all the reflog entries that still are available for $branch may still be a closer to the true fork-point than the merge-base between $commit and the current tip of the $branch.

This may have to be offered by an additional option, to allow the users that are prepared to see a potentially incorrect guess to opt into the feature, without affecting the current callers that may not be prepared to accept a guess that is not known to be correct.

What's the doneness of this one?

* jk/drop-ancient-curl (2017-08-09) 5 commits
- http: #error on too-old curl
- curl: remove ifdef'd code never used with curl >=7.19.4
- http: drop support for curl < 7.19.4
- http: drop support for curl < 7.16.0
- http: drop support for curl < 7.11.1

Some code in http.c that has bitrot is being removed.

Expecting a reroll.

* mk/use-size-t-in-zlib (2017-08-10) 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".

Needs resurrecting by making sure the fix is good and still applies (or adjusted to today's codebase).

* mg/status-in-progress-info (2017-05-10) 2 commits
- status --short --inprogress: spell it as --in-progress
- status: show in-progress info for short status

"git status" learns an option to report various operations (e.g. "merging") that the user is in the middle of.

cf. <[email protected]>

* nd/worktree-move (2017-04-20) 6 commits
- worktree remove: new command
- worktree move: refuse to move worktrees with submodules
- worktree move: accept destination as directory
- worktree move: new command
- worktree.c: add update_worktree_location()
- worktree.c: add validate_worktree()

"git worktree" learned move and remove subcommands.

Expecting a reroll.
cf. <[email protected]>
cf. <[email protected]> cf. <[email protected]>

--------------------------------------------------
[Cooking]

* bw/pathspec-match-submodule-boundary (2017-12-05) 1 commit (merged to 'next' on 2017-12-13 at e256d292a4)
+ pathspec: only match across submodule boundaries when requested

An v2.12-era regression in pathspec match logic, which made it look into submodule tree even when it is not desired, has been fixed.

Will merge to 'master'.

* ls/git-gui-no-double-utf8-author-name (2017-12-05) 2 commits
(merged to 'next' on 2017-12-13 at be577d6e1b)
+ Merge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no-double-utf8-author-name
+ git-gui: prevent double UTF-8 conversion

Amending commits in git-gui broke the author name that is non-ascii due to incorrect enconding conversion.

Will merge to 'master'.

* sb/clone-recursive-submodule-doc (2017-12-05) 1 commit (merged to 'next' on 2017-12-13 at abfed699db)
+ Documentation/git-clone: improve description for submodule recursing

Doc update.

Will merge to 'master'.

* ab/sha1dc-build (2017-12-12) 4 commits
- Makefile: use the sha1collisiondetection submodule by default
- sha1dc_git.h: re-arrange an ifdef chain for a subsequent change
- Makefile: under "make dist", include the sha1collisiondetection submodule
- Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto

* bw/submodule-config-cleanup (2017-12-06) 1 commit
(merged to 'next' on 2017-12-13 at c952bf1b84)
+ diff-tree: read the index so attribute checks work in bare repositories

Recent update to the submodule configuration code broke "diff-tree" by accidentally stopping to read from the index upfront.

Will merge to 'master'.

* sg/setup-doc-update (2017-12-07) 1 commit
(merged to 'next' on 2017-12-13 at 4355c6e0ef)
+ setup.c: fix comment about order of .git directory discovery

Comment update.

Will merge to 'master'.

* ab/simplify-perl-makefile (2017-12-11) 1 commit (merged to 'next' on 2017-12-13 at 1b791d2503)
+ Makefile: replace perl/Makefile.PL with simple make rules

The build procedure for perl/ part has been greatly simplified by weaning ourselves off of MakeMaker.

Will merge to 'master'.

* cc/skip-to-optional-val (2017-12-11) 7 commits
- t4045: reindent to make helpers readable
- diff: add tests for --relative without optional prefix value
- diff: use skip_to_optional_arg_default() in parsing --relative
- diff: use skip_to_optional_arg_default()
- diff: use skip_to_optional_arg()
- index-pack: use skip_to_optional_arg()
- git-compat-util: introduce skip_to_optional_arg()

Introduce a helper to simplify code to parse a common pattern that expects either "--key" or "--key=<something>".

* lb/rebase-i-short-command-names (2017-12-05) 9 commits
- t3404: add test case for abbreviated commands
- rebase -i: learn to abbreviate command names
- rebase -i -x: add exec commands via the rebase--helper
- rebase -i: update functions to use a flags parameter
- rebase -i: replace reference to sha1 with oid
- rebase -i: refactor transform_todo_ids
- rebase -i: set commit to null in exec commands
- Documentation: use preferred name for the 'todo list' script
- Documentation: move rebase.* configs to new file

Allow a single-letter command name in the "rebase -i" todo list.

Will merge to 'next'.

* ra/prompt-eread-fix (2017-12-06) 2 commits
- git-prompt: fix reading files with windows line endings
- git-prompt: make __git_eread intended use explicit

Update the shell prompt script (in contrib/) to strip trailing CR from strings read from various "state" files.

* en/merge-recursive-icase-removal (2017-11-27) 1 commit (merged to 'next' on 2017-12-13 at 85c6538a2a)
+ merge-recursive: ignore_case shouldn't reject intentional removals

The code internal to the recursive merge strategy was not fully prepared to see a path that is renamed to try overwriting another path that is only different in case on case insensitive systems. This does not matter in the current code, but will start to matter once the rename detection logic starts taking hints from nearby paths moving to some directory and moves a new path along with them.

Will merge to 'master'.

* gk/tracing-optimization (2017-12-06) 2 commits (merged to 'next' on 2017-12-13 at d6bfac03ad)
+ trace: improve performance while category is disabled
+ trace: remove trace key normalization

The tracing infrastructure has been optimized for cases where no tracing is requested.

Will merge to 'master'.

* tb/check-crlf-for-safe-crlf (2017-12-08) 2 commits (merged to 'next' on 2017-12-08 at 5279b80103)
+ t0027: Adapt the new MIX tests to Windows (merged to 'next' on 2017-12-05 at 7adaa1fe01)
+ convert: tighten the safe autocrlf handling

The "safe crlf" check incorrectly triggered for contents that does not use CRLF as line endings, which has been corrected.

* cc/require-tcl-tk-for-build (2017-11-29) 2 commits
- travis-ci: avoid new tcl/tk build requirement
- Makefile: check that tcl/tk is installed

A first-time builder of Git may have installed neither tclsh nor msgfmt, in which case git-gui and gitk part will fail and break the build. As a workaround, refuse to run a build when tclsh is not installed and NO_TCLTK is not set.

Undecided.
I still feel that requring tclsh to be installed, with or without "escape hatch" for experts, may be too heavy-handed.

* mk/http-backend-content-length (2017-11-27) 4 commits
- SQUASH???
- t5560-http-backend-noserver.sh: add CONTENT_LENGTH cases
- SQUASH???
- http-backend: respect CONTENT_LENGTH as specified by rfc3875

The http-backend (used for smart-http transport) used to slurp the whole input until EOF, without paying attention to CONTENT_LENGTH that is supplied in the environment and instead expecting the Web server to close the input stream. This has been fixed.

Expecting a reroll.
Suggested fixes to be used when rerolling is queued, but I'd prefer _not_ squashing them myself.

* jt/diff-anchored-patience (2017-11-28) 1 commit
(merged to 'next' on 2017-12-13 at 5f4843d7a0)
+ diff: support anchoring line(s)

"git diff" learned a variant of the "--patience" algorithm, to which the user can specify which 'unique' line to be used as anchoring points.

Will merge to 'master'.

* en/rename-directory-detection (2017-12-13) 35 commits
- SQUASH???
- merge-recursive: ensure we write updates for directory-renamed file
- merge-recursive: avoid spurious rename/rename conflict from dir renames
- directory rename detection: new testcases showcasing a pair of bugs
- merge-recursive: fix remaining directory rename + dirty overwrite cases
- merge-recursive: fix overwriting dirty files involved in renames
- merge-recursive: avoid clobbering untracked files with directory renames
- merge-recursive: apply necessary modifications for directory renames
- merge-recursive: when comparing files, don't include trees
- merge-recursive: check for file level conflicts then get new name
- merge-recursive: add computation of collisions due to dir rename & merging
- merge-recursive: add a new hashmap for storing file collisions
- merge-recursive: check for directory level conflicts
- merge-recursive: add get_directory_renames()
- merge-recursive: make a helper function for cleanup for handle_renames
- merge-recursive: add a new hashmap for storing directory renames
- merge-recursive: split out code for determining diff_filepairs
- merge-recursive: make !o->detect_rename codepath more obvious
- merge-recursive: fix leaks of allocated renames and diff_filepairs
- merge-recursive: introduce new functions to handle rename logic
- merge-recursive: move the get_renames() function
- directory rename detection: tests for handling overwriting dirty files
- directory rename detection: tests for handling overwriting untracked files
- directory rename detection: miscellaneous testcases to complete coverage
- directory rename detection: testcases exploring possibly suboptimal merges
- directory rename detection: more involved edge/corner testcases
- directory rename detection: testcases checking which side did the rename
- directory rename detection: files/directories in the way of some renames
- directory rename detection: partially renamed directory testcase/discussion
- directory rename detection: testcases to avoid taking detection too far
- directory rename detection: directory splitting testcases
- directory rename detection: basic testcases
- merge-recursive: add explanation for src_entry and dst_entry
- merge-recursive: fix logic ordering issue
- Tighten and correct a few testcases for merging and cherry-picking

Rename detection logic in "diff" family that is used in "merge" has learned to guess when all of x/a, x/b and x/c have moved to z/a, z/b and z/c, it is likely that x/d added in the meantime would also want to move to z/d by taking the hint that the entire directory 'x' moved to 'z'.

Needs review.

* sb/diff-blobfind (2017-12-12) 1 commit
(merged to 'next' on 2017-12-13 at 9a27a20c5f)
+ diffcore: add a filter to find a specific blob

"git diff" family of commands learned --blobfind=<object-name> that allows you to limit the output only to a change that involves the named blob object (either changing the contents from or to it).

Will merge to 'master'.

* tg/worktree-create-tracking (2017-12-06) 6 commits (merged to 'next' on 2017-12-13 at 830b68c660)
+ add worktree.guessRemote config option
+ worktree: add --guess-remote flag to add subcommand
+ worktree: make add <path> <branch> dwim
+ worktree: add --[no-]track option to the add subcommand
+ worktree: add can be created from any commit-ish
+ checkout: factor out functions to new lib file

The way "git worktree add" determines what branch to create from where and checkout in the new worktree has been updated a bit.

Will merge to 'master'.

* pw/sequencer-in-process-commit (2017-12-13) 10 commits (merged to 'next' on 2017-12-13 at ec4d2b9c84)
+ sequencer: improve config handling
(merged to 'next' on 2017-12-06 at a4212f7ebd)
+ t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
+ sequencer: try to commit without forking 'git commit'
+ sequencer: load commit related config
+ sequencer: simplify adding Signed-off-by: trailer
+ commit: move print_commit_summary() to libgit
+ commit: move post-rewrite code to libgit
+ Add a function to update HEAD after creating a commit
+ commit: move empty message checks to libgit
+ t3404: check intermediate squash messages

The sequencer infrastructure is shared across "git cherry-pick", "git rebase -i", etc., and has always spawned "git commit" when it needs to create a commit. It has been taught to do so internally, when able, by reusing the codepath "git commit" itself uses, which gives performance boost for a few tens of percents in some sample scenarios.

Will cook in 'next'.

* dj/runtime-prefix (2017-12-05) 4 commits
. exec_cmd: RUNTIME_PREFIX on some POSIX systems . Makefile: add Perl runtime prefix support . Makefile: add support for "perllibdir"
. Makefile: generate Perl header from template file

A build-time option has been added to allow Git to be told to refer to its associated files relative to the main binary, in the same way that has been possible on Windows for quite some time, for Linux, BSDs and Darwin.

Tentatively kicked out of 'next' to see how well another topic ab/simplify-perl-makefile that heavily conflicts with this fares.

* ls/editor-waiting-message (2017-12-07) 2 commits (merged to 'next' on 2017-12-13 at 494b5b41e3)
+ launch_editor(): indicate that Git waits for user input
+ refactor "dumb" terminal determination

Git shows a message to tell the user that it is waiting for the user to finish editing when spawning an editor, in case the editor opens to a hidden window or somewhere obscure and the user gets lost.

Will merge to 'master'.

* en/rename-progress (2017-12-02) 5 commits
(merged to 'next' on 2017-12-04 at 49b39d2297)
+ diffcore-rename: make diff-tree -l0 mean -l<large>
(merged to 'next' on 2017-11-20 at 77a2e0ddd9)
+ sequencer: show rename progress during cherry picks
+ diff: remove silent clamp of renameLimit
+ progress: fix progress meters when dealing with lots of work
+ sequencer: warn when internal merge may be suboptimal due to renameLimit

Historically, the diff machinery for rename detection had a hardcoded limit of 32k paths; this is being lifted to allow users trade cycles with a (possibly) easier to read result.

Will merge to 'master'.

* ar/unconfuse-three-dots (2017-12-06) 8 commits
(merged to 'next' on 2017-12-13 at 33bd0b67c0)
+ t2020: test variations that matter
+ t4013: test new output from diff --abbrev --raw
+ diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value
+ t4013: prepare for upcoming "diff --raw --abbrev" output format change
+ checkout: describe_detached_head: remove ellipsis after committish
+ print_sha1_ellipsis: introduce helper
+ Documentation: user-manual: limit usage of ellipsis
+ Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").

Ancient part of codebase still shows dots after an abbreviated object name just to show that it is not a full object name, but these ellipses are confusing to people who newly discovered Git who are used to seeing abbreviated object names and find them confusing with the range syntax.

Will merge to 'master'.

* jh/object-filtering (2017-12-05) 9 commits
(merged to 'next' on 2017-12-05 at 3a56b51085)
+ rev-list: support --no-filter argument
+ list-objects-filter-options: support --no-filter
+ list-objects-filter-options: fix 'keword' typo in comment (merged to 'next' on 2017-11-27 at e5008c3b28)
+ pack-objects: add list-objects filtering
+ rev-list: add list-objects filtering support
+ list-objects: filter objects in traverse_commit_list
+ oidset: add iterator methods to oidset
+ oidmap: add oidmap iterator methods
+ dir: allow exclusions from blob in addition to file (this branch is used by jh/fsck-promisors and jh/partial-clone.)

In preparation for implementing narrow/partial clone, the object walking machinery has been taught a way to tell it to "filter" some objects from enumeration.

* jh/fsck-promisors (2017-12-08) 10 commits
- gc: do not repack promisor packfiles
- rev-list: support termination at promisor objects
- sha1_file: support lazily fetching missing objects
- introduce fetch-object: fetch one promisor object
- index-pack: refactor writing of .keep files
- fsck: support promisor objects as CLI argument
- fsck: support referenced promisor objects
- fsck: support refs pointing to promisor objects
- fsck: introduce partialclone extension
- extension.partialclone: introduce partial clone extension (this branch is used by jh/partial-clone; uses jh/object-filtering.)

In preparation for implementing narrow/partial clone, the machinery for checking object connectivity used by gc and fsck has been taught that a missing object is OK when it is referenced by a packfile specially marked as coming from trusted repository that promises to make them available on-demand and lazily.

* jh/partial-clone (2017-12-08) 13 commits
- t5616: test bulk prefetch after partial fetch
- fetch: inherit filter-spec from partial clone
- t5616: end-to-end tests for partial clone
- fetch-pack: restore save_commit_buffer after use
- unpack-trees: batch fetching of missing blobs
- clone: partial clone
- partial-clone: define partial clone settings in config
- fetch: support filters
- fetch: refactor calculation of remote list
- fetch-pack: test support excluding large blobs
- fetch-pack: add --no-filter
- fetch-pack, index-pack, transport: partial clone
- upload-pack: add object filtering for partial clone (this branch uses jh/fsck-promisors and jh/object-filtering.)

The machinery to clone & fetch, which in turn involves packing and unpacking objects, have been told how to omit certain objects using the filtering mechanism introduced by the jh/object-filtering topic, and also mark the resulting pack as a promisor pack to tolerate missing objects, taking advantage of the mechanism introduced by the jh/fsck-promisors topic.

* sb/describe-blob (2017-12-08) 8 commits
- SQUASH???
- builtin/describe.c: describe a blob
- builtin/describe.c: factor out describe_commit
- builtin/describe.c: print debug statements earlier
- builtin/describe.c: rename oid to avoid variable shadowing
- revision.h: introduce blob/tree walking in order of the commits
- list-objects.c: factor out traverse_trees_and_blobs
- t6120: fix typo in test name

"git describe" was taught to dig trees deeper to find a <commit-ish>:<path> that refers to a given blob object.

* pb/bisect-helper-2 (2017-10-28) 8 commits
- t6030: make various test to pass GETTEXT_POISON tests
- bisect--helper: bisect_start shell function partially in C
- bisect--helper: get_terms & bisect_terms shell function in C
- bisect--helper: bisect_next_check shell function in C
- bisect--helper: check_and_set_terms shell function in C
- wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
- bisect--helper: bisect_write shell function in C
- bisect--helper: bisect_reset shell function in C

Expecting a reroll.
cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>

* ot/mru-on-list (2017-10-01) 1 commit
- mru: use double-linked list from list.h

The first step to getting rid of mru API and using the doubly-linked list API directly instead.

Is there any remaining issues on this one?

* jm/svn-pushmergeinfo-fix (2017-09-17) 1 commit
- git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.

"git svn dcommit" did not take into account the fact that a svn+ssh:// URL with a username@ (typically used for pushing) refers to the same SVN repository without the username@ and failed when svn.pushmergeinfo option is set.

Needs a test, perhaps as a follow-up patch.

Will merge to 'next'.

It seems my series that fixes an error message in 'git-rebase'[1] (apart from a little cleanups) is missing. I guess I addressed the issue that was raised in 3/3 as a v3 for that patch[2]. Are any more changes needed?

[1]: <[email protected]> [2]: <[email protected]>

Kaartic

I think you only sent 3/3 in newer rounds, which made it not to apply to my tree. If you meant to drop changes in 1/3 and 2/3, perhaps because they were needless churn, then 3/3 needs to be updated not to depend on the changes these two made.

Thanks.

Here is what I reconstructed to suit my taste better ;-)

-- >8 --
From: Kaartic Sivaraam <[email protected]>
Date: Mon, 27 Nov 2017 22:51:02 +0530
Subject: [PATCH v4 1/3] rebase: consistently use branch_name variable

The variable "branch_name" holds the <branch> parameter in "git rebase <upstream> <branch>", but one codepath did not use it after assigning $1 to it (instead it kept using $1). Make it use the variable consistently.

Also, update an error message to say there is no such branch or commit, as we are expecting either of them, and not limiting ourselves to a branch name.

---
 git-rebase.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

index 60b70f3def..5526b17a36 100755
@@ -528,15 +528,18 @@ case "$#" in
 	branch_name="$1"
 	switch_to="$1"
 
-	if git show-ref --verify --quiet -- "refs/heads/$1" &&
-	   orig_head=$(git rev-parse -q --verify "refs/heads/$1")
+	# Is it a local branch?
+	if git show-ref --verify --quiet -- "refs/heads/$branch_name" &&
+	   orig_head=$(git rev-parse -q --verify "refs/heads/$branch_name")
 	then
-		head_name="refs/heads/$1"
-	elif orig_head=$(git rev-parse -q --verify "$1")
+		head_name="refs/heads/$branch_name"
+	# If not is it a valid ref (branch or commit)?
+	elif orig_head=$(git rev-parse -q --verify "$branch_name")
 	then
 		head_name="detached HEAD"
+
 	else
-		die "$(eval_gettext "fatal: no such branch: \$branch_name")"
+		die "$(eval_gettext "fatal: no such branch/commit: \$branch_name")"
 	fi
 	;;
 0)

@@ -547,7 +550,7 @@ case "$#" in
 		branch_name=$(expr "z$branch_name" : 'zrefs/heads/\(.*\)')
 	else
 		head_name="detached HEAD"
-		branch_name=HEAD ;# detached
+		branch_name=HEAD
 	fi
 	orig_head=$(git rev-parse --verify HEAD) || exit
 	;;

2.15.1-554-g7ec1e7e2b9

Looks good to me except that your v4 3/3 seems to be spawning a subshell is an oversight, I guess? Also, I guess it would be better if there was comment in the code saying 'branch_nam' might hold a commit/branch name. No worries I'll send a v5 to that thread based on your v4.

Thanks,
Kaartic

From: Kaartic Sivaraam <[email protected]>
Date: Mon, 27 Nov 2017 22:51:03 +0530

---
 git-rebase.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 5526b17a36..e5adb596a0 100755
@@ -477,7 +477,7 @@ then
 		;;
 	esac
 	upstream=$(peel_committish "${upstream_name}") ||
-	die "$(eval_gettext "invalid upstream \$upstream_name")"
+	die "$(eval_gettext "invalid upstream '\$upstream_name'")"
 	upstream_arg="$upstream_name"
 else
 	if test -z "$onto"

@@ -539,7 +539,7 @@ case "$#" in
 		head_name="detached HEAD"
 
 	else
-		die "$(eval_gettext "fatal: no such branch/commit: \$branch_name")"
+		die "$(eval_gettext "fatal: no such branch/commit '\$branch_name'")"
 	fi
 	;;
 0)

2.15.1-554-g7ec1e7e2b9

From: Kaartic Sivaraam <[email protected]>
Date: Mon, 27 Nov 2017 22:51:04 +0530

Attempting to rebase when the HEAD is detached and is already up to date with upstream (so there's nothing to do), the following message is shown

Current branch HEAD is up to date.

which is clearly wrong as HEAD is not a branch.

Handle the special case of HEAD correctly to give a more precise error message.

---
 git-rebase.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

index e5adb596a0..f3dd864437 100755
@@ -601,11 +601,23 @@ then
 		test -z "$switch_to" ||
 		GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \
 			git checkout -q "$switch_to" --
-		say "$(eval_gettext "Current branch \$branch_name is up to date.")"
+		if test "$branch_name" = "HEAD" &&
+			 !(git symbolic-ref -q HEAD)
+		then
+			say "$(eval_gettext "HEAD is up to date.")"
+		else
+			say "$(eval_gettext "Current branch \$branch_name is up to date.")"
+		fi
 		finish_rebase
 		exit 0
 	else
-		say "$(eval_gettext "Current branch \$branch_name is up to date, rebase forced.")"
+		if test "$branch_name" = "HEAD" &&
+			 !(git symbolic-ref -q HEAD)
+		then
+			say "$(eval_gettext "HEAD is up to date, rebase forced.")"
+		else
+			say "$(eval_gettext "Current branch \$branch_name is up to date, rebase forced.")"
+		fi
 	fi
 fi
 

2.15.1-554-g7ec1e7e2b9

That's surprising, let me check.

2/3 is for sure not needless. But 1/3 might be. Though I think it improves the communicativity of the variable name. In case you think it's completely useless, then I can drop it as we won't lose much anyway ??

---
Kaartic

On Wed, Dec 13 2017, Junio C. Hamano jotted:

I noticed this tiny grammar error in the commit message which you may want to amend (or maybe it's not worth it since it's in next already):

As a side-effect of these general changes the perl documentation now only installed by install-{doc,man}, not a mere "install" as before

That should be:

As a side-effect of these general changes the perl documentation is now only installed by install-{doc,man}, not a mere "install" as before

I.e. it's missing an "is" between "documentation" and "now".

Hi,

Sorry, I should have replied about this a long time ago: I love this option but I am not sure that --blobfind is the right name for it. If we can think of a better name quickly then it would be nice to change it before people start relying on it, so I'd rather hold off on merging this to 'master' for the moment.

That said, if we don't have any better ideas for the option name within a few days then my objection goes away.

I'll reply in the patch thread.

Thanks,
Jonathan

Sorry. I should have updated the description when the option name was updated in the latest round.
Jonathan Nieder <[email protected]> writes:

Sure. My worry still applies:
https://public-inbox.org/git/[email protected]/

But as I said, if nothing comes of it within a few days then I'm happy to conclude that we did our best.

Thanks,
Jonathan

Hi Junio,

I hope you do not mean this literally. There is no need to bring family planning into a technical document.

Ciao,
Dscho

Hi Junio,

this fixes a bug that affects the Git LFS community (not only eye-candy). Would it be possible to get this into Git 2.15.2?

Thanks,
Lars

The topic is in 'master' and is a candidate to eventually hit the 'maint' track. I do not know if 2.15.2 is warranted, though, as we are getting closer to 2.16 and supposed to be concentrating more on regression fixes.

Thanks.