From: Junio C Hamano Date: Mon, 18 Apr 2016 22:38:22 +0000 (-0700) Subject: What's cooking (2016/04 #05) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7f80a358cb93079b4b29f595e821ac13e474646;p=thirdparty%2Fgit.git What's cooking (2016/04 #05) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index ec7c40430b..4043963523 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Apr 2016, #04; Tue, 12) -X-master-at: 7b0d47b3b6b5b64e02a5aa06b0452cadcdb18355 -X-next-at: f4fac6784293189f836875527464b8e7b234cb96 +Subject: What's cooking in git.git (Apr 2016, #05; Mon, 18) +X-master-at: e6ac6e1f7d54584c2b03f073b5f329a37f4a9561 +X-next-at: c82888d429ec9129c13a7b821f0fb8d1c6d77bff -What's cooking in git.git (Apr 2016, #04; Tue, 12) +What's cooking in git.git (Apr 2016, #05; Mon, 18) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -26,190 +26,287 @@ of the repositories listed at -------------------------------------------------- [Graduated to "master"] -* jc/merge-refuse-new-root (2016-03-23) 1 commit - (merged to 'next' on 2016-04-04 at cd70fd6) - + merge: refuse to create too cool a merge by default +* ak/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit + (merged to 'next' on 2016-04-06 at 2aab890) + + submodule-config: use hashmap_iter_first() - Originally merged to 'next' on 2016-03-23 + Minor code cleanup. - "git merge" used to allow merging two branches that have no common - base by default, which led to a brand new history of an existing - project created and then get pulled by an unsuspecting maintainer, - which allowed an unnecessary parallel history merged into the - existing project. The command has been taught not to allow this by - default, with an escape hatch "--allow-unrelated-histories" option - to be used in a rare event that merges histories of two projects - that started their lives independently. +* cc/apply (2016-04-01) 4 commits + (merged to 'next' on 2016-04-06 at 2e23c44) + + builtin/apply: free patch when parse_chunk() fails + + builtin/apply: handle parse_binary() failure + + apply: remove unused call to free() in gitdiff_{old,new}name() + + builtin/apply: get rid of useless 'name' variable -* nd/apply-doc (2016-03-24) 2 commits - (merged to 'next' on 2016-04-06 at f9bd355) - + git-apply.txt: mention the behavior inside a subdir - + git-apply.txt: remove a space + Minor code clean-up. - A minor documentation update. +* ep/trace-doc-sample-fix (2016-04-05) 1 commit + (merged to 'next' on 2016-04-06 at 0df7357) + + api-trace.txt: fix typo + + Fix a typo in an example in the trace API documentation. + + +* es/format-patch-doc-hide-no-patch (2016-04-04) 1 commit + (merged to 'next' on 2016-04-06 at 25d79bb) + + git-format-patch.txt: don't show -s as shorthand for multiple options + + "git format-patch --help" showed `-s` and `--no-patch` as if these + are valid options to the command. We already hide `--patch` option + from the documentation, because format-patch is about showing the + diff, and the documentation now hides these options as well. + + +* jc/makefile-redirection-stderr (2016-04-05) 1 commit + (merged to 'next' on 2016-04-06 at e3f2ded) + + Makefile: fix misdirected redirections + + A minor fix in the Makefile. + + +* jk/branch-shortening-funny-symrefs (2016-04-04) 1 commit + (merged to 'next' on 2016-04-06 at 1a3f8be) + + branch: fix shortening of non-remote symrefs + + A change back in version 2.7 to "git branch" broke display of a + symbolic ref in a non-standard place in the refs/ hierarchy (we + expect symbolic refs to appear in refs/remotes/*/HEAD to point at + the primary branch the remote has, and as .git/HEAD to point at the + branch we locally checked out). + + Will merge down to maint-2.7. + + +* jk/check-repository-format (2016-03-11) 10 commits + (merged to 'next' on 2016-04-06 at a0dada0) + + verify_repository_format: mark messages for translation + + setup: drop repository_format_version global + + setup: unify repository version callbacks + + init: use setup.c's repo version verification + + setup: refactor repo format reading and verification + + config: drop git_config_early + + check_repository_format_gently: stop using git_config_early + + lazily load core.sharedrepository + + wrap shared_repository global in get/set accessors + + setup: document check_repository_format() + (this branch is used by dt/pre-refs-backend.) + + The repository set-up sequence has been streamlined (the biggest + change is that there is no longer git_config_early()), so that we + do not attempt to look into refs/* when we know we do not have a + Git repository. + + +* jn/mergetools-examdiff (2016-04-04) 2 commits + (merged to 'next' on 2016-04-06 at 819e858) + + mergetools: add support for ExamDiff + + mergetools: create mergetool_find_win32_cmd() helper function for winmerge -* nd/apply-report-skip (2016-03-24) 1 commit - (merged to 'next' on 2016-04-06 at ae2c824) - + apply: report patch skipping in verbose mode + "git mergetools" learned to drive ExamDiff. + + +* js/mingw-tests-2.8 (2016-04-04) 1 commit + (merged to 'next' on 2016-04-06 at f85a013) + + Windows: shorten code by re-using convert_slashes() - "git apply -v" learned to report paths in the patch that were - skipped via --include/--exclude mechanism or being outside the - current working directory. + Code clean-up. -* oa/doc-diff-check (2016-03-29) 1 commit - (merged to 'next' on 2016-04-06 at e3d6e8d) - + Documentation: git diff --check detects conflict markers +* kn/for-each-tag-branch (2016-03-30) 1 commit + (merged to 'next' on 2016-04-06 at 4595ad3) + + for-each-ref: fix description of '--contains' in manpage A minor documentation update. -* pb/opt-cmdmode-doc (2016-03-25) 1 commit - (merged to 'next' on 2016-04-06 at a5f3835) - + api-parse-options.txt: document OPT_CMDMODE() +* ky/branch-d-worktree (2016-03-29) 1 commit + (merged to 'next' on 2016-04-06 at 00f9bff) + + branch -d: refuse deleting a branch which is currently checked out - Minor API documentation update. + When "git worktree" feature is in use, "git branch -d" allowed + deletion of a branch that is checked out in another worktree -* ss/msvc (2016-03-30) 2 commits - (merged to 'next' on 2016-04-06 at 4b53bce) - + MSVC: use shipped headers instead of fallback definitions - + MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more +* ky/branch-m-worktree (2016-04-08) 3 commits + (merged to 'next' on 2016-04-08 at b673b5e) + + set_worktree_head_symref(): fix error message + (merged to 'next' on 2016-04-06 at e7b285c) + + branch -m: update all per-worktree HEADs + + refs: add a new function set_worktree_head_symref - Build updates for MSVC. + When "git worktree" feature is in use, "git branch -m" renamed a + branch that is checked out in another worktree without adjusting + the HEAD symbolic ref for the worktree. --------------------------------------------------- -[New Topics] -* ad/commit-have-m-option (2016-04-07) 2 commits - - commit: do not ignore an empty message given by -m '' - - commit: --amend -m '' silently fails to wipe message +* lt/pretty-expand-tabs (2016-04-04) 4 commits + (merged to 'next' on 2016-04-06 at 186ac2a) + + pretty: test --expand-tabs + + pretty: allow tweaking tabwidth in --expand-tabs + + pretty: enable --expand-tabs by default for selected pretty formats + + pretty: expand tabs in indented logs to make things line up properly - "git commit" misbehaved in a few minor ways when an empty message - is given via -m '', all of which has been corrected. + When "git log" shows the log message indented by 4-spaces, the + remainder of a line after a HT does not align in the way the author + originally intended. The command now expands tabs by default in + such a case, and allows the users to override it with a new option, + '--no-expand-tabs'. - Will merge to 'next'. +* mg/complete-cherry-mark-to-log (2016-04-05) 1 commit + (merged to 'next' on 2016-04-06 at 3002be6) + + completion: complete --cherry-mark for git log -* jc/xstrfmt-null-with-prec-0 (2016-04-07) 1 commit - - setup.c: do not feed NULL to "%.*s" even with precision 0 + The completion scripts (in contrib/) did not include the + "--cherry-mark" option when completing "git log ". - Will merge to 'next'. +* mj/pull-rebase-autostash (2016-04-04) 9 commits + (merged to 'next' on 2016-04-06 at b4e4f31) + + t5520: test --[no-]autostash with pull.rebase=true + + t5520: reduce commom lines of code + + t5520: factor out common "failing autostash" code + + t5520: factor out common "successful autostash" code + + t5520: use better test to check stderr output + + t5520: ensure consistent test conditions + + t5520: use consistent capitalization in test titles + + pull --rebase: add --[no-]autostash flag + + git-pull.c: introduce git_pull_config() -* dt/pre-refs-backend (2016-04-10) 24 commits - - refs: on symref reflog expire, lock symref not referrent - - refs: move resolve_ref_unsafe into common code - - show_head_ref(): check the result of resolve_ref_namespace() - - check_aliased_update(): check that dst_name is non-NULL - - checkout_paths(): remove unneeded flag variable - - cmd_merge(): remove unneeded flag variable - - fsck_head_link(): remove unneeded flag variable - - read_raw_ref(): change flags parameter to unsigned int - - files-backend: inline resolve_ref_1() into resolve_ref_unsafe() - - read_raw_ref(): manage own scratch space - - files-backend: break out ref reading - - resolve_ref_1(): eliminate local variable "bad_name" - - resolve_ref_1(): reorder code - - resolve_ref_1(): eliminate local variable - - resolve_ref_unsafe(): ensure flags is always set - - resolve_ref_unsafe(): use for loop to count up to MAXDEPTH - - resolve_missing_loose_ref(): simplify semantics - - t1430: improve test coverage of deletion of badly-named refs - - t1430: test for-each-ref in the presence of badly-named refs - - t1430: don't rely on symbolic-ref for creating broken symrefs - - t1430: clean up broken refs/tags/shadow - - t1430: test the output and error of some commands more carefully - - refs: move for_each_*ref* functions into common code - - refs: move head_ref{,_submodule} to the common code - (this branch uses jk/check-repository-format.) + "git pull --rebase" learned "--[no-]autostash" option, so that + the rebase.autostash configuration variable set to true can be + overridden from the command line. - Code restructuring around the "refs" area to prepare for pluggable - refs backends. - Will merge to 'next'. +* rt/completion-help (2016-03-24) 2 commits + (merged to 'next' on 2016-04-06 at 8c3ee08) + + completion: add 'revisions' and 'everyday' to 'git help' + + completion: add option '--guides' to 'git help' + Shell completion (in contrib/) updates. -* ky/imap-send (2016-04-08) 2 commits - - imap-send: fix CRAM-MD5 response calculation - - imap-send: check for NOLOGIN capability only when using LOGIN command - Support for CRAM-MD5 authentication method in "git imap-send" did - not work well. +* rt/rebase-i-shorten-stop-report (2016-03-28) 1 commit + (merged to 'next' on 2016-04-06 at 7a766b7) + + rebase-i: print an abbreviated hash when stop for editing - Will merge to 'next'. + The commit object name reported when "rebase -i" stops has been + shortened. -* ky/imap-send-openssl-1.1.0 (2016-04-08) 4 commits - - configure: remove checking for HMAC_CTX_cleanup - - imap-send: avoid deprecated TLSv1_method() - - imap-send: check NULL return of SSL_CTX_new() - - imap-send: use HMAC() function provided by OpenSSL +* rz/worktree-no-checkout (2016-03-29) 1 commit + (merged to 'next' on 2016-04-06 at e725216) + + worktree: add: introduce --checkout option - Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs - we use in imap-send, which has been adjusted for the change. + "git worktree add" can be given "--no-checkout" option to only + create an empty worktree without checking out the files. - Will merge to 'next'. +* sb/misc-cleanups (2016-04-01) 4 commits + (merged to 'next' on 2016-04-06 at 4e63691) + + credential-cache, send_request: close fd when done + + bundle: don't leak an fd in case of early return + + abbrev_sha1_in_line: don't leak memory + + notes: don't leak memory in git_config_get_notes_strategy -* jc/http-socks5h (2016-04-10) 1 commit - - http: differentiate socks5:// and socks5h:// + Assorted minor clean-ups. - The socks5:// proxy support added back in 2.6.4 days was not aware - that socks5h:// proxies behave differently. - Will merge to 'next'. +* sg/diff-multiple-identical-renames (2016-03-30) 1 commit + (merged to 'next' on 2016-04-06 at ac19e48) + + diffcore: fix iteration order of identical files during rename detection + "git diff -M" used to work better when two originally identical + files A and B got renamed to X/A and X/B by pairing A to X/A and B + to X/B, but this was broken in the 2.0 timeframe. -* jc/send-email-skip-backup (2016-04-12) 1 commit - - send-email: detect and offer to skip backup files - A careless invocation of "git send-email directory/" after editing - 0001-change.patch with an editor often ends up sending both - 0001-change.patch and its backup file, 0001-change.patch~, causing - embarrassment and a minor confusion. Detect such an input and - offer to skip the backup files when sending the patches out. +* sk/send-pack-all-fix (2016-03-31) 1 commit + (merged to 'next' on 2016-04-06 at 31e1e1b) + + git-send-pack: fix --all option when used with directory - Needs review. + "git send-pack --all " was broken when its command line + option parsing was written in the 2.6 timeframe. -* jk/do-not-printf-NULL (2016-04-10) 3 commits - - git_config_set_multivar_in_file: handle "unset" errors - - git_config_set_multivar_in_file: all non-zero returns are errors - - config: lower-case first word of error strings +* tb/blame-force-read-cache-to-workaround-safe-crlf (2016-04-05) 1 commit + (merged to 'next' on 2016-04-06 at 263bba8) + + correct blame for files commited with CRLF - "git config" had a codepath that tried to pass a NULL to - printf("%s"), which nobody seems to have noticed. + When running "git blame $path" with unnormalized data in the index + for the path, the data in the working tree was blamed, even though + "git add" would not have changed what is already in the index, due + to "safe crlf" that disables the line-end conversion. It has been + corrected. + +-------------------------------------------------- +[New Topics] + +* en/merge-fixes (2016-04-12) 2 commits + - merge-recursive: do not check working copy when creating a virtual merge base + - merge-recursive: remove duplicate code + + "merge-recursive" strategy incorrectly checked if a path that is + involved in its internal merge exists in the working tree. Will merge to 'next'. -* jk/use-write-script-more (2016-04-12) 3 commits - - t3404: use write_script - - t1020: do not overuse printf and use write_script - - t5532: use write_script +* en/merge-octopus-fix (2016-04-12) 2 commits + (merged to 'next' on 2016-04-13 at 600b479) + + merge-octopus: abort if index does not match HEAD + + t6044: new merge testcases for when index doesn't match HEAD - Code clean-up. + "merge-octopus" strategy did not ensure that the index is clean + when merge begins. - Will merge to 'next'. + Will merge to 'master'. -* nf/mergetool-prompt (2016-04-12) 2 commits - - SQUASH??? - - difftool/mergetool: make the form of yes/no questions consistent +* en/merge-trivial-fix (2016-04-12) 2 commits + (merged to 'next' on 2016-04-13 at fb3ea86) + + builtin/merge.c: fix a bug with trivial merges + + t7605: add a testcase demonstrating a bug with trivial merges - UI consistency improvements. + When "git merge" notices that the merge can be resolved purely at + the tree level (without having to merge blobs) and the resulting + tree happens to already exist in the object store, it forgot to + update the index, which lead to an inconsistent state for later + operations. + Will merge to 'master'. -* va/i18n-misc-updates (2016-04-12) 4 commits - - i18n: builtin/rm.c: remove a comma ',' from string - - i18n: unpack-trees: mark strings for translation - - i18n: builtin/branch.c: mark option for translation - - i18n: index-pack: use plural string instead of normal one - Mark several messages for translation. +* jc/fsck-nul-in-commit (2016-04-14) 2 commits + - fsck: detect and warn a commit with embedded NUL + - fsck_commit_buffer(): do not special case the last validation + + "git fsck" learned to catch NUL byte in a commit object as + potential error and warn. + + +* jc/ll-merge-internal (2016-04-14) 2 commits + - ll-merge: use a longer conflict marker for internal merge + - ll-merge: fix typo in comment + + RFC. + + +* jk/diff-compact-heuristic (2016-04-18) 2 commits + - xdiff: implement empty line chunk heuristic + - xdiff: add recs_match helper function + + +* nd/test-helpers (2016-04-15) 2 commits + - test helpers: move test-* to t/helper/ subdirectory + - Makefile: clean *.o files we create + + Sources to many test helper binaries (and the generated helpers) + have been moved to t/helper/ subdirectory to reduce clutter at the + top level of the tree. -------------------------------------------------- [Stalled] @@ -249,16 +346,6 @@ of the repositories listed at ($gmane/290340) -* sb/clone-shallow-passthru (2016-03-23) 3 commits - - clone: add t5614 to test cloning submodules with shallowness involved - - submodule clone: pass along `local` option - - clone: add `--shallow-submodules` flag - - "git clone" learned "--shallow-submodules" option. - - Needs review. - - * sg/completion-updates (2016-02-28) 21 commits - completion: cache the path to the repository - completion: extract repository discovery from __gitdir() @@ -286,53 +373,6 @@ of the repositories listed at ($gmane/287839) -* nd/shallow-deepen (2016-02-23) 25 commits - - fetch, upload-pack: --deepen=N extends shallow boundary by N commits - - upload-pack: add get_reachable_list() - - upload-pack: split check_unreachable() in two, prep for get_reachable_list() - - t5500, t5539: tests for shallow depth excluding a ref - - clone: define shallow clone boundary with --shallow-exclude - - fetch: define shallow boundary with --shallow-exclude - - upload-pack: support define shallow boundary by excluding revisions - - refs: add expand_ref() - - t5500, t5539: tests for shallow depth since a specific date - - clone: define shallow clone boundary based on time with --shallow-since - - fetch: define shallow boundary with --shallow-since - - upload-pack: add deepen-since to cut shallow repos based on time - - shallow.c: implement a generic shallow boundary finder based on rev-list - - fetch-pack: use a separate flag for fetch in deepening mode - - fetch-pack: use a common function for verbose printing - - fetch-pack: use skip_prefix() instead of starts_with() - - upload-pack: move rev-list code out of check_non_tip() - - upload-pack: tighten number parsing at "deepen" lines - - upload-pack: use skip_prefix() instead of starts_with() - - upload-pack: move "unshallow" sending code out of deepen() - - upload-pack: remove unused variable "backup" - - upload-pack: move "shallow" sending code out of deepen() - - upload-pack: move shallow deepen code out of receive_needs() - - transport-helper.c: refactor set_helper_option() - - remote-curl.c: convert fetch_git() to use argv_array - - The existing "git fetch --depth=" option was hard to use - correctly when making the history of an existing shallow clone - deeper. A new option, "--deepen=", has been added to make this - easier to use. "git clone" also learned "--shallow-since=" - and "--shallow-exclude=" options to make it easier to specify - "I am interested only in the recent N months worth of history" and - "Give me only the history since that version". - - Needs review. - - -* sb/submodule-init (2016-03-15) 2 commits - . submodule: port init from shell to C - . submodule: port resolve_relative_url from shell to C - - Update of "git submodule" to move pieces of logic to C continues. - - Needs to be adjusted for the recent "prefix" fixes. - - * az/p4-bare-no-rebase (2016-02-19) 1 commit - git-p4.py: Don't try to rebase on submit from bare repository @@ -444,31 +484,210 @@ of the repositories listed at -------------------------------------------------- [Cooking] -* jc/drop-git-spec-in (2016-04-06) 1 commit - - Makefile: stop pretending to support rpmbuild +* sb/submodule-init (2016-04-16) 4 commits + - submodule: port init from shell to C + - submodule: port resolve_relative_url from shell to C + - Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init + - Merge branch 'sb/submodule-helper-clone-regression-fix' into sb/submodule-init + (this branch uses sb/submodule-helper-clone-regression-fix and sb/submodule-path-misc-bugs.) - As nobody maintains our in-tree git.spec.in and distros use their - own spec file, we stopped pretending that we support "make rpm". + Update of "git submodule" to move pieces of logic to C continues. - Comments? +* nd/shallow-deepen (2016-04-13) 26 commits + - fetch, upload-pack: --deepen=N extends shallow boundary by N commits + - upload-pack: add get_reachable_list() + - upload-pack: split check_unreachable() in two, prep for get_reachable_list() + - t5500, t5539: tests for shallow depth excluding a ref + - clone: define shallow clone boundary with --shallow-exclude + - fetch: define shallow boundary with --shallow-exclude + - upload-pack: support define shallow boundary by excluding revisions + - refs: add expand_ref() + - t5500, t5539: tests for shallow depth since a specific date + - clone: define shallow clone boundary based on time with --shallow-since + - fetch: define shallow boundary with --shallow-since + - upload-pack: add deepen-since to cut shallow repos based on time + - shallow.c: implement a generic shallow boundary finder based on rev-list + - fetch-pack: use a separate flag for fetch in deepening mode + - fetch-pack.c: mark strings for translating + - fetch-pack: use a common function for verbose printing + - fetch-pack: use skip_prefix() instead of starts_with() + - upload-pack: move rev-list code out of check_non_tip() + - upload-pack: tighten number parsing at "deepen" lines + - upload-pack: use skip_prefix() instead of starts_with() + - upload-pack: move "unshallow" sending code out of deepen() + - upload-pack: remove unused variable "backup" + - upload-pack: move "shallow" sending code out of deepen() + - upload-pack: move shallow deepen code out of receive_needs() + - transport-helper.c: refactor set_helper_option() + - remote-curl.c: convert fetch_git() to use argv_array -* jc/makefile-redirection-stderr (2016-04-05) 1 commit - (merged to 'next' on 2016-04-06 at e3f2ded) - + Makefile: fix misdirected redirections + The existing "git fetch --depth=" option was hard to use + correctly when making the history of an existing shallow clone + deeper. A new option, "--deepen=", has been added to make this + easier to use. "git clone" also learned "--shallow-since=" + and "--shallow-exclude=" options to make it easier to specify + "I am interested only in the recent N months worth of history" and + "Give me only the history since that version". - A minor fix in the Makefile. + Needs review. + + +* sb/clone-shallow-passthru (2016-04-13) 3 commits + - clone: add t5614 to test cloning submodules with shallowness involved + - clone: add `--shallow-submodules` flag + - submodule clone: pass along `local` option + + "git clone" learned "--shallow-submodules" option. + + Needs review. + + +* ad/commit-have-m-option (2016-04-07) 2 commits + (merged to 'next' on 2016-04-13 at 74088c2) + + commit: do not ignore an empty message given by -m '' + + commit: --amend -m '' silently fails to wipe message + + "git commit" misbehaved in a few minor ways when an empty message + is given via -m '', all of which has been corrected. + + Will merge to 'master'. + + +* jc/xstrfmt-null-with-prec-0 (2016-04-07) 1 commit + (merged to 'next' on 2016-04-13 at 2457462) + + setup.c: do not feed NULL to "%.*s" even with precision 0 + + Will merge to 'master'. + + +* dt/pre-refs-backend (2016-04-10) 24 commits + (merged to 'next' on 2016-04-13 at 0a8f9dd) + + refs: on symref reflog expire, lock symref not referrent + + refs: move resolve_ref_unsafe into common code + + show_head_ref(): check the result of resolve_ref_namespace() + + check_aliased_update(): check that dst_name is non-NULL + + checkout_paths(): remove unneeded flag variable + + cmd_merge(): remove unneeded flag variable + + fsck_head_link(): remove unneeded flag variable + + read_raw_ref(): change flags parameter to unsigned int + + files-backend: inline resolve_ref_1() into resolve_ref_unsafe() + + read_raw_ref(): manage own scratch space + + files-backend: break out ref reading + + resolve_ref_1(): eliminate local variable "bad_name" + + resolve_ref_1(): reorder code + + resolve_ref_1(): eliminate local variable + + resolve_ref_unsafe(): ensure flags is always set + + resolve_ref_unsafe(): use for loop to count up to MAXDEPTH + + resolve_missing_loose_ref(): simplify semantics + + t1430: improve test coverage of deletion of badly-named refs + + t1430: test for-each-ref in the presence of badly-named refs + + t1430: don't rely on symbolic-ref for creating broken symrefs + + t1430: clean up broken refs/tags/shadow + + t1430: test the output and error of some commands more carefully + + refs: move for_each_*ref* functions into common code + + refs: move head_ref{,_submodule} to the common code + + Code restructuring around the "refs" area to prepare for pluggable + refs backends. + + Will merge to 'master'. + + +* ky/imap-send (2016-04-13) 2 commits + (merged to 'next' on 2016-04-13 at 52cf493) + + imap-send: fix CRAM-MD5 response calculation + + imap-send: check for NOLOGIN capability only when using LOGIN command + + Support for CRAM-MD5 authentication method in "git imap-send" did + not work well. + + Will merge to 'master'. + + +* ky/imap-send-openssl-1.1.0 (2016-04-08) 4 commits + (merged to 'next' on 2016-04-13 at 49d2643) + + configure: remove checking for HMAC_CTX_cleanup + + imap-send: avoid deprecated TLSv1_method() + + imap-send: check NULL return of SSL_CTX_new() + + imap-send: use HMAC() function provided by OpenSSL + + Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs + we use in imap-send, which has been adjusted for the change. + + Will merge to 'master'. + + +* jc/http-socks5h (2016-04-10) 1 commit + (merged to 'next' on 2016-04-13 at eb27afc) + + http: differentiate socks5:// and socks5h:// + + The socks5:// proxy support added back in 2.6.4 days was not aware + that socks5h:// proxies behave differently. + + Will merge to 'master'. + + +* jc/send-email-skip-backup (2016-04-12) 1 commit + - send-email: detect and offer to skip backup files + + A careless invocation of "git send-email directory/" after editing + 0001-change.patch with an editor often ends up sending both + 0001-change.patch and its backup file, 0001-change.patch~, causing + embarrassment and a minor confusion. Detect such an input and + offer to skip the backup files when sending the patches out. + + Needs review. + + +* jk/do-not-printf-NULL (2016-04-10) 3 commits + (merged to 'next' on 2016-04-13 at 60912e3) + + git_config_set_multivar_in_file: handle "unset" errors + + git_config_set_multivar_in_file: all non-zero returns are errors + + config: lower-case first word of error strings + + "git config" had a codepath that tried to pass a NULL to + printf("%s"), which nobody seems to have noticed. + + Will merge to 'master'. + + +* jk/use-write-script-more (2016-04-12) 3 commits + (merged to 'next' on 2016-04-13 at d6718bf) + + t3404: use write_script + + t1020: do not overuse printf and use write_script + + t5532: use write_script + + Code clean-up. + + Will merge to 'master'. + + +* nf/mergetool-prompt (2016-04-12) 2 commits + - SQUASH??? + - difftool/mergetool: make the form of yes/no questions consistent + + UI consistency improvements. + + +* va/i18n-misc-updates (2016-04-13) 6 commits + - i18n: branch: move comment for translators + - i18n: branch: unmark string for translation + - i18n: builtin/rm.c: remove a comma ',' from string + - i18n: unpack-trees: mark strings for translation + - i18n: builtin/branch.c: mark option for translation + - i18n: index-pack: use plural string instead of normal one - Will merge to 'master'. + Mark several messages for translation. -* js/mingw-tests-2.8 (2016-04-04) 1 commit - (merged to 'next' on 2016-04-06 at f85a013) - + Windows: shorten code by re-using convert_slashes() +* jc/drop-git-spec-in (2016-04-06) 1 commit + - Makefile: stop pretending to support rpmbuild - Code clean-up. + As nobody maintains our in-tree git.spec.in and distros use their + own spec file, we stopped pretending that we support "make rpm". - Will merge to 'master'. + Comments? * ar/diff-args-osx-precompose (2016-04-05) 1 commit @@ -483,105 +702,34 @@ of the repositories listed at ($gmane/290724) -* ep/trace-doc-sample-fix (2016-04-05) 1 commit - (merged to 'next' on 2016-04-06 at 0df7357) - + api-trace.txt: fix typo - - Fix a typo in an example in the trace API documentation. - - Will merge to 'master'. - - * ew/send-email-readable-message-id (2016-04-06) 1 commit - - send-email: more meaningful Message-ID + (merged to 'next' on 2016-04-13 at 422959a) + + send-email: more meaningful Message-ID "git send-email" now uses a more readable timestamps when formulating a message ID. - Will merge to 'next'. - - -* mg/complete-cherry-mark-to-log (2016-04-05) 1 commit - (merged to 'next' on 2016-04-06 at 3002be6) - + completion: complete --cherry-mark for git log - - The completion scripts (in contrib/) did not include the - "--cherry-mark" option when completing "git log ". - - Will merge to 'master'. - - -* tb/blame-force-read-cache-to-workaround-safe-crlf (2016-04-05) 1 commit - (merged to 'next' on 2016-04-06 at 263bba8) - + correct blame for files commited with CRLF - - When running "git blame $path" with unnormalized data in the index - for the path, the data in the working tree was blamed, even though - "git add" would not have changed what is already in the index, due - to "safe crlf" that disables the line-end conversion. It has been - corrected. - Will merge to 'master'. -* st/verify-tag (2016-04-06) 3 commits +* st/verify-tag (2016-04-18) 6 commits + - tag -v: verfy directly rather than exec-ing verify-tag + - verify-tag: move verification code to tag.c + - verify-tag: add sha1 argument to verify_tag() - verify-tag: change variable name for readability - t7030: test verifying multiple tags - builtin/verify-tag.c: ignore SIGPIPE in gpg-interface - Only the first three patches in a six-patch series. - Needs further work. + Saw review comments on this v6. + Expecting a reroll. * ew/send-email-drop-data-dumper (2016-04-06) 1 commit - - send-email: do not load Data::Dumper + (merged to 'next' on 2016-04-13 at 180266c) + + send-email: do not load Data::Dumper Code clean-up. - Will merge to 'next'. - - -* es/format-patch-doc-hide-no-patch (2016-04-04) 1 commit - (merged to 'next' on 2016-04-06 at 25d79bb) - + git-format-patch.txt: don't show -s as shorthand for multiple options - - "git format-patch --help" showed `-s` and `--no-patch` as if these - are valid options to the command. We already hide `--patch` option - from the documentation, because format-patch is about showing the - diff, and the documentation now hides these options as well. - - Will merge to 'master'. - - -* jk/branch-shortening-funny-symrefs (2016-04-04) 1 commit - (merged to 'next' on 2016-04-06 at 1a3f8be) - + branch: fix shortening of non-remote symrefs - - A change back in version 2.7 to "git branch" broke display of a - symbolic ref in a non-standard place in the refs/ hierarchy (we - expect symbolic refs to appear in refs/remotes/*/HEAD to point at - the primary branch the remote has, and as .git/HEAD to point at the - branch we locally checked out). - - Will merge to 'next' and later down to maint-2.7. - - -* jn/mergetools-examdiff (2016-04-04) 2 commits - (merged to 'next' on 2016-04-06 at 819e858) - + mergetools: add support for ExamDiff - + mergetools: create mergetool_find_win32_cmd() helper function for winmerge - - "git mergetools" learned to drive ExamDiff. - - Will merge to 'master'. - - -* kn/for-each-tag-branch (2016-03-30) 1 commit - (merged to 'next' on 2016-04-06 at 4595ad3) - + for-each-ref: fix description of '--contains' in manpage - - A minor documentation update. - Will merge to 'master'. @@ -610,77 +758,38 @@ of the repositories listed at $gmane/291295 yet. -* rz/worktree-no-checkout (2016-03-29) 1 commit - (merged to 'next' on 2016-04-06 at e725216) - + worktree: add: introduce --checkout option - - "git worktree add" can be given "--no-checkout" option to only - create an empty worktree without checking out the files. - - Will merge to 'master'. - - -* sb/misc-cleanups (2016-04-01) 4 commits - (merged to 'next' on 2016-04-06 at 4e63691) - + credential-cache, send_request: close fd when done - + bundle: don't leak an fd in case of early return - + abbrev_sha1_in_line: don't leak memory - + notes: don't leak memory in git_config_get_notes_strategy - - Assorted minor clean-ups. - - Will merge to 'master'. - - * sb/submodule-helper-clone-regression-fix (2016-04-01) 6 commits - - submodule--helper, module_clone: catch fprintf failure - - submodule--helper: do not borrow absolute_path() result for too long - - submodule--helper, module_clone: always operate on absolute paths - - submodule--helper clone: create the submodule path just once - - submodule--helper: fix potential NULL-dereference - - recursive submodules: test for relative paths + (merged to 'next' on 2016-04-13 at c6584bb) + + submodule--helper, module_clone: catch fprintf failure + + submodule--helper: do not borrow absolute_path() result for too long + + submodule--helper, module_clone: always operate on absolute paths + + submodule--helper clone: create the submodule path just once + + submodule--helper: fix potential NULL-dereference + + recursive submodules: test for relative paths + (this branch is used by sb/submodule-init.) A partial rewrite of "git submodule" in the 2.7 timeframe changed the way the gitdir: pointer in the submodules point at the real repository location to use absolute paths by accident. This has been corrected. - Will merge to 'next'. + Will merge to 'master'. * sb/submodule-path-misc-bugs (2016-03-30) 6 commits - - t7407: make expectation as clear as possible - - submodule update: test recursive path reporting from subdirectory - - submodule update: align reporting path for custom command execution - - submodule status: correct path handling in recursive submodules - - submodule update --init: correct path handling in recursive submodules - - submodule foreach: correct path display in recursive submodules + (merged to 'next' on 2016-04-18 at 9daa5ce) + + t7407: make expectation as clear as possible + + submodule update: test recursive path reporting from subdirectory + + submodule update: align reporting path for custom command execution + + submodule status: correct path handling in recursive submodules + + submodule update --init: correct path handling in recursive submodules + + submodule foreach: correct path display in recursive submodules + (this branch is used by sb/submodule-init.) "git submodule" reports the paths of submodules the command recurses into, but this was incorrect when the command was not run from the root level of the superproject. - Any further comments? Otherwise will merge to 'next'. - - -* sg/diff-multiple-identical-renames (2016-03-30) 1 commit - (merged to 'next' on 2016-04-06 at ac19e48) - + diffcore: fix iteration order of identical files during rename detection - - "git diff -M" used to work better when two originally identical - files A and B got renamed to X/A and X/B by pairing A to X/A and B - to X/B, but this was broken in the 2.0 timeframe. - - Will merge to 'master'. - - -* sk/send-pack-all-fix (2016-03-31) 1 commit - (merged to 'next' on 2016-04-06 at 31e1e1b) - + git-send-pack: fix --all option when used with directory - - "git send-pack --all " was broken when its command line - option parsing was written in the 2.6 timeframe. - Will merge to 'master'. @@ -698,100 +807,6 @@ of the repositories listed at ($gmane/291198) -* ak/use-hashmap-iter-first-in-submodule-config (2016-03-23) 1 commit - (merged to 'next' on 2016-04-06 at 2aab890) - + submodule-config: use hashmap_iter_first() - - Minor code cleanup. - - Will merge to 'master'. - - -* ky/branch-d-worktree (2016-03-29) 1 commit - (merged to 'next' on 2016-04-06 at 00f9bff) - + branch -d: refuse deleting a branch which is currently checked out - - When "git worktree" feature is in use, "git branch -d" allowed - deletion of a branch that is checked out in another worktree - - Will merge to 'master'. - - -* ky/branch-m-worktree (2016-04-08) 3 commits - (merged to 'next' on 2016-04-08 at b673b5e) - + set_worktree_head_symref(): fix error message - (merged to 'next' on 2016-04-06 at e7b285c) - + branch -m: update all per-worktree HEADs - + refs: add a new function set_worktree_head_symref - - When "git worktree" feature is in use, "git branch -m" renamed a - branch that is checked out in another worktree without adjusting - the HEAD symbolic ref for the worktree. - - Will merge to 'master'. - - -* rt/completion-help (2016-03-24) 2 commits - (merged to 'next' on 2016-04-06 at 8c3ee08) - + completion: add 'revisions' and 'everyday' to 'git help' - + completion: add option '--guides' to 'git help' - - Shell completion (in contrib/) updates. - - Will merge to 'master'. - - -* rt/rebase-i-shorten-stop-report (2016-03-28) 1 commit - (merged to 'next' on 2016-04-06 at 7a766b7) - + rebase-i: print an abbreviated hash when stop for editing - - The commit object name reported when "rebase -i" stops has been - shortened. - - Will merge to 'master'. - - -* jk/check-repository-format (2016-03-11) 10 commits - (merged to 'next' on 2016-04-06 at a0dada0) - + verify_repository_format: mark messages for translation - + setup: drop repository_format_version global - + setup: unify repository version callbacks - + init: use setup.c's repo version verification - + setup: refactor repo format reading and verification - + config: drop git_config_early - + check_repository_format_gently: stop using git_config_early - + lazily load core.sharedrepository - + wrap shared_repository global in get/set accessors - + setup: document check_repository_format() - (this branch is used by dt/pre-refs-backend.) - - The repository set-up sequence has been streamlined (the biggest - change is that there is no longer git_config_early()), so that we - do not attempt to look into refs/* when we know we do not have a - Git repository. - - Will merge to 'master'. - - -* mj/pull-rebase-autostash (2016-04-04) 9 commits - (merged to 'next' on 2016-04-06 at b4e4f31) - + t5520: test --[no-]autostash with pull.rebase=true - + t5520: reduce commom lines of code - + t5520: factor out common "failing autostash" code - + t5520: factor out common "successful autostash" code - + t5520: use better test to check stderr output - + t5520: ensure consistent test conditions - + t5520: use consistent capitalization in test titles - + pull --rebase: add --[no-]autostash flag - + git-pull.c: introduce git_pull_config() - - "git pull --rebase" learned "--[no-]autostash" option, so that - the rebase.autostash configuration variable set to true can be - overridden from the command line. - - Will merge to 'master'. - - * pb/commit-verbose-config (2016-04-12) 6 commits . commit: add a commit.verbose config variable . t7507-commit-verbose: improve test coverage by testing number of diffs @@ -803,40 +818,10 @@ of the repositories listed at "git commit" learned to pay attention to "commit.verbose" configuration variable and act as if "--verbose" option was given from the command line. - - Old one reverted, will wait for reroll. - ($gmane/291303). - - -* lt/pretty-expand-tabs (2016-04-04) 4 commits - (merged to 'next' on 2016-04-06 at 186ac2a) - + pretty: test --expand-tabs - + pretty: allow tweaking tabwidth in --expand-tabs - + pretty: enable --expand-tabs by default for selected pretty formats - + pretty: expand tabs in indented logs to make things line up properly - - When "git log" shows the log message indented by 4-spaces, the - remainder of a line after a HT does not align in the way the author - originally intended. The command now expands tabs by default in - such a case, and allows the users to override it with a new option, - '--no-expand-tabs'. - - Will merge to 'master'. - - -* cc/apply (2016-04-01) 4 commits - (merged to 'next' on 2016-04-06 at 2e23c44) - + builtin/apply: free patch when parse_chunk() fails - + builtin/apply: handle parse_binary() failure - + apply: remove unused call to free() in gitdiff_{old,new}name() - + builtin/apply: get rid of useless 'name' variable - - Minor code clean-up. - - Will merge to 'master'. + -* dt/index-helper (2016-04-07) 16 commits +* dt/index-helper (2016-04-14) 16 commits - read-cache: config for waiting for index-helper - index-helper: optionally automatically run - index-helper: autorun mode @@ -845,7 +830,7 @@ of the repositories listed at - unpack-trees: preserve index extensions - update-index: enable/disable watchman support - index-helper: use watchman to avoid refreshing index with lstat() - - add watchman support to reduce index refresh cost + - index-helper: add watchman support to reduce index refresh cost - read-cache: add watchman 'WAMA' extension - index-helper: add --detach - daemonize(): set a flag before exiting the main process @@ -878,23 +863,24 @@ of the repositories listed at * jc/rerere-multi (2016-04-06) 11 commits - - rerere: adjust 'forget' to multi-variant world order - - rerere: split code to call ll_merge() further - - rerere: move code related to "forget" together - - rerere: gc and clear - - rerere: do use multiple variants - - t4200: rerere a merge with two identical conflicts - - rerere: allow multiple variants to exist - - rerere: delay the recording of preimage - - rerere: handle leftover rr-cache/$ID directory and postimage files - - rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id - - rerere: split conflict ID further + (merged to 'next' on 2016-04-13 at 3db2753) + + rerere: adjust 'forget' to multi-variant world order + + rerere: split code to call ll_merge() further + + rerere: move code related to "forget" together + + rerere: gc and clear + + rerere: do use multiple variants + + t4200: rerere a merge with two identical conflicts + + rerere: allow multiple variants to exist + + rerere: delay the recording of preimage + + rerere: handle leftover rr-cache/$ID directory and postimage files + + rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id + + rerere: split conflict ID further "git rerere" can encounter two or more files with the same conflict signature that have to be resolved in different ways, but there was no way to record these separate resolutions. - Will merge to 'next'. + Will merge to 'master'. * jc/merge-drop-old-syntax (2015-04-29) 1 commit