To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Oct 2016, #04; Mon, 17)
+Subject: What's cooking in git.git (Oct 2016, #05; Thu, 20)
X-master-at: 659889482ac63411daea38b2c3d127842ea04e4d
-X-next-at: 6021889cc14df07d4366829367d2c4a11d1eaa56
+X-next-at: ffd0de042c0ecacbb6661b2f7becf79fe3cf1d4b
-What's cooking in git.git (Oct 2016, #04; Mon, 17)
+What's cooking in git.git (Oct 2016, #05; Thu, 20)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
http://git-blame.blogspot.com/p/git-public-repositories.html
--------------------------------------------------
-[Graduated to "master"]
-
-* da/mergetool-diff-order (2016-10-11) 4 commits
- (merged to 'next' on 2016-10-11 at 3d1b98c16d)
- + mergetool: honor -O<orderfile>
- + mergetool: honor diff.orderFile
- + mergetool: move main program flow into a main() function
- + mergetool: add copyright
-
- "git mergetool" learned to honor "-O<orderfile>" to control the
- order of paths to present to the end user.
+[New Topics]
+* jc/merge-base-fp-only (2016-10-19) 8 commits
+ . merge-base: fp experiment
+ - merge: allow to use only the fp-only merge bases
+ - merge-base: limit the output to bases that are on first-parent chain
+ - merge-base: mark bases that are on first-parent chain
+ - merge-base: expose get_merge_bases_many_0() a bit more
+ - merge-base: stop moving commits around in remove_redundant()
+ - sha1_name: remove ONELINE_SEEN bit
+ - commit: simplify fastpath of merge-base
-* dt/http-empty-auth (2016-10-04) 1 commit
- (merged to 'next' on 2016-10-10 at 10b7b0a6a5)
- + http: http.emptyauth should allow empty (not just NULL) usernames
+ An experiment of merge-base that ignores common ancestors that are
+ not on the first parent chain.
- http.emptyauth configuration is a way to allow an empty username to
- pass when attempting to authenticate using mechanisms like
- Kerberos. We took an unspecified (NULL) username and sent ":"
- (i.e. no username, no password) to CURLOPT_USERPWD, but did not do
- the same when the username is explicitly set to an empty string.
+* bw/submodule-branch-dot-doc (2016-10-19) 1 commit
+ - submodules doc: update documentation for "." used for submodule branches
-* jk/alt-odb-cleanup (2016-10-10) 18 commits
- (merged to 'next' on 2016-10-10 at d2ed6b6d21)
- + alternates: use fspathcmp to detect duplicates
- + sha1_file: always allow relative paths to alternates
- + count-objects: report alternates via verbose mode
- + fill_sha1_file: write into a strbuf
- + alternates: store scratch buffer as strbuf
- + fill_sha1_file: write "boring" characters
- + alternates: use a separate scratch space
- + alternates: encapsulate alt->base munging
- + alternates: provide helper for allocating alternate
- + alternates: provide helper for adding to alternates list
- + link_alt_odb_entry: refactor string handling
- + link_alt_odb_entry: handle normalize_path errors
- + t5613: clarify "too deep" recursion tests
- + t5613: do not chdir in main process
- + t5613: whitespace/style cleanups
- + t5613: use test_must_fail
- + t5613: drop test_valid_repo function
- + t5613: drop reachable_via function
- (this branch is used by jk/quarantine-received-objects.)
+ Recent git allows submodule.<name>.branch to use a special token
+ "." instead of the branch name; the documentation has been updated
+ to describe it.
- Codepaths involved in interacting alternate object store have
- been cleaned up.
+ Will merge to 'next'.
-* jk/clone-copy-alternates-fix (2016-10-05) 1 commit
- (merged to 'next' on 2016-10-10 at 8154134c8c)
- + clone: detect errors in normalize_path_copy
+* tg/add-chmod+x-fix (2016-10-20) 1 commit
+ - t3700: fix broken test under !SANITY
- "git clone" of a local repository can be done at the filesystem
- level, but the codepath did not check errors while copying and
- adjusting the file that lists alternate object stores.
+ A hot-fix for a test added by a recent topic that went to both
+ 'master' and 'maint' already.
+ Will merge to 'next'.
-* jk/quarantine-received-objects (2016-10-10) 5 commits
- (merged to 'next' on 2016-10-10 at 0fd3e3b2ef)
- + tmp-objdir: do not migrate files starting with '.'
- + tmp-objdir: put quarantine information in the environment
- + receive-pack: quarantine objects until pre-receive accepts
- + tmp-objdir: introduce API for temporary object directories
- + check_connected: accept an env argument
- (this branch uses jk/alt-odb-cleanup.)
- In order for the receiving end of "git push" to inspect the
- received history and decide to reject the push, the objects sent
- from the sending end need to be made available to the hook and
- the mechanism for the connectivity check, and this was done
- traditionally by storing the objects in the receiving repository
- and letting "git gc" to expire it. Instead, store the newly
- received objects in a temporary area, and make them available by
- reusing the alternate object store mechanism to them only while we
- decide if we accept the check, and once we decide, either migrate
- them to the repository or purge them immediately.
+* jk/diff-submodule-diff-inline (2016-10-20) 1 commit
+ - rev-list: use hdr_termination instead of a always using a newline
+ A recently graduated topic regressed "git rev-list --header"
+ output, breaking "gitweb". This has been fixed.
-* jk/ref-symlink-loop (2016-10-10) 2 commits
- (merged to 'next' on 2016-10-11 at ac5c35f87f)
- + files_read_raw_ref: prevent infinite retry loops in general
- + files_read_raw_ref: avoid infinite loop on broken symlinks
+ Will merge to 'next'.
- A stray symbolic link in $GIT_DIR/refs/ directory could make name
- resolution loop forever, which has been corrected.
+* jk/no-looking-at-dotgit-outside-repo (2016-10-20) 8 commits
+ - setup_git_env: avoid blind fall-back to ".git"
+ - diff: handle sha1 abbreviations outside of repository
+ - diff_aligned_abbrev: use "struct oid"
+ - diff_unique_abbrev: rename to diff_aligned_abbrev
+ - find_unique_abbrev: use 4-buffer ring
+ - test-*-cache-tree: setup git dir
+ - read info/{attributes,exclude} only when in repository
+ - Merge branch 'jc/diff-unique-abbrev-comments' into jk/no-looking-at-dotgit-outside-repo
+ (this branch uses jc/diff-unique-abbrev-comments.)
+
+ Update "git diff --no-index" codepath not to try to peek into .git/
+ directory that happens to be under the current directory, when we
+ know we are operating outside any repository.
+
+ Will wait until 'jc/diff-unique-abbrev-comments' graduates, rebase
+ onto 'master' and then cook in 'next'.
+
+
+* pt/gitgui-updates (2016-10-20) 35 commits
+ - Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
+ - git-gui: set version 0.21
+ - Merge branch 'as/bulgarian' into pu
+ - git-gui: Mark 'All' in remote.tcl for translation
+ - git-gui i18n: Updated Bulgarian translation (565,0f,0u)
+ - Merge branch 'os/preserve-author' into pu
+ - git-gui: avoid persisting modified author identity
+ - git-gui: Do not reset author details on amend
+ - Merge branch 'kb/unicode' into pu
+ - git-gui: handle the encoding of Git's output correctly
+ - git-gui: unicode file name support on windows
+ - Merge branch 'dr/ru' into pu
+ - git-gui: Update Russian translation
+ - git-gui: maintain backwards compatibility for merge syntax
+ - Merge branch 'va/i18n_2' into pu
+ - git-gui i18n: mark string in lib/error.tcl for translation
+ - git-gui: fix incorrect use of Tcl append command
+ - git-gui i18n: mark "usage:" strings for translation
+ - git-gui i18n: internationalize use of colon punctuation
+ - Merge branch 'pt/non-mouse-usage' into pu
+ - Amend tab ordering and text widget border and highlighting.
+ - Allow keyboard control to work in the staging widgets.
+ - Merge branch 'pt/git4win-mods' into pu
+ - git-gui (Windows): use git-gui.exe in `Create Desktop Shortcut`
+ - git-gui: fix detection of Cygwin
+ - Merge branch 'patches' into pu
+ - git-gui: ensure the file in the diff pane is in the list of selected files
+ - git-gui: support for $FILENAMES in tool definitions
+ - git-gui: fix initial git gui message encoding
+ - git-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command substitution
+ - Merge branch 'va/i18n' into pu
+ - Merge branch 'rs/use-modern-git-merge-syntax' into pu
+ - Merge branch 'js/commit-gpgsign' into pu
+ - Merge branch 'sy/i18n' into pu
+ - git-gui: sort entries in tclIndex
-* js/regexec-buf (2016-10-10) 1 commit
- (merged to 'next' on 2016-10-11 at 466a26548c)
- + configure.ac: improve description of NO_REGEX test
+ Will merge to 'master'.
+ Parked here temporarily as I didn't have chance to double-check.
- A follow-up to an already graduated topic.
+* yk/git-tag-remove-mention-of-old-layout-in-doc (2016-10-20) 1 commit
+ - doc: remove reference to the traditional layout in git-tag.txt
-* js/reset-usage (2016-10-11) 1 commit
- (merged to 'next' on 2016-10-11 at 61ad4a7c0e)
- + reset: fix usage
+ Shorten description of auto-following in "git tag" by removing a
+ mention of historical remotes layout which is not relevant to the
+ main topic.
- Message fix-up.
+ Will merge to 'next'.
+--------------------------------------------------
+[Stalled]
-* nd/commit-p-doc (2016-10-05) 1 commit
- (merged to 'next' on 2016-10-10 at 5a9996dd7b)
- + git-commit.txt: clarify --patch mode with pathspec
+* jc/bundle (2016-03-03) 6 commits
+ - index-pack: --clone-bundle option
+ - Merge branch 'jc/index-pack' into jc/bundle
+ - bundle v3: the beginning
+ - bundle: keep a copy of bundle file name in the in-core bundle header
+ - bundle: plug resource leak
+ - bundle doc: 'verify' is not about verifying the bundle
- Documentation for "git commit" was updated to clarify that "commit
- -p <paths>" adds to the current contents of the index to come up
- with what to commit.
+ The beginning of "split bundle", which could be one of the
+ ingredients to allow "git clone" traffic off of the core server
+ network to CDN.
+ While I think it would make it easier for people to experiment and
+ build on if the topic is merged to 'next', I am at the same time a
+ bit reluctant to merge an unproven new topic that introduces a new
+ file format, which we may end up having to support til the end of
+ time. It is likely that to support a "prime clone from CDN", it
+ would need a lot more than just "these are the heads and the pack
+ data is over there", so this may not be sufficient.
-* rs/cocci (2016-10-10) 2 commits
- (merged to 'next' on 2016-10-11 at bbd6a88402)
- + use strbuf_add_unique_abbrev() for adding short hashes, part 3
- + remove unnecessary NULL check before free(3)
+ Will discard.
- Code cleanup.
+* mh/connect (2016-06-06) 10 commits
+ - connect: [host:port] is legacy for ssh
+ - connect: move ssh command line preparation to a separate function
+ - connect: actively reject git:// urls with a user part
+ - connect: change the --diag-url output to separate user and host
+ - connect: make parse_connect_url() return the user part of the url as a separate value
+ - connect: group CONNECT_DIAG_URL handling code
+ - connect: make parse_connect_url() return separated host and port
+ - connect: re-derive a host:port string from the separate host and port variables
+ - connect: call get_host_and_port() earlier
+ - connect: document why we sometimes call get_port after get_host_and_port
-* rs/pretty-format-color-doc-fix (2016-10-11) 1 commit
- (merged to 'next' on 2016-10-11 at f0ae64bcbd)
- + pretty: fix document link for color specification
+ Rewrite Git-URL parsing routine (hopefully) without changing any
+ behaviour.
- Small doc update.
+ It has been two months without any support. We may want to discard
+ this.
-* sb/submodule-config-doc-drop-path (2016-10-11) 1 commit
- (merged to 'next' on 2016-10-11 at 28fc3e53f9)
- + documentation: improve submodule.<name>.{url, path} description
+* kn/ref-filter-branch-list (2016-05-17) 17 commits
+ - 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 `:dir` and `:base` options for ref printing atoms
+ - ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
+ - ref-filter: introduce symref_atom_parser() and 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 "submodule.<name>.path" stored in .gitmodules is never copied
- to .git/config and such a key in .git/config has no meaning, but
- the documentation described it and submodule.<name>.url next to
- each other as if both belong to .git/config. This has been fixed.
+ The code to list branches in "git branch" has been consolidated
+ with the more generic ref-filter API.
+
+ Rerolled.
+ Needs review.
+
+
+* ec/annotate-deleted (2015-11-20) 1 commit
+ - annotate: skip checking working tree if a revision is provided
+
+ Usability fix for annotate-specific "<file> <rev>" syntax with deleted
+ files.
+
+ Has been waiting for a review for too long without seeing anything.
+
+ Will discard.
+
+
+* dk/gc-more-wo-pack (2016-01-13) 4 commits
+ - gc: clean garbage .bitmap files from pack dir
+ - t5304: ensure non-garbage files are not deleted
+ - t5304: test .bitmap garbage files
+ - prepare_packed_git(): find more garbage
+
+ Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
+ .bitmap and .keep files.
+
+ Has been waiting for a reroll for too long.
+ cf. <xmqq60ypbeng.fsf@gitster.mtv.corp.google.com>
+
+ Will discard.
+
+
+* jc/diff-b-m (2015-02-23) 5 commits
+ . WIPWIP
+ . WIP: diff-b-m
+ - diffcore-rename: allow easier debugging
+ - diffcore-rename.c: add locate_rename_src()
+ - diffcore-break: allow debugging
+
+ "git diff -B -M" produced incorrect patch when the postimage of a
+ completely rewritten file is similar to the preimage of a removed
+ file; such a resulting file must not be expressed as a rename from
+ other place.
+
+ The fix in this patch is broken, unfortunately.
+
+ Will discard.
--------------------------------------------------
-[New Topics]
+[Cooking]
* dk/worktree-dup-checkout-with-bare-is-ok (2016-10-14) 1 commit
(merged to 'next' on 2016-10-17 at 24594d3e56)
* jk/ambiguous-short-object-names (2016-10-12) 1 commit
- - t1512: become resilient to GETTEXT_POISON build
+ (merged to 'next' on 2016-10-19 at e7c55a9da5)
+ + t1512: become resilient to GETTEXT_POISON build
A test fixup to recently graduated topic.
- Will merge to 'next'.
+ Will merge to 'master'.
* jk/merge-base-fork-point-without-reflog (2016-10-12) 1 commit
- - merge-base: handle --fork-point without reflog
+ (merged to 'next' on 2016-10-19 at 00a6797f62)
+ + merge-base: handle --fork-point without reflog
"git rebase" immediately after "git clone" failed to find the fork
point from the upstream.
- Will merge to 'next'.
+ Will merge to 'master'.
* jk/upload-pack-use-prio-queue (2016-10-11) 1 commit
- - upload-pack: use priority queue in reachable() check
+ (merged to 'next' on 2016-10-19 at 1d6efb07ac)
+ + upload-pack: use priority queue in reachable() check
Code clean-up and performance improvement to reduce use of
timestamp-ordered commit-list by replacing it with a priority
queue.
- Will merge to 'next'.
+ Will merge to 'master'.
* jk/fetch-quick-tag-following (2016-10-14) 1 commit
- - fetch: use "quick" has_sha1_file for tag following
+ (merged to 'next' on 2016-10-19 at d7718dcdf5)
+ + fetch: use "quick" has_sha1_file for tag following
When fetching from a remote that has many tags that are irrelevant
- to branches we are following, we used to waste way too many cycles
+ to branches we are following, we used to waste way too many cycles
when checking if the object pointed at by a tag (that we are not
going to fetch!) exists in our repository too carefully.
- Will merge to 'next'.
+ Will merge to 'master'.
-* jt/trailer-with-cruft (2016-10-14) 6 commits
+* jt/trailer-with-cruft (2016-10-20) 8 commits
- trailer: support values folded to multiple lines
+ - trailer: forbid leading whitespace in trailers
- trailer: allow non-trailers in trailer block
+ - trailer: clarify failure modes in parse_trailer
- trailer: make args have their own struct
- trailer: streamline trailer item create and add
- trailer: use list.h for doubly-linked list
* mm/send-email-cc-cruft-after-address (2016-10-14) 1 commit
- - parse_mailboxes: accept extra text after <...> address
+ (merged to 'next' on 2016-10-19 at 41e3f876cd)
+ + parse_mailboxes: accept extra text after <...> address
"git send-email" attempts to pick up valid e-mails from the
trailers, but people in real world write non-addresses there, like
"Cc: Stable <add@re.ss> # 4.8+", which broke the output depending
on the availability and vintage of Mail::Address perl module.
- Will merge to 'next'.
+ Will merge to 'master'.
* va/i18n (2016-10-17) 7 commits
- - i18n: diff: mark warnings for translation
- - i18n: credential-cache--daemon: mark advice for translation
- - i18n: convert mark error messages for translation
- - i18n: apply: mark error message for translation
- - i18n: apply: mark error messages for translation
- - i18n: apply: mark info messages for translation
- - i18n: apply: mark plural string for translation
+ (merged to 'next' on 2016-10-19 at b7d733698b)
+ + i18n: diff: mark warnings for translation
+ + i18n: credential-cache--daemon: mark advice for translation
+ + i18n: convert mark error messages for translation
+ + i18n: apply: mark error message for translation
+ + i18n: apply: mark error messages for translation
+ + i18n: apply: mark info messages for translation
+ + i18n: apply: mark plural string for translation
More i18n.
- Will merge to 'next'.
+ Will merge to 'master'.
* jk/tighten-alloc (2016-10-17) 2 commits
- - inline xalloc_flex() into FLEXPTR_ALLOC_MEM
- - avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEM
+ (merged to 'next' on 2016-10-19 at 548522a520)
+ + inline xalloc_flex() into FLEXPTR_ALLOC_MEM
+ + avoid pointer arithmetic involving NULL in FLEX_ALLOC_MEM
Protect our code from over-eager compilers.
- Will merge to 'next'.
+ Will merge to 'master'.
* pb/test-parse-options-expect (2016-10-17) 1 commit
- - t0040: convert all possible tests to use `test-parse-options --expect`
+ (merged to 'next' on 2016-10-19 at d3517d592f)
+ + t0040: convert all possible tests to use `test-parse-options --expect`
Test clean-up.
- Will merge to 'next'.
-
---------------------------------------------------
-[Stalled]
-
-* jc/bundle (2016-03-03) 6 commits
- - index-pack: --clone-bundle option
- - Merge branch 'jc/index-pack' into jc/bundle
- - bundle v3: the beginning
- - bundle: keep a copy of bundle file name in the in-core bundle header
- - bundle: plug resource leak
- - bundle doc: 'verify' is not about verifying the bundle
-
- The beginning of "split bundle", which could be one of the
- ingredients to allow "git clone" traffic off of the core server
- network to CDN.
-
- While I think it would make it easier for people to experiment and
- build on if the topic is merged to 'next', I am at the same time a
- bit reluctant to merge an unproven new topic that introduces a new
- file format, which we may end up having to support til the end of
- time. It is likely that to support a "prime clone from CDN", it
- would need a lot more than just "these are the heads and the pack
- data is over there", so this may not be sufficient.
-
- Will discard.
-
-
-* mh/connect (2016-06-06) 10 commits
- - connect: [host:port] is legacy for ssh
- - connect: move ssh command line preparation to a separate function
- - connect: actively reject git:// urls with a user part
- - connect: change the --diag-url output to separate user and host
- - connect: make parse_connect_url() return the user part of the url as a separate value
- - connect: group CONNECT_DIAG_URL handling code
- - connect: make parse_connect_url() return separated host and port
- - connect: re-derive a host:port string from the separate host and port variables
- - connect: call get_host_and_port() earlier
- - connect: document why we sometimes call get_port after get_host_and_port
-
- Rewrite Git-URL parsing routine (hopefully) without changing any
- behaviour.
-
- It has been two months without any support. We may want to discard
- this.
-
-
-* kn/ref-filter-branch-list (2016-05-17) 17 commits
- - 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 `:dir` and `:base` options for ref printing atoms
- - ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
- - ref-filter: introduce symref_atom_parser() and 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.
-
- Rerolled.
- Needs review.
-
-
-* ec/annotate-deleted (2015-11-20) 1 commit
- - annotate: skip checking working tree if a revision is provided
-
- Usability fix for annotate-specific "<file> <rev>" syntax with deleted
- files.
-
- Has been waiting for a review for too long without seeing anything.
-
- Will discard.
-
-
-* dk/gc-more-wo-pack (2016-01-13) 4 commits
- - gc: clean garbage .bitmap files from pack dir
- - t5304: ensure non-garbage files are not deleted
- - t5304: test .bitmap garbage files
- - prepare_packed_git(): find more garbage
-
- Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
- .bitmap and .keep files.
-
- Has been waiting for a reroll for too long.
- cf. <xmqq60ypbeng.fsf@gitster.mtv.corp.google.com>
-
- Will discard.
-
-
-* jc/diff-b-m (2015-02-23) 5 commits
- . WIPWIP
- . WIP: diff-b-m
- - diffcore-rename: allow easier debugging
- - diffcore-rename.c: add locate_rename_src()
- - diffcore-break: allow debugging
-
- "git diff -B -M" produced incorrect patch when the postimage of a
- completely rewritten file is similar to the preimage of a removed
- file; such a resulting file must not be expressed as a rename from
- other place.
-
- The fix in this patch is broken, unfortunately.
+ Will merge to 'master'.
- Will discard.
---------------------------------------------------
-[Cooking]
-
-* pb/bisect (2016-10-14) 28 commits
- - SQUASH???
+* pb/bisect (2016-10-18) 27 commits
- bisect--helper: remove the dequote in bisect_start()
- bisect--helper: retire `--bisect-auto-next` subcommand
- bisect--helper: retire `--bisect-autostart` subcommand
- bisect: rewrite `check_term_format` shell function in C
- bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
- GSoC "bisect" topic.
+ Move more parts of "git bisect" to C.
+
+ Waiting for review.
* ab/gitweb-abbrev-links (2016-10-14) 3 commits
Waiting for review.
-* sb/submodule-ignore-trailing-slash (2016-10-10) 2 commits
+* sb/submodule-ignore-trailing-slash (2016-10-18) 3 commits
+ . submodule--helper: normalize funny urls
(merged to 'next' on 2016-10-11 at e37425ed17)
+ submodule: ignore trailing slash in relative url
+ submodule: ignore trailing slash on superproject URL
the resolution of the issue.
cf. <alpine.DEB.2.20.1610131255001.197091@virtualbox>
+ cf. <CAGZ79kYrKGLEOO72aWuX5OOM-AecdFZFXRqBkRzhdAM-VbPFxA@mail.gmail.com>
* st/verify-tag (2016-10-10) 7 commits
"git tag" and "git verify-tag" learned to put GPG verification
status in their "--format=<placeholders>" output format.
- Is this ready for 'next'?
+ Waiting for review.
+ cf. <20161007210721.20437-1-santiago@nyu.edu>
* mm/credential-libsecret (2016-10-11) 1 commit
* jc/diff-unique-abbrev-comments (2016-09-30) 1 commit
(merged to 'next' on 2016-10-17 at c7fb286102)
+ diff_unique_abbrev(): document its assumption and limitation
+ (this branch is used by jk/no-looking-at-dotgit-outside-repo.)
A bit more comments in a tricky code.
Will merge to 'master'.
-* va/i18n-perl-scripts (2016-10-10) 14 commits
+* va/i18n-perl-scripts (2016-10-20) 14 commits
- i18n: difftool: mark warnings for translation
- i18n: send-email: mark string with interpolation for translation
- i18n: send-email: mark warnings and errors for translation
* ls/filter-process (2016-10-17) 14 commits
- - contrib/long-running-filter: add long running filter example
- - convert: add filter.<driver>.process option
- - convert: prepare filter.<driver>.process option
- - convert: make apply_filter() adhere to standard Git error handling
- - pkt-line: add functions to read/write flush terminated packet streams
- - pkt-line: add packet_write_gently()
- - pkt-line: add packet_flush_gently()
- - pkt-line: add packet_write_fmt_gently()
- - pkt-line: extract set_packet_header()
- - pkt-line: rename packet_write() to packet_write_fmt()
- - run-command: add clean_on_exit_handler
- - run-command: move check_pipe() from write_or_die to run_command
- - convert: modernize tests
- - convert: quote filter names in error messages
+ (merged to 'next' on 2016-10-19 at ffd0de042c)
+ + contrib/long-running-filter: add long running filter example
+ + convert: add filter.<driver>.process option
+ + convert: prepare filter.<driver>.process option
+ + convert: make apply_filter() adhere to standard Git error handling
+ + pkt-line: add functions to read/write flush terminated packet streams
+ + pkt-line: add packet_write_gently()
+ + pkt-line: add packet_flush_gently()
+ + pkt-line: add packet_write_fmt_gently()
+ + pkt-line: extract set_packet_header()
+ + pkt-line: rename packet_write() to packet_write_fmt()
+ + run-command: add clean_on_exit_handler
+ + run-command: move check_pipe() from write_or_die to run_command
+ + convert: modernize tests
+ + convert: quote filter names in error messages
The smudge/clean filter API expect an external process is spawned
to filter the contents for each path that has a filter defined. A
all filtering need is served by this single process for multiple
paths, reducing the process creation overhead.
+ Will merge to 'master'.
+
* hv/submodule-not-yet-pushed-fix (2016-10-10) 3 commits
- batch check whether submodule needs pushing into one call
projects / thirdparty / git.git / commitdiff
