To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Oct 2016, #01; Mon, 3)
-X-master-at: 0cf36115dce7438a0eafad54a81cc57175e8fb54
-X-next-at: 9af6bb63e9b9efbcd0064516a7811092873d1ddf
+Subject: What's cooking in git.git (Oct 2016, #02; Thu, 6)
+X-master-at: a23ca1b8dc42ffd4de2ef30d67ce1e21ded29886
+X-next-at: d4ef1078455682bd5fab0e8b62e2351d25268477
-What's cooking in git.git (Oct 2016, #01; Mon, 3)
+What's cooking in git.git (Oct 2016, #02; Thu, 6)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with
--------------------------------------------------
[Graduated to "master"]
-* dt/mailinfo (2016-09-26) 1 commit
- (merged to 'next' on 2016-09-27 at 59e95dbc0e)
- + add David Turner's Two Sigma address
-
-
-* dt/tree-fsck (2016-09-27) 2 commits
- (merged to 'next' on 2016-09-28 at afdfdbbf37)
- + fsck: handle bad trees like other errors
- + tree-walk: be more specific about corrupt tree errors
-
- The codepath in "git fsck" to detect malformed tree objects has
- been updated not to die but keep going after detecting them.
-
-
-* ik/gitweb-force-highlight (2016-09-25) 2 commits
- (merged to 'next' on 2016-09-27 at cbb8391a76)
- + gitweb: use highlight's shebang detection
- + gitweb: remove unused guess_file_syntax() parameter
-
- "gitweb" can spawn "highlight" to show blob contents with
- (programming) language-specific syntax highlighting, but only
- when the language is known. "highlight" can however be told
- to make the guess itself by giving it "--force" option, which
- has been enabled.
-
-
-* jc/verify-loose-object-header (2016-09-26) 2 commits
- (merged to 'next' on 2016-09-27 at 2947f95f14)
- + unpack_sha1_header(): detect malformed object header
- + streaming: make sure to notice corrupt object
-
- Codepaths that read from an on-disk loose object were too loose in
- validating what they are reading is a proper object file and
- sometimes read past the data they read from the disk, which has
- been corrected. H/t to Gustavo Grieco for reporting.
-
-
-* jc/worktree-config (2016-09-27) 1 commit
- (merged to 'next' on 2016-09-28 at 0c262f6)
- + worktree: honor configuration variables
-
- "git worktree", even though it used the default_abbrev setting that
- ought to be affected by core.abbrev configuration variable, ignored
- the variable setting. The command has been taught to read the
- default set of configuration variables to correct this.
-
-
-* jk/ident-ai-canonname-could-be-null (2016-09-23) 1 commit
- (merged to 'next' on 2016-09-26 at 0eefb29)
- + ident: handle NULL ai_canonname
-
- In the codepath that comes up with the hostname to be used in an
- e-mail when the user didn't tell us, we looked at ai_canonname
- field in struct addrinfo without making sure it is not NULL first.
-
-
-* jk/verify-packfile-gently (2016-09-22) 1 commit
- (merged to 'next' on 2016-09-26 at f5abba5)
- + verify_packfile: check pack validity before accessing data
-
- A low-level function verify_packfile() was meant to show errors
- that were detected without dying itself, but under some conditions
- it didn't and died instead, which has been fixed.
-
-
-* jt/fetch-pack-in-vain-count-with-stateless (2016-09-23) 1 commit
- (merged to 'next' on 2016-09-26 at 9645629)
- + fetch-pack: do not reset in_vain on non-novel acks
-
- When "git fetch" tries to find where the history of the repository
- it runs in has diverged from what the other side has, it has a
- mechanism to avoid digging too deep into irrelevant side branches.
- This however did not work well over the "smart-http" transport due
- to a design bug, which has been fixed.
-
-
-* jt/mailinfo-fold-in-body-headers (2016-09-21) 3 commits
- (merged to 'next' on 2016-09-26 at 4235eb6)
- + mailinfo: handle in-body header continuations
- + mailinfo: make is_scissors_line take plain char *
- + mailinfo: separate in-body header processing
-
- When "git format-patch --stdout" output is placed as an in-body
- header and it uses the RFC2822 header folding, "git am" failed to
- put the header line back into a single logical line. The
- underlying "git mailinfo" was taught to handle this properly.
-
-
-* kd/mailinfo-quoted-string (2016-09-28) 2 commits
- (merged to 'next' on 2016-09-28 at 2aaeb57804)
- + mailinfo: unescape quoted-pair in header fields
- + t5100-mailinfo: replace common path prefix with variable
-
- An author name, that spelled a backslash-quoted double quote in the
- human readable part "My \"double quoted\" name", was not unquoted
- correctly while applying a patch from a piece of e-mail.
-
-
-* mh/diff-indent-heuristic (2016-09-27) 1 commit
- (merged to 'next' on 2016-09-27 at 3d6fb6605a)
- + xdiff: rename "struct group" to "struct xdlgroup"
-
- Clean-up for a recently graduated topic.
-
-
-* nd/init-core-worktree-in-multi-worktree-world (2016-09-25) 5 commits
- (merged to 'next' on 2016-09-27 at 619f7f3a3b)
- + init: kill git_link variable
- + init: do not set unnecessary core.worktree
- + init: kill set_git_dir_init()
- + init: call set_git_dir_init() from within init_db()
- + init: correct re-initialization from a linked worktree
-
- "git init" tried to record core.worktree in the repository's
- 'config' file when GIT_WORK_TREE environment variable was set and
- it was different from where GIT_DIR appears as ".git" at its top,
- but the logic was faulty when .git is a "gitdir:" file that points
- at the real place, causing trouble in working trees that are
- managed by "git worktree". This has been corrected.
-
-
-* pb/rev-list-reverse-with-count (2016-09-27) 1 commit
- (merged to 'next' on 2016-09-28 at 2905d0adbc)
- + rev-list-options: clarify the usage of --reverse
-
- Doc update to clarify what "log -3 --reverse" does.
-
-
-* rs/copy-array (2016-09-25) 2 commits
- (merged to 'next' on 2016-09-27 at c92e020669)
- + use COPY_ARRAY
- + add COPY_ARRAY
-
- Code cleanup.
-
-
-* rs/git-gui-use-modern-git-merge-syntax (2016-09-26) 2 commits
- (merged to 'next' on 2016-09-27 at f55850df7d)
- + Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-modern-git-merge-syntax
- + git-gui: stop using deprecated merge syntax
-
- The original command line syntax for "git merge", which was "git
- merge <msg> HEAD <parent>...", has been deprecated for quite some
- time, and "git gui" was the last in-tree user of the syntax. This
- is finally fixed, so that we can move forward with the deprecation.
-
-
-* va/git-gui-i18n (2016-09-26) 3 commits
- (merged to 'next' on 2016-09-27 at ab0f66ff8a)
- + Merge branch 'va/i18n' of ../git-gui into va/git-gui-i18n
- + git-gui: l10n: add Portuguese translation
- + git-gui i18n: mark strings for translation
-
- "git gui" l10n to Portuguese.
-
---------------------------------------------------
-[New Topics]
-
-* rs/cocci (2016-10-03) 4 commits
- (merged to 'next' on 2016-10-03 at 758cc6de9c)
- + coccicheck: make transformation for strbuf_addf(sb, "...") more precise
- (merged to 'next' on 2016-09-28 at 26462645f9)
- + use strbuf_add_unique_abbrev() for adding short hashes, part 2
- + use strbuf_addstr() instead of strbuf_addf() with "%s", part 2
- + gitignore: ignore output files of coccicheck make target
-
- Code clean-up with help from coccinelle tool continues.
-
- Will merge to 'master'.
-
-
-* nd/ita-empty-commit (2016-09-28) 3 commits
- - commit: don't be fooled by ita entries when creating initial commit
- - diff-lib.c: enable --shift-ita in index_differs_from()
- - Resurrect "diff-lib.c: adjust position of i-t-a entries in diff"
-
- When new paths were added by "git add -N" to the index, it was
- enough to circumvent the check by "git commit" to refrain from
- making an empty commit without "--allow-empty". The same logic
- prevented "git status" to show such a path as "new file" in the
- "Changes not staged for commit" section.
-
- Expecting a reroll.
- cf. <xmqqzimrj03j.fsf@gitster.mtv.corp.google.com>
- cf. <xmqq8tubkgg5.fsf@gitster.mtv.corp.google.com>
-
-
* jc/blame-abbrev (2016-09-28) 1 commit
(merged to 'next' on 2016-10-03 at 8ec86ff1e1)
+ blame: use DEFAULT_ABBREV macro
setting for the abbreviation, but "git blame" peeked into
underlying variable bypassing the macro for no good reason.
- Will merge to 'master'.
-
-
-* lt/abbrev-auto (2016-10-03) 3 commits
- (merged to 'next' on 2016-10-03 at bb188d00f7)
- + abbrev: auto size the default abbreviation
- + abbrev: prepare for new world order
- + abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizing
- (this branch uses jk/ambiguous-short-object-names.)
-
- Allow the default abbreviation length, which has historically been
- 7, to scale as the repository grows. The logic suggests to use 12
- hexdigits for the Linux kernel, and 9 to 10 for Git itself.
-
- Will merge to 'master'.
-
-
-* dt/http-empty-auth (2016-10-03) 1 commit
- - http: http.emptyauth should allow empty (not just NULL) usernames
-
- 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.
-
- cf. <20161003210100.t5nqknwfotag3lmj@sigill.intra.peff.net>
+* jk/ambiguous-short-object-names (2016-09-27) 11 commits
+ (merged to 'next' on 2016-09-28 at 1b85295323)
+ + get_short_sha1: make default disambiguation configurable
+ + get_short_sha1: list ambiguous objects on error
+ + for_each_abbrev: drop duplicate objects
+ + sha1_array: let callbacks interrupt iteration
+ + get_short_sha1: mark ambiguity error for translation
+ + get_short_sha1: NUL-terminate hex prefix
+ + get_short_sha1: refactor init of disambiguation code
+ + get_short_sha1: parse tags when looking for treeish
+ + get_sha1: propagate flags to child functions
+ + get_sha1: avoid repeating ourselves via ONLY_TO_DIE
+ + get_sha1: detect buggy calls with multiple disambiguators
+ (this branch is used by jk/abbrev-auto and lt/abbrev-auto.)
-* jc/diff-unique-abbrev-comments (2016-09-30) 1 commit
- - diff_unique_abbrev(): document its assumption and limitation
+ When given an abbreviated object name that is not (or more
+ realistically, "no longer") unique, we gave a fatal error
+ "ambiguous argument". This error is now accompanied by hints that
+ lists the objects that begins with the given prefix. During the
+ course of development of this new feature, numerous minor bugs were
+ uncovered and corrected, the most notable one of which is that we
+ gave "short SHA1 xxxx is ambiguous." twice without good reason.
* jk/graph-padding-fix (2016-09-29) 1 commit
has been fixed; this did not affect any existing code as nobody
tried to write anything after the padding on such a line, though.
- Will merge to 'master'.
-
-
-* jk/quarantine-received-objects (2016-10-03) 5 commits
- - 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.
-
* ps/http-gssapi-cred-delegation (2016-09-29) 1 commit
(merged to 'next' on 2016-10-03 at 310fbe8f24)
disabled by default due to CVE-2011-2192; introduce a configuration
to selectively allow enabling this.
- Will merge to 'master'.
-
* rs/c-auto-resets-attributes (2016-09-29) 1 commit
(merged to 'next' on 2016-10-03 at 6a0b946a79)
When "%C(auto)" appears at the very beginning of the pretty format
string, it did not need to issue the reset sequence, but it did.
-
- Will merge to 'master'.
This is a small optimization to already graduated topic.
-* rs/qsort (2016-10-03) 6 commits
- - show-branch: use QSORT
- - use QSORT, part 2
- - coccicheck: use --all-includes by default
- - remove unnecessary check before QSORT
- - use QSORT
- - add QSORT
-
- We call "qsort(array, nelem, sizeof(array[0]), fn)", and most of
- the time third parameter is redundant. A new QSORT() macro lets us
- omit it.
+* rs/cocci (2016-10-03) 4 commits
+ (merged to 'next' on 2016-10-03 at 758cc6de9c)
+ + coccicheck: make transformation for strbuf_addf(sb, "...") more precise
+ (merged to 'next' on 2016-09-28 at 26462645f9)
+ + use strbuf_add_unique_abbrev() for adding short hashes, part 2
+ + use strbuf_addstr() instead of strbuf_addf() with "%s", part 2
+ + gitignore: ignore output files of coccicheck make target
- Will merge to 'next'.
+ Code clean-up with help from coccinelle tool continues.
* sg/ref-filter-parse-optim (2016-10-03) 1 commit
The code that parses the format parameter of for-each-ref command
has seen a micro-optimization.
- Will merge to 'master'.
+* vn/revision-shorthand-for-side-branch-log (2016-09-27) 1 commit
+ (merged to 'next' on 2016-09-28 at c1237b24f6)
+ + revision: new rev^-n shorthand for rev^n..rev
-* jk/alt-odb-cleanup (2016-10-03) 18 commits
- - 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.)
+ "git log rev^..rev" is an often-used revision range specification
+ to show what was done on a side branch merged at rev. This has
+ gained a short-hand "rev^-1". In general "rev^-$n" is the same as
+ "^rev^$n rev", i.e. what has happened on other branches while the
+ history leading to nth parent was looking the other way.
+
+--------------------------------------------------
+[New Topics]
+
+* jc/ws-error-highlight (2016-10-04) 4 commits
+ - diff: introduce diff.wsErrorHighlight option
+ - diff.c: move ws-error-highlight parsing helpers up
+ - diff.c: refactor parse_ws_error_highlight()
+ - t4015: split out the "setup" part of ws-error-highlight test
+
+ "git diff/log --ws-error-highlight=<kind>" lacked the corresponding
+ configuration variable to set it by default.
+
+ Undecided.
+
+
+* jk/abbrev-auto (2016-10-03) 1 commit
+ - find_unique_abbrev: move logic out of get_short_sha1()
+ (this branch uses lt/abbrev-auto.)
+
+ Updates the way approximate count of total objects is computed
+ while attempting to come up with a unique abbreviated object name,
+ which in turn needs to estimate how many hexdigits are necessary to
+ ensure uniqueness.
+
+ Undecided.
+
+
+* jk/clone-copy-alternates-fix (2016-10-05) 1 commit
+ - clone: detect errors in normalize_path_copy
+
+ "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.
+
+ Will merge to 'next'.
+
+
+* nd/commit-p-doc (2016-10-05) 1 commit
+ - git-commit.txt: clarify --patch mode with pathspec
+
+ 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.
+
+ Will merge to 'next'.
--------------------------------------------------
[Stalled]
--------------------------------------------------
[Cooking]
-* jk/ambiguous-short-object-names (2016-09-27) 11 commits
- (merged to 'next' on 2016-09-28 at 1b85295323)
- + get_short_sha1: make default disambiguation configurable
- + get_short_sha1: list ambiguous objects on error
- + for_each_abbrev: drop duplicate objects
- + sha1_array: let callbacks interrupt iteration
- + get_short_sha1: mark ambiguity error for translation
- + get_short_sha1: NUL-terminate hex prefix
- + get_short_sha1: refactor init of disambiguation code
- + get_short_sha1: parse tags when looking for treeish
- + get_sha1: propagate flags to child functions
- + get_sha1: avoid repeating ourselves via ONLY_TO_DIE
- + get_sha1: detect buggy calls with multiple disambiguators
- (this branch is used by lt/abbrev-auto.)
+* nd/ita-empty-commit (2016-09-28) 3 commits
+ - commit: don't be fooled by ita entries when creating initial commit
+ - diff-lib.c: enable --shift-ita in index_differs_from()
+ - Resurrect "diff-lib.c: adjust position of i-t-a entries in diff"
+
+ When new paths were added by "git add -N" to the index, it was
+ enough to circumvent the check by "git commit" to refrain from
+ making an empty commit without "--allow-empty". The same logic
+ prevented "git status" to show such a path as "new file" in the
+ "Changes not staged for commit" section.
+
+ Expecting a reroll.
+ cf. <xmqqzimrj03j.fsf@gitster.mtv.corp.google.com>
+ cf. <xmqq8tubkgg5.fsf@gitster.mtv.corp.google.com>
- When given an abbreviated object name that is not (or more
- realistically, "no longer") unique, we gave a fatal error
- "ambiguous argument". This error is now accompanied by hints that
- lists the objects that begins with the given prefix. During the
- course of development of this new feature, numerous minor bugs were
- uncovered and corrected, the most notable one of which is that we
- gave "short SHA1 xxxx is ambiguous." twice without good reason.
+
+* lt/abbrev-auto (2016-10-03) 3 commits
+ (merged to 'next' on 2016-10-03 at bb188d00f7)
+ + abbrev: auto size the default abbreviation
+ + abbrev: prepare for new world order
+ + abbrev: add FALLBACK_DEFAULT_ABBREV to prepare for auto sizing
+ (this branch is used by jk/abbrev-auto.)
+
+ Allow the default abbreviation length, which has historically been
+ 7, to scale as the repository grows. The logic suggests to use 12
+ hexdigits for the Linux kernel, and 9 to 10 for Git itself.
+
+ Will hold to see if people scream.
+
+
+* dt/http-empty-auth (2016-10-04) 1 commit
+ - http: http.emptyauth should allow empty (not just NULL) usernames
+
+ 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.
+
+ Will merge to 'next'.
+
+
+* jc/diff-unique-abbrev-comments (2016-09-30) 1 commit
+ - diff_unique_abbrev(): document its assumption and limitation
+
+
+* jk/quarantine-received-objects (2016-10-05) 5 commits
+ - 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.
+
+ Will merge to 'next' after whipping jk/alt-odb-cleanup into shape.
+
+
+* rs/qsort (2016-10-03) 6 commits
+ (merged to 'next' on 2016-10-06 at 32a5bd3c88)
+ + show-branch: use QSORT
+ + use QSORT, part 2
+ + coccicheck: use --all-includes by default
+ + remove unnecessary check before QSORT
+ + use QSORT
+ + add QSORT
+
+ We call "qsort(array, nelem, sizeof(array[0]), fn)", and most of
+ the time third parameter is redundant. A new QSORT() macro lets us
+ omit it.
Will merge to 'master'.
+* jk/alt-odb-cleanup (2016-10-05) 19 commits
+ - 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
+ - fixup! t5613: clarify "too deep" recursion tests
+ - 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.)
+
+ Will merge to 'next' after squashing the fixup! in.
+
+
* va/i18n-perl-scripts (2016-09-25) 11 commits
- i18n: difftool: mark warnings for translation
- i18n: send-email: mark string with interpolation for translation
Porcelain scripts written in Perl are getting internationalized.
- Waiting for a reroll.
- cf. <1474913721.1035.9.camel@sapo.pt>
-
-
-* vn/revision-shorthand-for-side-branch-log (2016-09-27) 1 commit
- (merged to 'next' on 2016-09-28 at c1237b24f6)
- + revision: new rev^-n shorthand for rev^n..rev
-
- "git log rev^..rev" is an often-used revision range specification
- to show what was done on a side branch merged at rev. This has
- gained a short-hand "rev^-1". In general "rev^-$n" is the same as
- "^rev^$n rev", i.e. what has happened on other branches while the
- history leading to nth parent was looking the other way.
-
- Will merge to 'master'.
+ Waiting for comments.
* jc/latin-1 (2016-09-26) 2 commits
Will hold to see if people scream.
-* mg/gpg-richer-status (2016-09-28) 1 commit
+* mg/gpg-richer-status (2016-10-06) 2 commits
+ - SQUASH: gpg-interface: use more status letters
- gpg-interface: use more status letters
The GPG verification status shown in "%G?" pretty format specifier
key, a signature made by a revoked key, etc. New output letters
have been assigned to express them.
+ Waiting for a response to ping/squash.
+
* jc/blame-reverse (2016-06-14) 2 commits
(merged to 'next' on 2016-09-22 at d1a8e9ce99)
in path in an old revision OLD have survived up to the current
commit.
- Will hold to see if it is broken.
+ Will merge to 'master'.
-* js/libify-require-clean-work-tree (2016-09-12) 5 commits
+* js/libify-require-clean-work-tree (2016-10-05) 6 commits
+ - wt-status: begin error messages with lower-case
- wt-status: teach has_{unstaged,uncommitted}_changes() about submodules
- - Export also the has_un{staged,committed}_changed() functions
- - Make the require_clean_work_tree() function truly reusable
+ - wt-status: export also the has_un{staged,committed}_changed()
+ - wt-status: make the require_clean_work_tree() function reusable
- pull: make code more similar to the shell script again
- pull: drop confusing prefix parameter of die_on_unclean_work_tree()
pull" was rewritten from shell; the helper is now made available to
other callers in preparation for upcoming "rebase -i" work.
- Waiting for comments.
- Modulo a few minor nits, this looked almost ready.
- cf. <xmqqtwdl2bhm.fsf@gitster.mtv.corp.google.com>
- cf. <xmqqpoo92bdr.fsf@gitster.mtv.corp.google.com>
+ Will merge to 'next'.
* bw/ls-files-recurse-submodules (2016-10-03) 4 commits
Looking good. Is this ready for 'next'?
-* ls/filter-process (2016-09-23) 11 commits
+* ls/filter-process (2016-10-04) 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
- - convert: modernize tests
- - convert: quote filter names in error messages
- 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()
- - run-command: move check_pipe() from write_or_die to run_command
- pkt-line: extract set_packet_header()
- pkt-line: rename packet_write() to packet_write_fmt()
+ - run-command: add wait_on_exit
+ - 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.
- Somehow I thought this was getting ready for 'next' but it seems
- at least another round of reroll is coming?
-
* hv/submodule-not-yet-pushed-fix (2016-09-14) 2 commits
- serialize collection of refs that contain submodule changes
complete "git cmd ^mas<HT>" to complete the negative end of
reference to "git cmd ^master".
- Will hold to see if it is broken.
+ Will merge to 'master'.
-* sb/push-make-submodule-check-the-default (2016-08-24) 1 commit
- - push: change submodule default to check
+* sb/push-make-submodule-check-the-default (2016-10-06) 2 commits
+ - push: change submodule default to check when submodules exist
+ - submodule add: extend force flag to add existing repos
- Turn the default of "push.recurseSubmodules" to "check".
+ Turn the default of "push.recurseSubmodules" to "check" when
+ submodules seem to be in use.
Will hold to wait for hv/submodule-not-yet-pushed-fix
- This reveals that the "check" mode is too inefficient to use in
- real projects, even in ones as small as git itself.
- cf. <xmqqh9aaot49.fsf@gitster.mtv.corp.google.com>
-
* ak/curl-imap-send-explicit-scheme (2016-08-17) 1 commit
(merged to 'next' on 2016-09-22 at 4449584c26)
imap(s):// before the destination. To some folks, that didn't work
and the library tried to make HTTP(s) requests instead.
- Will hold to see if it is broken.
+ Will merge to 'master'.
* jk/pack-objects-optim-mru (2016-08-11) 4 commits
the packfiles are now optimized by checking the most-recently-used
packfile first.
- Will hold to see if people scream.
+ Will merge to 'master'.
* dp/autoconf-curl-ssl (2016-06-28) 1 commit
The ./configure script generated from configure.ac was taught how
to detect support of SSL by libcurl better.
- Will hold to see if it is broken.
+ Will merge to 'master'.
* jc/pull-rebase-ff (2016-07-28) 1 commit
"I am interested only in the recent N months worth of history" and
"Give me only the history since that version".
- Will hold to see if it is broken.
+ Will merge to 'master'.
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
which needs to be fixed before this final step can proceed.
cf. <5671DB28.8020901@kdbg.org>
- Will hold to wait for rs/git-gui-use-modern-git-merge-syntax
+ Will merge to 'next'.
--------------------------------------------------
[Discarded]
projects / thirdparty / git.git / commitdiff
