To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Feb 2017, #08; Fri, 24)
-X-master-at: e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7
-X-next-at: 67fe103aa68d54c3706f4a9cdf52c50f21979829
+Subject: What's cooking in git.git (Feb 2017, #09; Mon, 27)
+X-master-at: 3bc53220cb2dcf709f7a027a3f526befd021d858
+X-next-at: 7373a1b73d524fe4dd36076fe0044bc966dc5055
-What's cooking in git.git (Feb 2017, #08; Fri, 24)
+What's cooking in git.git (Feb 2017, #09; Mon, 27)
--------------------------------------------------
Here are the topics that have been cooking. 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.
-v2.12 has been tagged. Special thanks go to Dscho, who (among other
-things) laid the groundwork for speeding up "rebase -i" (which I am
-hoping to be finalized in the upcoming cycle) and rewrote "difftool"
-in C and to Peff who was all over the place cleaning the code up,
-fixing surfaced and unsurfaced bugs. Thanks for everybody else,
-too, who worked hard on the release.
+The first batch post 2.12 is rather a big one (and intentionally
+so). Among the notable is that major part of "rebase -i" is now
+driven by the sequencer backend (Thanks, Dscho), and the API
+implementations of attribute subsystem and ref subsystem have also
+been cleaned up (Thanks, Brandon & Michael).
+
+The tip of 'next' has been rewound.
You can find the changes described here in the integration branches
of the repositories listed at
Doc update.
+* bw/attr (2017-02-01) 27 commits
+ (merged to 'next' on 2017-02-14 at d35c1d7e4a)
+ + attr: reformat git_attr_set_direction() function
+ + attr: push the bare repo check into read_attr()
+ + attr: store attribute stack in attr_check structure
+ + attr: tighten const correctness with git_attr and match_attr
+ + attr: remove maybe-real, maybe-macro from git_attr
+ + attr: eliminate global check_all_attr array
+ + attr: use hashmap for attribute dictionary
+ + attr: change validity check for attribute names to use positive logic
+ + attr: pass struct attr_check to collect_some_attrs
+ + attr: retire git_check_attrs() API
+ + attr: convert git_check_attrs() callers to use the new API
+ + attr: convert git_all_attrs() to use "struct attr_check"
+ + attr: (re)introduce git_check_attr() and struct attr_check
+ + attr: rename function and struct related to checking attributes
+ + attr.c: outline the future plans by heavily commenting
+ + Documentation: fix a typo
+ + attr.c: add push_stack() helper
+ + attr: support quoting pathname patterns in C style
+ + attr.c: plug small leak in parse_attr_line()
+ + attr.c: tighten constness around "git_attr" structure
+ + attr.c: simplify macroexpand_one()
+ + attr.c: mark where #if DEBUG ends more clearly
+ + attr.c: complete a sentence in a comment
+ + attr.c: explain the lack of attr-name syntax check in parse_attr()
+ + attr.c: update a stale comment on "struct match_attr"
+ + attr.c: use strchrnul() to scan for one line
+ + commit.c: use strchrnul() to scan for one line
+
+ The gitattributes machinery is being taught to work better in a
+ multi-threaded environment.
+
+
+* cw/tag-reflog-message (2017-02-08) 1 commit
+ (merged to 'next' on 2017-02-10 at 3968b3a58b)
+ + tag: generate useful reflog message
+
+ "git tag" did not leave useful message when adding a new entry to
+ reflog; this was left unnoticed for a long time because refs/tags/*
+ doesn't keep reflog by default.
+
+
* dr/doc-check-ref-format-normalize (2017-02-21) 1 commit
(merged to 'next' on 2017-02-21 at 5e88b7a93d)
+ git-check-ref-format: clarify documentation for --normalize
Doc update.
+* dt/gc-ignore-old-gc-logs (2017-02-13) 1 commit
+ (merged to 'next' on 2017-02-16 at 8f48e1b405)
+ + gc: ignore old gc.log files
+
+ A "gc.log" file left by a backgrounded "gc --auto" disables further
+ automatic gc; it has been taught to run at least once a day (by
+ default) by ignoring a stale "gc.log" file that is too old.
+
+
* gp/document-dotfiles-in-templates-are-not-copied (2017-02-17) 1 commit
(merged to 'next' on 2017-02-21 at bbfa2bb7d4)
+ init: document dotfiles exclusion on template copy
Doc update.
+* jh/preload-index-skip-skip (2017-02-10) 1 commit
+ (merged to 'next' on 2017-02-16 at 39077062f9)
+ + preload-index: avoid lstat for skip-worktree items
+
+ The preload-index code has been taught not to bother with the index
+ entries that are paths that are not checked out by "sparse checkout".
+
+
+* jk/alternate-ref-optim (2017-02-08) 11 commits
+ (merged to 'next' on 2017-02-10 at f26f32cff6)
+ + receive-pack: avoid duplicates between our refs and alternates
+ + receive-pack: treat namespace .have lines like alternates
+ + receive-pack: fix misleading namespace/.have comment
+ + receive-pack: use oidset to de-duplicate .have lines
+ + add oidset API
+ + fetch-pack: cache results of for_each_alternate_ref
+ + for_each_alternate_ref: replace transport code with for-each-ref
+ + for_each_alternate_ref: pass name/oid instead of ref struct
+ + for_each_alternate_ref: use strbuf for path allocation
+ + for_each_alternate_ref: stop trimming trailing slashes
+ + for_each_alternate_ref: handle failure from real_pathdup()
+
+ Optimizes resource usage while enumerating refs from alternate
+ object store, to help receiving end of "push" that hosts a
+ repository with many "forks".
+
+
+* jk/delta-chain-limit (2017-01-27) 2 commits
+ (merged to 'next' on 2017-02-06 at 9ff36ae9b2)
+ + pack-objects: convert recursion to iteration in break_delta_chain()
+ + pack-objects: enforce --depth limit in reused deltas
+
+ "git repack --depth=<n>" for a long time busted the specified depth
+ when reusing delta from existing packs. This has been corrected.
+
+
+* jk/describe-omit-some-refs (2017-01-23) 5 commits
+ (merged to 'next' on 2017-01-23 at f8a14b4996)
+ + describe: teach describe negative pattern matches
+ + describe: teach --match to accept multiple patterns
+ + name-rev: add support to exclude refs by pattern match
+ + name-rev: extend --refs to accept multiple patterns
+ + doc: add documentation for OPT_STRING_LIST
+
+ "git describe" and "git name-rev" have been taught to take more
+ than one refname patterns to restrict the set of refs to base their
+ naming output on, and also learned to take negative patterns to
+ name refs not to be used for naming via their "--exclude" option.
+
+
+* jk/grep-no-index-fix (2017-02-14) 7 commits
+ (merged to 'next' on 2017-02-16 at c84c927fa8)
+ + grep: treat revs the same for --untracked as for --no-index
+ + grep: do not diagnose misspelt revs with --no-index
+ + grep: avoid resolving revision names in --no-index case
+ + grep: fix "--" rev/pathspec disambiguation
+ + grep: re-order rev-parsing loop
+ + grep: do not unnecessarily query repo for "--"
+ + grep: move thread initialization a little lower
+
+ The code to parse the command line "git grep <patterns>... <rev>
+ [[--] <pathspec>...]" has been cleaned up, and a handful of bugs
+ have been fixed (e.g. we used to check "--" if it is a rev).
+
+
+* jk/show-branch-lift-name-len-limit (2017-02-15) 3 commits
+ (merged to 'next' on 2017-02-16 at 40d22f5f34)
+ + show-branch: use skip_prefix to drop magic numbers
+ + show-branch: store resolved head in heap buffer
+ + show-branch: drop head_len variable
+
+ "git show-branch" expected there were only very short branch names
+ in the repository and used a fixed-length buffer to hold them
+ without checking for overflow.
+
+
+* jk/tempfile-ferror-fclose-confusion (2017-02-17) 1 commit
+ (merged to 'next' on 2017-02-21 at 479ba0131f)
+ + tempfile: set errno to a known value before calling ferror()
+
+ A caller of tempfile API that uses stdio interface to write to
+ files may ignore errors while writing, which is detected when
+ tempfile is closed (with a call to ferror()). By that time, the
+ original errno that may have told us what went wrong is likely to
+ be long gone and was overwritten by an irrelevant value.
+ close_tempfile() now resets errno to EIO to make errno at least
+ predictable.
+
+
+* jn/remote-helpers-with-git-dir (2017-02-14) 2 commits
+ (merged to 'next' on 2017-02-16 at c093c543c4)
+ + remote helpers: avoid blind fall-back to ".git" when setting GIT_DIR
+ + remote: avoid reading $GIT_DIR config in non-repo
+
+ "git ls-remote" and "git archive --remote" are designed to work
+ without being in a directory under Git's control. However, recent
+ updates revealed that we randomly look into a directory called
+ .git/ without actually doing necessary set-up when working in a
+ repository. Stop doing so.
+
+
+* js/git-path-in-subdir (2017-02-17) 2 commits
+ (merged to 'next' on 2017-02-17 at b3c3b2dce6)
+ + rev-parse: fix several options when running in a subdirectory
+ + rev-parse tests: add tests executed from a subdirectory
+
+ The "--git-path", "--git-common-dir", and "--shared-index-path"
+ options of "git rev-parse" did not produce usable output. They are
+ now updated to show the path to the correct file, relative to where
+ the caller is.
+
+
+* js/rebase-helper (2017-02-09) 2 commits
+ (merged to 'next' on 2017-02-14 at ae2474048e)
+ + rebase -i: use the rebase--helper builtin
+ + rebase--helper: add a builtin helper for interactive rebases
+
+ "git rebase -i" starts using the recently updated "sequencer" code.
+
+
+* km/delete-ref-reflog-message (2017-02-20) 4 commits
+ (merged to 'next' on 2017-02-21 at 4ee4ce3f64)
+ + branch: record creation of renamed branch in HEAD's log
+ + rename_ref: replace empty message in HEAD's log
+ + update-ref: pass reflog message to delete_ref()
+ + delete_ref: accept a reflog message argument
+
+ "git update-ref -d" and other operations to delete references did
+ not leave any entry in HEAD's reflog when the reference being
+ deleted was the current branch. This is not a problem in practice
+ because you do not want to delete the branch you are currently on,
+ but caused renaming of the current branch to something else not to
+ be logged in a useful way.
+
+
+* kn/ref-filter-branch-list (2017-02-07) 21 commits
+ (merged to 'next' on 2017-02-10 at 794bb8284d)
+ + ref-filter: resurrect "strip" as a synonym to "lstrip"
+ (merged to 'next' on 2017-01-31 at e7592a5461)
+ + branch: implement '--format' option
+ + branch: use ref-filter printing APIs
+ + branch, tag: use porcelain output
+ + ref-filter: allow porcelain to translate messages in the output
+ + ref-filter: add an 'rstrip=<N>' option to atoms which deal with refnames
+ + ref-filter: modify the 'lstrip=<N>' option to work with negative '<N>'
+ + ref-filter: Do not abruptly die when using the 'lstrip=<N>' option
+ + ref-filter: rename the 'strip' option to 'lstrip'
+ + ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
+ + ref-filter: introduce refname_atom_parser()
+ + ref-filter: introduce refname_atom_parser_internal()
+ + ref-filter: make "%(symref)" atom work with the ':short' modifier
+ + ref-filter: add support for %(upstream:track,nobracket)
+ + ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
+ + ref-filter: introduce format_ref_array_item()
+ + ref-filter: move get_head_description() from branch.c
+ + ref-filter: modify "%(objectname:short)" to take length
+ + ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
+ + ref-filter: include reference to 'used_atom' within 'atom_value'
+ + ref-filter: implement %(if), %(then), and %(else) atoms
+
+ The code to list branches in "git branch" has been consolidated
+ with the more generic ref-filter API.
+
+
+* lt/pathspec-negative (2017-02-10) 2 commits
+ (merged to 'next' on 2017-02-10 at 8ea7874076)
+ + pathspec: don't error out on all-exclusionary pathspec patterns
+ + pathspec magic: add '^' as alias for '!'
+
+ The "negative" pathspec feature was somewhat more cumbersome to use
+ than necessary in that its short-hand used "!" which needed to be
+ escaped from shells, and it required "exclude from what?" specified.
+
+
+* mh/ref-remove-empty-directory (2017-01-07) 23 commits
+ (merged to 'next' on 2017-02-10 at bcfd359e95)
+ + files_transaction_commit(): clean up empty directories
+ + try_remove_empty_parents(): teach to remove parents of reflogs, too
+ + try_remove_empty_parents(): don't trash argument contents
+ + try_remove_empty_parents(): rename parameter "name" -> "refname"
+ + delete_ref_loose(): inline function
+ + delete_ref_loose(): derive loose reference path from lock
+ + log_ref_write_1(): inline function
+ + log_ref_setup(): manage the name of the reflog file internally
+ + log_ref_write_1(): don't depend on logfile argument
+ + log_ref_setup(): pass the open file descriptor back to the caller
+ + log_ref_setup(): improve robustness against races
+ + log_ref_setup(): separate code for create vs non-create
+ + log_ref_write(): inline function
+ + rename_tmp_log(): improve error reporting
+ + rename_tmp_log(): use raceproof_create_file()
+ + lock_ref_sha1_basic(): use raceproof_create_file()
+ + lock_ref_sha1_basic(): inline constant
+ + raceproof_create_file(): new function
+ + safe_create_leading_directories(): set errno on SCLD_EXISTS
+ + safe_create_leading_directories_const(): preserve errno
+ + t5505: use "for-each-ref" to test for the non-existence of references
+ + refname_is_safe(): correct docstring
+ + files_rename_ref(): tidy up whitespace
+ (this branch is used by nd/files-backend-git-dir, nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
+
+ Deletion of a branch "foo/bar" could remove .git/refs/heads/foo
+ once there no longer is any other branch whose name begins with
+ "foo/", but we didn't do so so far. Now we do.
+
+
+* mh/submodule-hash (2017-02-13) 9 commits
+ (merged to 'next' on 2017-02-14 at 43f2dcbe29)
+ + read_loose_refs(): read refs using resolve_ref_recursively()
+ + files_ref_store::submodule: use NULL for the main repository
+ + base_ref_store_init(): remove submodule argument
+ + refs: push the submodule attribute down
+ + refs: store submodule ref stores in a hashmap
+ + register_ref_store(): new function
+ + refs: remove some unnecessary handling of submodule == ""
+ + refs: make some ref_store lookup functions private
+ + refs: reorder some function definitions
+ (this branch is used by nd/files-backend-git-dir, nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
+
+ Code and design clean-up for the refs API.
+
+
+* mm/merge-rename-delete-message (2017-01-30) 1 commit
+ (merged to 'next' on 2017-02-10 at 8bf8146029)
+ + merge-recursive: make "CONFLICT (rename/delete)" message show both paths
+
+ When "git merge" detects a path that is renamed in one history
+ while the other history deleted (or modified) it, it now reports
+ both paths to help the user understand what is going on in the two
+ histories being merged.
+
+
+* mm/two-more-xstrfmt (2017-02-16) 2 commits
+ (merged to 'next' on 2017-02-17 at 2454ee9847)
+ + bisect_next_all: convert xsnprintf to xstrfmt
+ + stop_progress_msg: convert xsnprintf to xstrfmt
+
+ Code clean-up and a string truncation fix.
+
+
+* nd/clean-preserve-errno-in-warning (2017-02-16) 1 commit
+ (merged to 'next' on 2017-02-16 at c0802f7627)
+ + clean: use warning_errno() when appropriate
+
+ Some warning() messages from "git clean" were updated to show the
+ errno from failed system calls.
+
+
* ps/doc-gc-aggressive-depth-update (2017-02-24) 1 commit
(merged to 'next' on 2017-02-24 at f023322bbb)
+ docs/git-gc: fix default value for `--aggressiveDepth`
Doc update.
+* ps/urlmatch-wildcard (2017-02-01) 5 commits
+ (merged to 'next' on 2017-02-10 at 2ed9ea48ee)
+ + urlmatch: allow globbing for the URL host part
+ + urlmatch: include host in urlmatch ranking
+ + urlmatch: split host and port fields in `struct url_info`
+ + urlmatch: enable normalization of URLs with globs
+ + mailmap: add Patrick Steinhardt's work address
+
+ The <url> part in "http.<url>.<variable>" configuration variable
+ can now be spelled with '*' that serves as wildcard.
+ E.g. "http.https://*.example.com.proxy" can be used to specify the
+ proxy used for https://a.example.com, https://b.example.com, etc.,
+ i.e. any host in the example.com domain.
+
+
+* rl/remote-allow-missing-branch-name-merge (2017-02-21) 1 commit
+ (merged to 'next' on 2017-02-22 at cbe923c8da)
+ + remote: ignore failure to remove missing branch.<name>.merge
+
+ "git remote rm X", when a branch has remote X configured as the
+ value of its branch.*.remote, tried to remove branch.*.remote and
+ branch.*.merge and failed if either is unset.
+
+
* rt/align-add-i-help-text (2017-02-22) 1 commit
(merged to 'next' on 2017-02-22 at a8573afb9a)
+ git add -i: replace \t with blanks in the help message
Doc update.
+
+* sf/putty-w-args (2017-02-10) 5 commits
+ (merged to 'next' on 2017-02-14 at 7f157e7020)
+ + connect.c: stop conflating ssh command names and overrides
+ + connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config
+ + git_connect(): factor out SSH variant handling
+ + connect: rename tortoiseplink and putty variables
+ + connect: handle putty/plink also in GIT_SSH_COMMAND
+
+ The command line options for ssh invocation needs to be tweaked for
+ some implementations of SSH (e.g. PuTTY plink wants "-P <port>"
+ while OpenSSH wants "-p <port>" to specify port to connect to), and
+ the variant was guessed when GIT_SSH environment variable is used
+ to specify it. The logic to guess now applies to the command
+ specified by the newer GIT_SSH_COMMAND and also core.sshcommand
+ configuration variable, and comes with an escape hatch for users to
+ deal with misdetected cases.
+
+
+* sg/completion (2017-02-13) 22 commits
+ (merged to 'next' on 2017-02-13 at 118c192874)
+ + completion: restore removed line continuating backslash
+ (merged to 'next' on 2017-02-10 at 55b2785d89)
+ + completion: cache the path to the repository
+ + completion: extract repository discovery from __gitdir()
+ + completion: don't guard git executions with __gitdir()
+ + completion: consolidate silencing errors from git commands
+ + completion: don't use __gitdir() for git commands
+ + completion: respect 'git -C <path>'
+ + rev-parse: add '--absolute-git-dir' option
+ + completion: fix completion after 'git -C <path>'
+ + completion: don't offer commands when 'git --opt' needs an argument
+ + completion: list short refs from a remote given as a URL
+ + completion: don't list 'HEAD' when trying refs completion outside of a repo
+ + completion: list refs from remote when remote's name matches a directory
+ + completion: respect 'git --git-dir=<path>' when listing remote refs
+ + completion: fix most spots not respecting 'git --git-dir=<path>'
+ + completion: ensure that the repository path given on the command line exists
+ + completion tests: add tests for the __git_refs() helper function
+ + completion tests: check __gitdir()'s output in the error cases
+ + completion tests: consolidate getting path of current working directory
+ + completion tests: make the $cur variable local to the test helper functions
+ + completion tests: don't add test cruft to the test repository
+ + completion: improve __git_refs()'s in-code documentation
+ (this branch is used by sg/completion-refs-speedup.)
+
+ Clean-up and updates to command line completion (in contrib/).
+
+
+* vn/xdiff-func-context (2017-01-15) 1 commit
+ (merged to 'next' on 2017-02-21 at 838eab8d93)
+ + xdiff -W: relax end-of-file function detection
+
+ "git diff -W" has been taught to handle the case where a new
+ function is added at the end of the file better.
+
--------------------------------------------------
[New Topics]
variable for the duration of cmd had two small bugs, which have
been fixed.
- Will merge to and then cook in 'next'.
- This supersedes jc/config-case-cmdline topic.
+ Will merge to 'next'.
+ This supersedes jc/config-case-cmdline topic that has been discarded.
+
+
+* ab/cond-skip-tests (2017-02-27) 2 commits
+ - gitweb tests: skip tests when we don't have Time::HiRes
+ - cvs tests: skip tests that call "cvs commit" when running as root
+
+ A few tests were run conditionally under (rare) conditions where
+ they cannot be run (like running cvs tests under 'root' account).
+
+
+* jk/auto-namelen-in-interpret-branch-name (2017-02-27) 1 commit
+ - interpret_branch_name(): handle auto-namelen for @{-1}
+
+ A small bug in the code that parses @{...} has been fixed.
+
+ Will merge to 'next'.
+
+
+* jk/interop-test (2017-02-27) 2 commits
+ - t/interop: add test of old clients against modern git-daemon
+ - t: add an interoperability test harness
+
+ Picking two versions of Git and running tests to make sure the
+ older one and the newer one interoperate happily has now become
+ possible.
+
+ Needs review.
+
+
+* jk/parse-config-key-cleanup (2017-02-24) 3 commits
+ - parse_hide_refs_config: tell parse_config_key we don't want a subsection
+ - parse_config_key: allow matching single-level config
+ - parse_config_key: use skip_prefix instead of starts_with
+ (this branch uses sb/parse-hide-refs-config-cleanup.)
+
+ The "parse_config_key()" API function has been cleaned up.
+
+ Will merge to 'next'.
+
+
+* jk/t6300-cleanup (2017-02-27) 1 commit
+ - t6300: avoid creating refs/heads/HEAD
+
+ A test that creats a confusing branch whose name is HEAD when any
+ branch name would have sufficed has been corrected.
+
+ Will merge to 'next'.
+
+
+* rs/commit-parsing-optim (2017-02-27) 2 commits
+ - commit: don't check for space twice when looking for header
+ - commit: be more precise when searching for headers
+
+ The code that parses header fields in the commit object has been
+ updated for (micro)performance and code hygiene.
+
+ Will merge to 'next'.
+
+
+* rs/sha1-file-plug-fallback-base-leak (2017-02-27) 1 commit
+ - sha1_file: release fallback base's memory in unpack_entry()
+
+ A leak in a codepath to read from a packed object in (rare) cases
+ has been plugged.
+
+ Will merge to 'next'.
+
+
+* rs/strbuf-add-real-path (2017-02-27) 2 commits
+ - strbuf: add strbuf_add_real_path()
+ - cocci: use ALLOC_ARRAY
+
+ An helper function to make it easier to append the result from
+ real_path() to a strbuf has been added.
+
+ Will merge to 'next'.
+
+
+* sb/parse-hide-refs-config-cleanup (2017-02-24) 1 commit
+ - refs: parse_hide_refs_config to use parse_config_key
+ (this branch is used by jk/parse-config-key-cleanup.)
+
+ Code clean-up.
+
+ Will merge to 'next'.
+
+
+* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
+ - clone: respect configured fetch respecs during initial fetch
+
+ Needs review.
+ cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
+
+
+* sk/dash-is-previous (2017-02-27) 6 commits
+ - revert.c: delegate handling of "-" shorthand to setup_revisions
+ - merge.c: delegate handling of "-" shorthand to revision.c:get_sha1
+ - sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
+ - revision.c: args starting with "-" might be a revision
+ - revision.c: swap if/else blocks
+ - revision.c: do not update argv with unknown option
+
+ A dash "-" can be written to mean "the branch that was previously
+ checked out" in more places.
+
+ Needs review.
+ cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
--------------------------------------------------
[Stalled]
--------------------------------------------------
[Cooking]
-* js/curl-empty-auth-set-by-default (2017-02-22) 1 commit
- - http(s): automatically try NTLM authentication first
-
- Flip "http.emptyAuth" on by default to help OOB experience for
- users of HTTP Negotiate authentication scheme.
-
- Under discussion.
- cf. <20170222233419.q3fxqmrscosumbjm@genre.crustytoothpaste.net>
-
-
-* jh/send-email-one-cc (2017-02-23) 1 commit
+* jh/send-email-one-cc (2017-02-27) 1 commit
- send-email: only allow one address per body tag
"Cc:" on the trailer part does not have to conform to RFC strictly,
ignore anything after '>' when picking addresses, to allow non-address
cruft like " # stable 4.4" after the address.
- Will merge to and then cook in 'next'.
+ Will merge to 'next'.
-* jk/http-auth (2017-02-23) 1 commit
+* jk/http-auth (2017-02-27) 2 commits
+ - http: add an "auto" mode for http.emptyauth
- http: restrict auth methods to what the server advertises
Reduce authentication round-trip over HTTP when the server supports
just a single authentication method.
- Will merge to and then cook in 'next'.
- There is a follow-up that would supersede js/curl-empty-auth-set-by-default
- topic; as it expected to be refined further, it is not queued here yet.
+ Will merge to 'next'.
* jk/ident-empty (2017-02-23) 4 commits
user.email that consists of only cruft chars should have
consistently errored out, but didn't.
- Will merge to and then cook in 'next'.
+ Will merge to 'next'.
* jt/upload-pack-error-report (2017-02-23) 1 commit
This is generally not a problem (because "git fetch" will stop
before making such a request), but is the right thing to do.
- Will merge to and then cook in 'next'.
-
-
-* jk/tempfile-ferror-fclose-confusion (2017-02-17) 1 commit
- (merged to 'next' on 2017-02-21 at 479ba0131f)
- + tempfile: set errno to a known value before calling ferror()
-
- A caller of tempfile API that uses stdio interface to write to
- files may ignore errors while writing, which is detected when
- tempfile is closed (with a call to ferror()). By that time, the
- original errno that may have told us what went wrong is likely to
- be long gone and was overwritten by an irrelevant value.
- close_tempfile() now resets errno to EIO to make errno at least
- predictable.
-
- Will cook in 'next'.
+ Will merge to 'next'.
* ah/doc-ls-files-quotepath (2017-02-22) 1 commit
Documentation for "git ls-files" did not refer to core.quotePath
- Looked good, but another reroll is still incoming?
- cf. <3c801e54-28c7-52d0-6915-ee7aaf1d89c9@gmail.com>
-
-
-* jc/config-case-cmdline (2017-02-21) 3 commits
- (merged to 'next' on 2017-02-21 at 63d3652c77)
- + config: squelch stupid compiler
- (merged to 'next' on 2017-02-21 at 354f023a3a)
- + config: reject invalid VAR in 'git -c VAR=VAL command'
- + config: preserve <subsection> case for one-shot config on the command line
-
- The code to parse "git -c VAR=VAL cmd" and set configuration
- variable for the duration of cmd had two small bugs, which have
- been fixed.
-
- Will discard.
+ Reroll exists but not picked up yet.
* jh/memihash-opt (2017-02-17) 5 commits
Expecting an update for perf?
-* km/delete-ref-reflog-message (2017-02-20) 4 commits
- (merged to 'next' on 2017-02-21 at 4ee4ce3f64)
- + branch: record creation of renamed branch in HEAD's log
- + rename_ref: replace empty message in HEAD's log
- + update-ref: pass reflog message to delete_ref()
- + delete_ref: accept a reflog message argument
-
- "git update-ref -d" and other operations to delete references did
- not leave any entry in HEAD's reflog when the reference being
- deleted was the current branch. This is not a problem in practice
- because you do not want to delete the branch you are currently on,
- but caused renaming of the current branch to something else not to
- be logged in a useful way.
-
- Will cook in 'next'.
-
-
* nd/prune-in-worktree (2017-02-19) 15 commits
. rev-list: expose and document --single-worktree
. revision.c: --reflog add HEAD reflog from all worktrees
. revision.c: --indexed-objects add objects from all worktrees
. revision.c: refactor add_index_objects_to_pending()
. revision.h: new flag in struct rev_info wrt. worktree-related refs
- (this branch uses mh/ref-remove-empty-directory, mh/submodule-hash and nd/worktree-kill-parse-ref; is tangled with nd/files-backend-git-dir.)
+ (this branch uses nd/worktree-kill-parse-ref; is tangled with nd/files-backend-git-dir.)
"git gc" and friends when multiple worktrees are used off of a
single repository did not consider the index and per-worktree refs
of other worktrees as the root for reachability traversal, making
objects that are in use only in other worktrees to be subject to
- garbage collection.
-
-
-* mm/fetch-show-error-message-on-unadvertised-object (2017-02-22) 4 commits
- - fetch-pack: add specific error for fetching an unadvertised object
- - fetch_refs_via_pack: call report_unmatched_refs
- - squash??? remove unfinished sentence
- - fetch-pack: move code to report unmatched refs to a function
-
- "git fetch" that requests a commit by object name, when the other
- side does not allow such an request, failed without much
- explanation.
-
-
-* rl/remote-allow-missing-branch-name-merge (2017-02-21) 1 commit
- (merged to 'next' on 2017-02-22 at cbe923c8da)
- + remote: ignore failure to remove missing branch.<name>.merge
-
- "git remote rm X", when a branch has remote X configured as the
- value of its branch.*.remote, tried to remove branch.*.remote and
- branch.*.merge and failed if either is unset.
-
- Will cook in 'next'.
+ garbage collection.
-* vn/xdiff-func-context (2017-01-15) 1 commit
- (merged to 'next' on 2017-02-21 at 838eab8d93)
- + xdiff -W: relax end-of-file function detection
+* mm/fetch-show-error-message-on-unadvertised-object (2017-02-22) 4 commits
+ - fetch-pack: add specific error for fetching an unadvertised object
+ - fetch_refs_via_pack: call report_unmatched_refs
+ - squash??? remove unfinished sentence
+ - fetch-pack: move code to report unmatched refs to a function
- "git diff -W" has been taught to handle the case where a new
- function is added at the end of the file better.
+ "git fetch" that requests a commit by object name, when the other
+ side does not allow such an request, failed without much
+ explanation.
- Will cook in 'next'.
+ Will squash the change in before merging to 'next'.
* nd/worktree-kill-parse-ref (2017-02-19) 22 commits
. refs-internal.c: make files_log_ref_write() static
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
- (this branch is used by nd/prune-in-worktree; uses mh/ref-remove-empty-directory and mh/submodule-hash; is tangled with nd/files-backend-git-dir.)
+ (this branch is used by nd/prune-in-worktree; is tangled with nd/files-backend-git-dir.)
(hopefully) a beginning of safer "git worktree" that is resistant
to "gc".
- Needs review.
+ Waiting for nd/files-backend-git-dir to settle.
* nd/files-backend-git-dir (2017-02-22) 26 commits
. refs.h: add forward declaration for structs used in this file
. Merge branch 'mh/ref-remove-empty-directory' into nd/files-backend-git-dir
. Merge branch 'mh/submodule-hash' into nd/files-backend-git-dir
- (this branch uses mh/ref-remove-empty-directory and mh/submodule-hash; is tangled with nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
+ (this branch is tangled with nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
The "submodule" specific field in the ref_store structure is
replaced with a more generic "gitdir" that can later be used also
Needs review.
-* nd/clean-preserve-errno-in-warning (2017-02-16) 1 commit
- (merged to 'next' on 2017-02-16 at c0802f7627)
- + clean: use warning_errno() when appropriate
-
- Some warning() messages from "git clean" were updated to show the
- errno from failed system calls.
-
- Will cook in 'next'.
-
-
-* mm/two-more-xstrfmt (2017-02-16) 2 commits
- (merged to 'next' on 2017-02-17 at 2454ee9847)
- + bisect_next_all: convert xsnprintf to xstrfmt
- + stop_progress_msg: convert xsnprintf to xstrfmt
-
- Code clean-up and a string truncation fix.
-
- Will cook in 'next'.
-
-
* sb/checkout-recurse-submodules (2017-02-23) 15 commits
- builtin/checkout: add --recurse-submodules switch
- entry.c: update submodules when interesting
Needs review.
-* jh/preload-index-skip-skip (2017-02-10) 1 commit
- (merged to 'next' on 2017-02-16 at 39077062f9)
- + preload-index: avoid lstat for skip-worktree items
-
- The preload-index code has been taught not to bother with the index
- entries that are paths that are not checked out by "sparse checkout".
-
- Will cook in 'next'.
-
-
-* tg/stash-push (2017-02-19) 6 commits
+* tg/stash-push (2017-02-27) 7 commits
+ - SQUASH???
- stash: allow pathspecs in the no verb form
- stash: use stash_push for no verb form
- - stash: teach 'push' (and 'create_stash') to honor pathspec
- - stash: refactor stash_create
- - stash: add test for the create command line arguments
- - stash: introduce push verb
-
- Allow "git stash" to take pathspec so that the local changes can be
- stashed away only partially.
-
- Needs review.
- cf. <xmqqmvdfh4az.fsf@gitster.mtv.corp.google.com>
-
-
-* bc/object-id (2017-02-22) 19 commits
- - wt-status: convert to struct object_id
- - builtin/merge-base: convert to struct object_id
- - Convert object iteration callbacks to struct object_id
- - sha1_file: introduce an nth_packed_object_oid function
- - refs: simplify parsing of reflog entries
- - refs: convert each_reflog_ent_fn to struct object_id
- - reflog-walk: convert struct reflog_info to struct object_id
- - builtin/replace: convert to struct object_id
- - Convert remaining callers of resolve_refdup to object_id
- - builtin/merge: convert to struct object_id
- - builtin/clone: convert to struct object_id
- - builtin/branch: convert to struct object_id
- - builtin/grep: convert to struct object_id
- - builtin/fmt-merge-message: convert to struct object_id
- - builtin/fast-export: convert to struct object_id
- - builtin/describe: convert to struct object_id
- - builtin/diff-tree: convert to struct object_id
- - builtin/commit: convert to struct object_id
- - hex: introduce parse_oid_hex
-
- "uchar [40]" to "struct object_id" conversion continues.
-
- Now at v5; looked alright.
- cf. <20170221234737.894681-1-sandals@crustytoothpaste.net>
-
-
-* jk/grep-no-index-fix (2017-02-14) 7 commits
- (merged to 'next' on 2017-02-16 at c84c927fa8)
- + grep: treat revs the same for --untracked as for --no-index
- + grep: do not diagnose misspelt revs with --no-index
- + grep: avoid resolving revision names in --no-index case
- + grep: fix "--" rev/pathspec disambiguation
- + grep: re-order rev-parsing loop
- + grep: do not unnecessarily query repo for "--"
- + grep: move thread initialization a little lower
-
- The code to parse the command line "git grep <patterns>... <rev>
- [[--] <pathspec>...]" has been cleaned up, and a handful of bugs
- have been fixed (e.g. we used to check "--" if it is a rev).
-
- Will cook in 'next'.
-
-
-* jk/show-branch-lift-name-len-limit (2017-02-15) 3 commits
- (merged to 'next' on 2017-02-16 at 40d22f5f34)
- + show-branch: use skip_prefix to drop magic numbers
- + show-branch: store resolved head in heap buffer
- + show-branch: drop head_len variable
-
- "git show-branch" expected there were only very short branch names
- in the repository and used a fixed-length buffer to hold them
- without checking for overflow.
-
- Will cook in 'next'.
-
-
-* lt/oneline-decoration-at-end (2017-02-21) 2 commits
- (merged to 'next' on 2017-02-21 at 35c7731ee3)
- + log: fix regression to "--source" when "--decorate" was updated
- (merged to 'next' on 2017-02-16 at 5854e58811)
- + show decorations at the end of the line
-
- The output from "git log --oneline --decorate" has been updated to
- show the extra information at the end of the line, not near the
- front.
-
- Will cook in 'next'.
- Perhaps this is not such a cool idea?
- cf. <CA+55aFwT2HUBzZO8Gpt9tHoJtdRxv9oe3TDoSH5jcEOixRNBXg@mail.gmail.com>
-
-
-* jn/remote-helpers-with-git-dir (2017-02-14) 2 commits
- (merged to 'next' on 2017-02-16 at c093c543c4)
- + remote helpers: avoid blind fall-back to ".git" when setting GIT_DIR
- + remote: avoid reading $GIT_DIR config in non-repo
-
- "git ls-remote" and "git archive --remote" are designed to work
- without being in a directory under Git's control. However, recent
- updates revealed that we randomly look into a directory called
- .git/ without actually doing necessary set-up when working in a
- repository. Stop doing so.
-
- Will cook in 'next'.
-
-
-* jk/alternate-ref-optim (2017-02-08) 11 commits
- (merged to 'next' on 2017-02-10 at f26f32cff6)
- + receive-pack: avoid duplicates between our refs and alternates
- + receive-pack: treat namespace .have lines like alternates
- + receive-pack: fix misleading namespace/.have comment
- + receive-pack: use oidset to de-duplicate .have lines
- + add oidset API
- + fetch-pack: cache results of for_each_alternate_ref
- + for_each_alternate_ref: replace transport code with for-each-ref
- + for_each_alternate_ref: pass name/oid instead of ref struct
- + for_each_alternate_ref: use strbuf for path allocation
- + for_each_alternate_ref: stop trimming trailing slashes
- + for_each_alternate_ref: handle failure from real_pathdup()
-
- Optimizes resource usage while enumerating refs from alternate
- object store, to help receiving end of "push" that hosts a
- repository with many "forks".
-
- Will cook in 'next'.
-
-
-* lt/pathspec-negative (2017-02-10) 2 commits
- (merged to 'next' on 2017-02-10 at 8ea7874076)
- + pathspec: don't error out on all-exclusionary pathspec patterns
- + pathspec magic: add '^' as alias for '!'
-
- The "negative" pathspec feature was somewhat more cumbersome to use
- than necessary in that its short-hand used "!" which needed to be
- escaped from shells, and it required "exclude from what?" specified.
-
- Will cook in 'next'.
-
-
-* js/rebase-helper (2017-02-09) 2 commits
- (merged to 'next' on 2017-02-14 at ae2474048e)
- + rebase -i: use the rebase--helper builtin
- + rebase--helper: add a builtin helper for interactive rebases
-
- "git rebase -i" starts using the recently updated "sequencer" code.
-
- Will cook in 'next'.
- The change itself is small, but what it enables is rather a large
- body of new code. We are getting there ;-)
-
-
-* mh/submodule-hash (2017-02-13) 9 commits
- (merged to 'next' on 2017-02-14 at 43f2dcbe29)
- + read_loose_refs(): read refs using resolve_ref_recursively()
- + files_ref_store::submodule: use NULL for the main repository
- + base_ref_store_init(): remove submodule argument
- + refs: push the submodule attribute down
- + refs: store submodule ref stores in a hashmap
- + register_ref_store(): new function
- + refs: remove some unnecessary handling of submodule == ""
- + refs: make some ref_store lookup functions private
- + refs: reorder some function definitions
- (this branch is used by nd/files-backend-git-dir, nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
-
- Code and design clean-up for the refs API.
-
- Will cook in 'next'.
- The tip one is newer than the one posted to the list but was sent
- privately by the author via his GitHub repository.
-
-
-* jh/mingw-openssl-sha1 (2017-02-09) 1 commit
- (merged to 'next' on 2017-02-10 at 084b3d8503)
- + mingw: use OpenSSL's SHA-1 routines
-
- Windows port wants to use OpenSSL's implementation of SHA-1
- routines, so let them.
-
- Will cook in 'next'.
- cf. <31bb0b9f-d498-24b3-57d5-9f34cb8e3914@kdbg.org>
-
-
-* dt/gc-ignore-old-gc-logs (2017-02-13) 1 commit
- (merged to 'next' on 2017-02-16 at 8f48e1b405)
- + gc: ignore old gc.log files
-
- A "gc.log" file left by a backgrounded "gc --auto" disables further
- automatic gc; it has been taught to run at least once a day (by
- default) by ignoring a stale "gc.log" file that is too old.
-
- Will cook in 'next'.
- This is v6 posted on Feb 10th.
-
-
-* js/git-path-in-subdir (2017-02-17) 2 commits
- (merged to 'next' on 2017-02-17 at b3c3b2dce6)
- + rev-parse: fix several options when running in a subdirectory
- + rev-parse tests: add tests executed from a subdirectory
-
- The "--git-path", "--git-common-dir", and "--shared-index-path"
- options of "git rev-parse" did not produce usable output. They are
- now updated to show the path to the correct file, relative to where
- the caller is.
-
- Will cook in 'next'.
-
-
-* mh/ref-remove-empty-directory (2017-01-07) 23 commits
- (merged to 'next' on 2017-02-10 at bcfd359e95)
- + files_transaction_commit(): clean up empty directories
- + try_remove_empty_parents(): teach to remove parents of reflogs, too
- + try_remove_empty_parents(): don't trash argument contents
- + try_remove_empty_parents(): rename parameter "name" -> "refname"
- + delete_ref_loose(): inline function
- + delete_ref_loose(): derive loose reference path from lock
- + log_ref_write_1(): inline function
- + log_ref_setup(): manage the name of the reflog file internally
- + log_ref_write_1(): don't depend on logfile argument
- + log_ref_setup(): pass the open file descriptor back to the caller
- + log_ref_setup(): improve robustness against races
- + log_ref_setup(): separate code for create vs non-create
- + log_ref_write(): inline function
- + rename_tmp_log(): improve error reporting
- + rename_tmp_log(): use raceproof_create_file()
- + lock_ref_sha1_basic(): use raceproof_create_file()
- + lock_ref_sha1_basic(): inline constant
- + raceproof_create_file(): new function
- + safe_create_leading_directories(): set errno on SCLD_EXISTS
- + safe_create_leading_directories_const(): preserve errno
- + t5505: use "for-each-ref" to test for the non-existence of references
- + refname_is_safe(): correct docstring
- + files_rename_ref(): tidy up whitespace
- (this branch is used by nd/files-backend-git-dir, nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
+ - stash: teach 'push' (and 'create_stash') to honor pathspec
+ - stash: refactor stash_create
+ - stash: add test for the create command line arguments
+ - stash: introduce push verb
- Deletion of a branch "foo/bar" could remove .git/refs/heads/foo
- once there no longer is any other branch whose name begins with
- "foo/", but we didn't do so so far. Now we do.
+ Allow "git stash" to take pathspec so that the local changes can be
+ stashed away only partially.
- Will cook in 'next'.
+ Expecting a reroll.
+ I think this is almost there.
+ cf. <20170225213306.2410-1-t.gummerer@gmail.com>
-* cw/tag-reflog-message (2017-02-08) 1 commit
- (merged to 'next' on 2017-02-10 at 3968b3a58b)
- + tag: generate useful reflog message
+* bc/object-id (2017-02-22) 19 commits
+ - wt-status: convert to struct object_id
+ - builtin/merge-base: convert to struct object_id
+ - Convert object iteration callbacks to struct object_id
+ - sha1_file: introduce an nth_packed_object_oid function
+ - refs: simplify parsing of reflog entries
+ - refs: convert each_reflog_ent_fn to struct object_id
+ - reflog-walk: convert struct reflog_info to struct object_id
+ - builtin/replace: convert to struct object_id
+ - Convert remaining callers of resolve_refdup to object_id
+ - builtin/merge: convert to struct object_id
+ - builtin/clone: convert to struct object_id
+ - builtin/branch: convert to struct object_id
+ - builtin/grep: convert to struct object_id
+ - builtin/fmt-merge-message: convert to struct object_id
+ - builtin/fast-export: convert to struct object_id
+ - builtin/describe: convert to struct object_id
+ - builtin/diff-tree: convert to struct object_id
+ - builtin/commit: convert to struct object_id
+ - hex: introduce parse_oid_hex
- "git tag", because refs/tags/* doesn't keep reflog by default, did
- not leave useful message when adding a new entry to reflog.
+ "uchar [40]" to "struct object_id" conversion continues.
- Will cook in 'next'.
+ Now at v5.
+ cf. <20170221234737.894681-1-sandals@crustytoothpaste.net>
-* sg/completion (2017-02-13) 22 commits
- (merged to 'next' on 2017-02-13 at 118c192874)
- + completion: restore removed line continuating backslash
- (merged to 'next' on 2017-02-10 at 55b2785d89)
- + completion: cache the path to the repository
- + completion: extract repository discovery from __gitdir()
- + completion: don't guard git executions with __gitdir()
- + completion: consolidate silencing errors from git commands
- + completion: don't use __gitdir() for git commands
- + completion: respect 'git -C <path>'
- + rev-parse: add '--absolute-git-dir' option
- + completion: fix completion after 'git -C <path>'
- + completion: don't offer commands when 'git --opt' needs an argument
- + completion: list short refs from a remote given as a URL
- + completion: don't list 'HEAD' when trying refs completion outside of a repo
- + completion: list refs from remote when remote's name matches a directory
- + completion: respect 'git --git-dir=<path>' when listing remote refs
- + completion: fix most spots not respecting 'git --git-dir=<path>'
- + completion: ensure that the repository path given on the command line exists
- + completion tests: add tests for the __git_refs() helper function
- + completion tests: check __gitdir()'s output in the error cases
- + completion tests: consolidate getting path of current working directory
- + completion tests: make the $cur variable local to the test helper functions
- + completion tests: don't add test cruft to the test repository
- + completion: improve __git_refs()'s in-code documentation
- (this branch is used by sg/completion-refs-speedup.)
+* jh/mingw-openssl-sha1 (2017-02-09) 1 commit
+ - mingw: use OpenSSL's SHA-1 routines
- Clean-up and updates to command line completion (in contrib/).
+ Windows port wants to use OpenSSL's implementation of SHA-1
+ routines, so let them.
- Will cook in 'next'.
+ Kicked back to 'pu'
+ cf. <9913e513-553e-eba6-e81a-9c21030dd767@kdbg.org>
* sg/completion-refs-speedup (2017-02-13) 13 commits
- completion: support completing full refs after '--option=refs/<TAB>'
- completion: wrap __git_refs() for better option parsing
- completion: remove redundant __gitcomp_nl() options from _git_commit()
- (this branch uses sg/completion.)
The refs completion for large number of refs has been sped up,
partly by giving up disambiguating ambiguous refs and partly by
eliminating most of the shell processing between 'git for-each-ref'
and 'ls-remote' and Bash's completion facility.
- Will hold.
-
-
-* sk/parse-remote-cleanup (2017-02-21) 2 commits
- (merged to 'next' on 2017-02-21 at 302250072e)
- + Revert "parse-remote: remove reference to unused op_prep"
- (merged to 'next' on 2017-02-06 at 6ec89f72d5)
- + parse-remote: remove reference to unused op_prep
-
- Code clean-up.
-
- Will discard.
- There may be third-party scripts that are dot-sourcing this one.
-
-
-* jk/delta-chain-limit (2017-01-27) 2 commits
- (merged to 'next' on 2017-02-06 at 9ff36ae9b2)
- + pack-objects: convert recursion to iteration in break_delta_chain()
- + pack-objects: enforce --depth limit in reused deltas
-
- "git repack --depth=<n>" for a long time busted the specified depth
- when reusing delta from existing packs. This has been corrected.
-
- Will cook in 'next'.
-
-
-* mm/merge-rename-delete-message (2017-01-30) 1 commit
- (merged to 'next' on 2017-02-10 at 8bf8146029)
- + merge-recursive: make "CONFLICT (rename/delete)" message show both paths
-
- When "git merge" detects a path that is renamed in one history
- while the other history deleted (or modified) it, it now reports
- both paths to help the user understand what is going on in the two
- histories being merged.
-
- Will cook in 'next'.
-
-
-* ps/urlmatch-wildcard (2017-02-01) 5 commits
- (merged to 'next' on 2017-02-10 at 2ed9ea48ee)
- + urlmatch: allow globbing for the URL host part
- + urlmatch: include host in urlmatch ranking
- + urlmatch: split host and port fields in `struct url_info`
- + urlmatch: enable normalization of URLs with globs
- + mailmap: add Patrick Steinhardt's work address
-
- The <url> part in "http.<url>.<variable>" configuration variable
- can now be spelled with '*' that serves as wildcard.
- E.g. "http.https://*.example.com.proxy" can be used to specify the
- proxy used for https://a.example.com, https://b.example.com, etc.,
- i.e. any host in the example.com domain.
-
- Will cook in 'next'.
-
-
-* sf/putty-w-args (2017-02-10) 5 commits
- (merged to 'next' on 2017-02-14 at 7f157e7020)
- + connect.c: stop conflating ssh command names and overrides
- + connect: Add the envvar GIT_SSH_VARIANT and ssh.variant config
- + git_connect(): factor out SSH variant handling
- + connect: rename tortoiseplink and putty variables
- + connect: handle putty/plink also in GIT_SSH_COMMAND
-
- The command line options for ssh invocation needs to be tweaked for
- some implementations of SSH (e.g. PuTTY plink wants "-P <port>"
- while OpenSSH wants "-p <port>" to specify port to connect to), and
- the variant was guessed when GIT_SSH environment variable is used
- to specify it. The logic to guess now applies to the command
- specified by the newer GIT_SSH_COMMAND and also core.sshcommand
- configuration variable, and comes with an escape hatch for users to
- deal with misdetected cases.
-
- Will cook in 'next'.
-
-
-* jk/describe-omit-some-refs (2017-01-23) 5 commits
- (merged to 'next' on 2017-01-23 at f8a14b4996)
- + describe: teach describe negative pattern matches
- + describe: teach --match to accept multiple patterns
- + name-rev: add support to exclude refs by pattern match
- + name-rev: extend --refs to accept multiple patterns
- + doc: add documentation for OPT_STRING_LIST
-
- "git describe" and "git name-rev" have been taught to take more
- than one refname patterns to restrict the set of refs to base their
- naming output on, and also learned to take negative patterns to
- name refs not to be used for naming via their "--exclude" option.
-
- Will cook in 'next'.
-
-
-* bw/attr (2017-02-01) 27 commits
- (merged to 'next' on 2017-02-14 at d35c1d7e4a)
- + attr: reformat git_attr_set_direction() function
- + attr: push the bare repo check into read_attr()
- + attr: store attribute stack in attr_check structure
- + attr: tighten const correctness with git_attr and match_attr
- + attr: remove maybe-real, maybe-macro from git_attr
- + attr: eliminate global check_all_attr array
- + attr: use hashmap for attribute dictionary
- + attr: change validity check for attribute names to use positive logic
- + attr: pass struct attr_check to collect_some_attrs
- + attr: retire git_check_attrs() API
- + attr: convert git_check_attrs() callers to use the new API
- + attr: convert git_all_attrs() to use "struct attr_check"
- + attr: (re)introduce git_check_attr() and struct attr_check
- + attr: rename function and struct related to checking attributes
- + attr.c: outline the future plans by heavily commenting
- + Documentation: fix a typo
- + attr.c: add push_stack() helper
- + attr: support quoting pathname patterns in C style
- + attr.c: plug small leak in parse_attr_line()
- + attr.c: tighten constness around "git_attr" structure
- + attr.c: simplify macroexpand_one()
- + attr.c: mark where #if DEBUG ends more clearly
- + attr.c: complete a sentence in a comment
- + attr.c: explain the lack of attr-name syntax check in parse_attr()
- + attr.c: update a stale comment on "struct match_attr"
- + attr.c: use strchrnul() to scan for one line
- + commit.c: use strchrnul() to scan for one line
-
- The gitattributes machinery is being taught to work better in a
- multi-threaded environment.
-
- Will cook in 'next'.
-
-
-* kn/ref-filter-branch-list (2017-02-07) 21 commits
- (merged to 'next' on 2017-02-10 at 794bb8284d)
- + ref-filter: resurrect "strip" as a synonym to "lstrip"
- (merged to 'next' on 2017-01-31 at e7592a5461)
- + branch: implement '--format' option
- + branch: use ref-filter printing APIs
- + branch, tag: use porcelain output
- + ref-filter: allow porcelain to translate messages in the output
- + ref-filter: add an 'rstrip=<N>' option to atoms which deal with refnames
- + ref-filter: modify the 'lstrip=<N>' option to work with negative '<N>'
- + ref-filter: Do not abruptly die when using the 'lstrip=<N>' option
- + ref-filter: rename the 'strip' option to 'lstrip'
- + ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- + ref-filter: introduce refname_atom_parser()
- + ref-filter: introduce refname_atom_parser_internal()
- + ref-filter: make "%(symref)" atom work with the ':short' modifier
- + ref-filter: add support for %(upstream:track,nobracket)
- + ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- + ref-filter: introduce format_ref_array_item()
- + ref-filter: move get_head_description() from branch.c
- + ref-filter: modify "%(objectname:short)" to take length
- + ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- + ref-filter: include reference to 'used_atom' within 'atom_value'
- + ref-filter: implement %(if), %(then), and %(else) atoms
-
- The code to list branches in "git branch" has been consolidated
- with the more generic ref-filter API.
-
- Will cook in 'next'.
+ What's the donness of this topic?
* jk/no-looking-at-dotgit-outside-repo-final (2016-10-26) 1 commit
- (merged to 'next' on 2016-12-05 at 0c77e39cd5)
+ (merged to 'next' on 2017-02-27 at 7373a1b73d)
+ setup_git_env: avoid blind fall-back to ".git"
- Originally merged to 'next' on 2016-10-26
-
This is the endgame of the topic to avoid blindly falling back to
".git" when the setup sequence said we are _not_ in Git repository.
A corner case that happens to work right now may be broken by a
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
- (merged to 'next' on 2016-12-05 at 041946dae0)
+ (merged to 'next' on 2017-02-27 at 2c0f5f73d8)
+ merge: drop 'git merge <message> HEAD <commit>' syntax
- Originally merged to 'next' on 2016-10-11
-
Stop supporting "git merge <message> HEAD <commit>" syntax that has
been deprecated since October 2007, and issues a deprecation
warning message since v2.5.0.
[Discarded]
* sb/push-make-submodule-check-the-default (2017-01-26) 2 commits
- (merged to 'next' on 2017-01-26 at 5f4715cea6)
- + Revert "push: change submodule default to check when submodules exist"
- (merged to 'next' on 2016-12-12 at 1863e05af5)
- + push: change submodule default to check when submodules exist
+ . Revert "push: change submodule default to check when submodules exist"
+ . push: change submodule default to check when submodules exist
Turn the default of "push.recurseSubmodules" to "check" when
submodules seem to be in use.
configuration variables.
Superseded by jc/config-case-cmdline.
+
+
+* js/curl-empty-auth-set-by-default (2017-02-22) 1 commit
+ . http(s): automatically try NTLM authentication first
+
+ Flip "http.emptyAuth" on by default to help OOB experience for
+ users of HTTP Negotiate authentication scheme.
+
+ Superseded by jk/http-auth topic.
+
+
+* jc/config-case-cmdline (2017-02-21) 3 commits
+ . config: squelch stupid compiler
+ . config: reject invalid VAR in 'git -c VAR=VAL command'
+ . config: preserve <subsection> case for one-shot config on the command line
+
+ The code to parse "git -c VAR=VAL cmd" and set configuration
+ variable for the duration of cmd had two small bugs, which have
+ been fixed.
+
+ Superseded by jc/config-case-cmdline-take-2
+
+
+* lt/oneline-decoration-at-end (2017-02-21) 2 commits
+ . log: fix regression to "--source" when "--decorate" was updated
+ . show decorations at the end of the line
+
+ The output from "git log --oneline --decorate" has been updated to
+ show the extra information at the end of the line, not near the
+ front.
+
+ Retracted.
+ cf. <CA+55aFwT2HUBzZO8Gpt9tHoJtdRxv9oe3TDoSH5jcEOixRNBXg@mail.gmail.com>
+
+
+* sk/parse-remote-cleanup (2017-02-21) 2 commits
+ . Revert "parse-remote: remove reference to unused op_prep"
+ . parse-remote: remove reference to unused op_prep
+
+ Code clean-up.
+
+ Will discard.
+ There may be third-party scripts that are dot-sourcing this one.
+
+
projects / thirdparty / git.git / commitdiff
