From ab7797dbe95fff38d9265869ea367020046db118 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 20 Jun 2016 11:06:49 -0700 Subject: Start the post-2.9 cycle Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 68 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 Documentation/RelNotes/2.10.0.txt (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt new file mode 100644 index 0000000000..eac12490a9 --- /dev/null +++ b/Documentation/RelNotes/2.10.0.txt @@ -0,0 +1,68 @@ +Git 2.10 Release Notes +====================== + +Backward compatibility notes +---------------------------- + +Updates since v2.9 +------------------ + +UI, Workflows & Features + + * "git pull --rebase --verify-signature" learned to warn the user + that "--verify-signature" is a no-op when rebasing. + + * An upstream project can make a recommendation to shallowly clone + some submodules in the .gitmodules file it ships. + + * "git worktree add" learned that '-' can be used as a short-hand for + "@{-1}", the previous branch. + + * Update the funcname definition to support css files. + + +Performance, Internal Implementation, Development Support etc. + + * "git fast-import" learned the same performance trick to avoid + creating too small a packfile as "git fetch" and "git push" have, + using *.unpackLimit configuration. + + * When "git daemon" is run without --[init-]timeout specified, a + connection from a client that silently goes offline can hang around + for a long time, wasting resources. The socket-level KEEPALIVE has + been enabled to allow the OS to notice such failed connections. + (merge a43b68a ew/daemon-socket-keepalive later to maint). + + * "git upload-pack" command has been updated to use the parse-options + API. + + +Also contains various documentation updates and code clean-ups. + + +Fixes since v2.9 +---------------- + +Unless otherwise noted, all the fixes since v2.8 in the maintenance +track are contained in this release (see the maintenance releases' +notes for details). + + * The commands in `git log` family take %C(auto) in a custom format + string. This unconditionally turned the color on, ignoring + --no-color or with --color=auto when the output is not connected to + a tty; this was corrected to make the format truly behave as + "auto". + (merge b15a3e0 et/pretty-format-c-auto later to maint). + + * "git rev-list --count" whose walk-length is limited with "-n" + option did not work well with the counting optimized to look at the + bitmap index. + (merge fb85db8 jk/rev-list-count-with-bitmap later to maint). + + * "git show -W" (extend hunks to cover the entire function, delimited + by lines that match the "funcname" pattern) used to show the entire + file when a change added an entire function at the end of the file, + which has been fixed. + (merge 6f8d9bc rs/xdiff-hunk-with-func-line later to maint). + + * Other minor clean-ups and documentation updates -- cgit v1.3 From cf4c2cfe52be5bd973a4838f73a35d3959ce2f43 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 27 Jun 2016 10:07:08 -0700 Subject: Second batch of topics for 2.10 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 65 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index eac12490a9..63499b7c0e 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -20,6 +20,13 @@ UI, Workflows & Features * Update the funcname definition to support css files. + * The completion script (in contrib/) learned to complete "git + status" options. + + * Messages that are generated by auto gc during "git push" on the + receiving end are now passed back to the sending end in such a way + that they are shown with "remote: " prefix to avoid confusing the + users. Performance, Internal Implementation, Development Support etc. @@ -36,6 +43,11 @@ Performance, Internal Implementation, Development Support etc. * "git upload-pack" command has been updated to use the parse-options API. + * The "git apply" standalone program is being libified; this is the + first step to move many state variables into a structure that can + be explicitly (re)initialized to make the machinery callable more + than once. + Also contains various documentation updates and code clean-ups. @@ -65,4 +77,57 @@ notes for details). which has been fixed. (merge 6f8d9bc rs/xdiff-hunk-with-func-line later to maint). + * The documentation set has been updated so that literal commands, + configuration variables and environment variables are consistently + typeset in fixed-width font and bold in manpages. + (merge ae9f631 tr/doc-tt later to maint). + + * "git svn propset" subcommand that was added in 2.3 days is + documented now. + (merge 19a7f24 ap/git-svn-propset-doc later to maint). + + * The documentation tries to consistently spell "GPG"; when + referring to the specific program name, "gpg" is used. + (merge bc91316 dn/gpg-doc later to maint). + + * "git reflog" stopped upon seeing an entry that denotes a branch + creation event (aka "unborn"), which made it appear as if the + reflog was truncated. + (merge 71abeb7 sg/reflog-past-root later to maint). + + * The git-prompt scriptlet (in contrib/) was not friendly with those + who uses "set -u", which has been fixed. + (merge 34d8f5a vs/prompt-avoid-unset-variable later to maint). + + * compat/regex code did not cleanly compile. + (merge bd8f005 rj/compat-regex-size-max-fix later to maint). + + * A codepath that used alloca(3) to place an unbounded amount of data + on the stack has been updated to avoid doing so. + (merge b8ba412 jk/avoid-unbounded-alloca later to maint). + + * "git update-index --add --chmod=+x file" may be usable as an escape + hatch, but not a friendly thing to force for people who do need to + use it regularly. "git add --chmod=+x file" can be used instead. + (merge 4e55ed3 et/add-chmod-x later to maint). + + * Build improvements for gnome-keyring (in contrib/) + (merge 3cddb00 nb/gnome-keyring-build later to maint). + + * "git status" used to say "working directory" when it meant "working + tree". + (merge 2a0e6cd lv/status-say-working-tree-not-directory later to maint). + + * Comments about misbehaving FreeBSD shells have been clarified with + the version number (9.x and before are broken, newer ones are OK). + (merge 9b35cad em/newer-freebsd-shells-are-fine-with-returns later to maint). + + * "git cherry-pick A" worked on an unborn branch, but "git + cherry-pick A..B" didn't. + (merge 0f974e2 mg/cherry-pick-multi-on-unborn later to maint). + * Other minor clean-ups and documentation updates + (merge 3a39f61 pc/occurred later to maint). + (merge 9e70233 jk/fetch-prune-doc later to maint). + (merge ed008d7 pb/strbuf-read-file-doc later to maint). + (merge 31da121 jc/deref-tag later to maint). -- cgit v1.3 From 5c589a73de4394ad125a4effac227b3aec856fa1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 6 Jul 2016 13:42:58 -0700 Subject: Third batch of topics for 2.10 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 127 +++++++++++++++++++++++++++++++++----- 1 file changed, 111 insertions(+), 16 deletions(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index 63499b7c0e..3853b3dec6 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -28,6 +28,34 @@ UI, Workflows & Features that they are shown with "remote: " prefix to avoid confusing the users. + * "git add -i/-p" learned to honor diff.compactionHeuristic + experimental knob, so that the user can work on the same hunk split + as "git diff" output. + (merge 46e3d17 jk/add-i-diff-compact-heuristics later to maint). + + * "upload-pack" allows a custom "git pack-objects" replacement when + responding to "fetch/clone" via the uploadpack.packObjectsHook. + (merge 20b20a2 jk/upload-pack-hook later to maint). + + * Teach format-patch and mailsplit (hence "am") how a line that + happens to begin with "From " in the e-mail message is quoted with + ">", so that these lines can be restored to their original shape. + (merge d9925d1 ew/mboxrd-format-am later to maint). + + * "git repack" learned the "--keep-unreachable" option, which sends + loose unreachable objects to a pack instead of leaving them loose. + This helps heuristics based on the number of loose objects + (e.g. "gc --auto"). + (merge e26a8c4 jk/repack-keep-unreachable later to maint). + + * "log --graph --format=" learned that "%>|(N)" specifies the width + relative to the terminal's left edge, not relative to the area to + draw text that is to the right of the ancestry-graph section. It + also now accepts negative N that means the column limit is relative + to the right border. + (merge 066790d nd/graph-width-padded later to maint). + + Performance, Internal Implementation, Development Support etc. * "git fast-import" learned the same performance trick to avoid @@ -48,6 +76,46 @@ Performance, Internal Implementation, Development Support etc. be explicitly (re)initialized to make the machinery callable more than once. + * HTTP transport gained an option to produce more detailed debugging + trace. + (merge 73e57aa ep/http-curl-trace later to maint). + + * Instead of taking advantage of a struct string_list that is + allocated with all NULs happens to be STRING_LIST_INIT_NODUP kind, + initialize them explicitly as such, to document their behaviour + better. + (merge 2721ce2 jk/string-list-static-init later to maint). + + * HTTPd tests learned to show the server error log to help diagnosing + a failing tests. + (merge 44f243d nd/test-lib-httpd-show-error-log-in-verbose later to maint). + + * The ownership rule for the piece of memory that hold references to + be fetched in "git fetch" was screwy, which has been cleaned up. + (merge b7410f6 km/fetch-do-not-free-remote-name later to maint). + + * "git bisect" makes an internal call to "git diff-tree" when + bisection finds the culprit, but this call did not initialize the + data structure to pass to the diff-tree API correctly. + (merge 43ec550 jk/bisect-show-tree later to maint). + + * Further preparatory clean-up for "worktree" feature continues. + (merge 0409e0b nd/worktree-cleanup-post-head-protection later to maint). + + * Formats of the various data (and how to validate them) where we use + GPG signature have been documented. + (merge cc6ee97 mg/signature-doc later to maint). + + * A new run-command API function pipe_command() is introduced to + sanely feed data to the standard input while capturing data from + the standard output and the standard error of an external process, + which is cumbersome to hand-roll correctly without deadlocking. + + The codepath to sign data in a prepared buffer with GPG has been + updated to use this API to read from the status-fd to check for + errors (instead of relying on GPG's exit status). + (merge efee955 jk/gpg-interface-cleanup later to maint). + Also contains various documentation updates and code clean-ups. @@ -80,54 +148,81 @@ notes for details). * The documentation set has been updated so that literal commands, configuration variables and environment variables are consistently typeset in fixed-width font and bold in manpages. - (merge ae9f631 tr/doc-tt later to maint). * "git svn propset" subcommand that was added in 2.3 days is documented now. - (merge 19a7f24 ap/git-svn-propset-doc later to maint). * The documentation tries to consistently spell "GPG"; when referring to the specific program name, "gpg" is used. - (merge bc91316 dn/gpg-doc later to maint). * "git reflog" stopped upon seeing an entry that denotes a branch creation event (aka "unborn"), which made it appear as if the reflog was truncated. - (merge 71abeb7 sg/reflog-past-root later to maint). * The git-prompt scriptlet (in contrib/) was not friendly with those who uses "set -u", which has been fixed. - (merge 34d8f5a vs/prompt-avoid-unset-variable later to maint). * compat/regex code did not cleanly compile. - (merge bd8f005 rj/compat-regex-size-max-fix later to maint). * A codepath that used alloca(3) to place an unbounded amount of data on the stack has been updated to avoid doing so. - (merge b8ba412 jk/avoid-unbounded-alloca later to maint). * "git update-index --add --chmod=+x file" may be usable as an escape hatch, but not a friendly thing to force for people who do need to use it regularly. "git add --chmod=+x file" can be used instead. - (merge 4e55ed3 et/add-chmod-x later to maint). * Build improvements for gnome-keyring (in contrib/) - (merge 3cddb00 nb/gnome-keyring-build later to maint). * "git status" used to say "working directory" when it meant "working tree". - (merge 2a0e6cd lv/status-say-working-tree-not-directory later to maint). * Comments about misbehaving FreeBSD shells have been clarified with the version number (9.x and before are broken, newer ones are OK). - (merge 9b35cad em/newer-freebsd-shells-are-fine-with-returns later to maint). * "git cherry-pick A" worked on an unborn branch, but "git cherry-pick A..B" didn't. - (merge 0f974e2 mg/cherry-pick-multi-on-unborn later to maint). + + * Fix an unintended regression in v2.9 that breaks "clone --depth" + that recurses down to submodules by forcing the submodules to also + be cloned shallowly, which many server instances that host upstream + of the submodules are not prepared for. + (merge 18a74a0 sb/clone-shallow-passthru later to maint). + + * Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}' + to set the default value, without enclosing it in double quotes. + (merge 01247e0 lc/shell-default-value-noexpand later to maint). + + * Some platform-specific code had non-ANSI strict declarations of C + functions that do not take any parameters, which has been + corrected. + (merge 0767172 js/mingw-parameter-less-c-functions later to maint). + + * The internal code used to show local timezone offset is not + prepared to handle timestamps beyond year 2100, and gave a + bogus offset value to the caller. Use a more benign looking + +0000 instead and let "git log" going in such a case, instead + of aborting. + (merge bab7483 jk/tzoffset-fix later to maint). + + * One among four invocations of readlink(1) in our test suite has + been rewritten so that the test can run on systems without the + command (others are in valgrind test framework and t9802). + (merge d2addc3 ak/t7800-wo-readlink later to maint). + + * t/perf needs /usr/bin/time with GNU extension; the invocation of it + is updated to "gtime" on Darwin. + (merge e3efa94 js/perf-on-apple later to maint). + + * A bug, which caused "git p4" while running under verbose mode to + report paths that are omitted due to branch prefix incorrectly, has + been fixed; the command said "Ignoring file outside of prefix" for + paths that are _inside_. + (merge 09667d0 ao/p4-has-branch-prefix-fix later to maint). * Other minor clean-ups and documentation updates - (merge 3a39f61 pc/occurred later to maint). - (merge 9e70233 jk/fetch-prune-doc later to maint). - (merge ed008d7 pb/strbuf-read-file-doc later to maint). - (merge 31da121 jc/deref-tag later to maint). + (merge e51b0df pb/commit-editmsg-path later to maint). + (merge b333d0d jk/send-pack-stdio later to maint). + (merge fcf0fe9 lf/sideband-returns-void later to maint). + (merge 5819c2e sb/t5614-modernize later to maint). + (merge fe0537a cb/t7810-test-label-fix later to maint). + (merge 412b9a1 jc/t2300-setup later to maint). -- cgit v1.3 From d0ccc82ad8984ccac27cf39cfc1a00dc4fc78eca Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Jul 2016 10:36:29 -0700 Subject: Fourth batch of topics for 2.10 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 40 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index 3853b3dec6..4783e25ce1 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -55,6 +55,26 @@ UI, Workflows & Features to the right border. (merge 066790d nd/graph-width-padded later to maint). + * 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. + (merge 531220b jc/send-email-skip-backup later to maint). + + * "git submodule update" that drives many "git clone" could + eventually hit flaky servers/network conditions on one of the + submodules; the command learned to retry the attempt. + + * The output coloring scheme learned two new attributes, italic and + strike, in addition to existing bold, reverse, etc. + + * "git log" learns log.showSignature configuration variable, and a + command line option "--no-show-signature" to countermand it. + (merge fce04c3 mj/log-show-signature-conf later to maint). + + * A couple of "git svn" updates. + Performance, Internal Implementation, Development Support etc. @@ -116,6 +136,9 @@ Performance, Internal Implementation, Development Support etc. errors (instead of relying on GPG's exit status). (merge efee955 jk/gpg-interface-cleanup later to maint). + * Allow t/perf framework to use the features from the most recent + version of Git even when testing an older installed version. + Also contains various documentation updates and code clean-ups. @@ -219,6 +242,23 @@ notes for details). paths that are _inside_. (merge 09667d0 ao/p4-has-branch-prefix-fix later to maint). + * The top level documentation "git help git" still pointed at the + documentation set hosted at now-defunct google-code repository. + Update it to point to https://git.github.io/htmldocs/git.html + instead. + (merge f793582 jn/preformatted-doc-url later to maint). + + * A helper function that takes the contents of a commit object and + finds its subject line did not ignore leading blank lines, as is + commonly done by other codepaths. Make it ignore leading blank + lines to match. + (merge 054a5ae js/find-commit-subject-ignore-leading-blanks later to maint). + + * For a long time, we carried an in-code comment that said our + colored output would work only when we use fprintf/fputs on + Windows, which no longer is the case for the past few years. + (merge 3d0a833 js/color-on-windows-comment later to maint). + * Other minor clean-ups and documentation updates (merge e51b0df pb/commit-editmsg-path later to maint). (merge b333d0d jk/send-pack-stdio later to maint). -- cgit v1.3 From 79ed43c28f626a4e805f350a77c54968b59be6e9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 13 Jul 2016 11:26:49 -0700 Subject: Fifth batch of topics for 2.10 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 59 ++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 19 deletions(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index 4783e25ce1..4252eb7348 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -31,7 +31,6 @@ UI, Workflows & Features * "git add -i/-p" learned to honor diff.compactionHeuristic experimental knob, so that the user can work on the same hunk split as "git diff" output. - (merge 46e3d17 jk/add-i-diff-compact-heuristics later to maint). * "upload-pack" allows a custom "git pack-objects" replacement when responding to "fetch/clone" via the uploadpack.packObjectsHook. @@ -53,7 +52,6 @@ UI, Workflows & Features draw text that is to the right of the ancestry-graph section. It also now accepts negative N that means the column limit is relative to the right border. - (merge 066790d nd/graph-width-padded later to maint). * A careless invocation of "git send-email directory/" after editing 0001-change.patch with an editor often ends up sending both @@ -75,6 +73,14 @@ UI, Workflows & Features * A couple of "git svn" updates. + * More markings of messages for i18n, with updates to various tests + to pass GETTEXT_POISON tests. + + * "git archive" learned to handle files that are larger than 8GB and + commits far in the future than expressible by the traditional US-TAR + format. + (merge 5caeeb8 jk/big-and-future-archive-tar later to maint). + Performance, Internal Implementation, Development Support etc. @@ -86,7 +92,6 @@ Performance, Internal Implementation, Development Support etc. connection from a client that silently goes offline can hang around for a long time, wasting resources. The socket-level KEEPALIVE has been enabled to allow the OS to notice such failed connections. - (merge a43b68a ew/daemon-socket-keepalive later to maint). * "git upload-pack" command has been updated to use the parse-options API. @@ -112,19 +117,16 @@ Performance, Internal Implementation, Development Support etc. * The ownership rule for the piece of memory that hold references to be fetched in "git fetch" was screwy, which has been cleaned up. - (merge b7410f6 km/fetch-do-not-free-remote-name later to maint). * "git bisect" makes an internal call to "git diff-tree" when bisection finds the culprit, but this call did not initialize the data structure to pass to the diff-tree API correctly. - (merge 43ec550 jk/bisect-show-tree later to maint). * Further preparatory clean-up for "worktree" feature continues. (merge 0409e0b nd/worktree-cleanup-post-head-protection later to maint). * Formats of the various data (and how to validate them) where we use GPG signature have been documented. - (merge cc6ee97 mg/signature-doc later to maint). * A new run-command API function pipe_command() is introduced to sanely feed data to the standard input while capturing data from @@ -155,18 +157,15 @@ notes for details). --no-color or with --color=auto when the output is not connected to a tty; this was corrected to make the format truly behave as "auto". - (merge b15a3e0 et/pretty-format-c-auto later to maint). * "git rev-list --count" whose walk-length is limited with "-n" option did not work well with the counting optimized to look at the bitmap index. - (merge fb85db8 jk/rev-list-count-with-bitmap later to maint). * "git show -W" (extend hunks to cover the entire function, delimited by lines that match the "funcname" pattern) used to show the entire file when a change added an entire function at the end of the file, which has been fixed. - (merge 6f8d9bc rs/xdiff-hunk-with-func-line later to maint). * The documentation set has been updated so that literal commands, configuration variables and environment variables are consistently @@ -209,16 +208,13 @@ notes for details). that recurses down to submodules by forcing the submodules to also be cloned shallowly, which many server instances that host upstream of the submodules are not prepared for. - (merge 18a74a0 sb/clone-shallow-passthru later to maint). * Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}' to set the default value, without enclosing it in double quotes. - (merge 01247e0 lc/shell-default-value-noexpand later to maint). * Some platform-specific code had non-ANSI strict declarations of C functions that do not take any parameters, which has been corrected. - (merge 0767172 js/mingw-parameter-less-c-functions later to maint). * The internal code used to show local timezone offset is not prepared to handle timestamps beyond year 2100, and gave a @@ -230,23 +226,19 @@ notes for details). * One among four invocations of readlink(1) in our test suite has been rewritten so that the test can run on systems without the command (others are in valgrind test framework and t9802). - (merge d2addc3 ak/t7800-wo-readlink later to maint). * t/perf needs /usr/bin/time with GNU extension; the invocation of it is updated to "gtime" on Darwin. - (merge e3efa94 js/perf-on-apple later to maint). * A bug, which caused "git p4" while running under verbose mode to report paths that are omitted due to branch prefix incorrectly, has been fixed; the command said "Ignoring file outside of prefix" for paths that are _inside_. - (merge 09667d0 ao/p4-has-branch-prefix-fix later to maint). * The top level documentation "git help git" still pointed at the documentation set hosted at now-defunct google-code repository. Update it to point to https://git.github.io/htmldocs/git.html instead. - (merge f793582 jn/preformatted-doc-url later to maint). * A helper function that takes the contents of a commit object and finds its subject line did not ignore leading blank lines, as is @@ -259,10 +251,39 @@ notes for details). Windows, which no longer is the case for the past few years. (merge 3d0a833 js/color-on-windows-comment later to maint). + * "gc.autoPackLimit" when set to 1 should not trigger a repacking + when there is only one pack, but the code counted poorly and did + so. + (merge 5f4e3bf ew/gc-auto-pack-limit-fix later to maint). + + * Add a test to specify the desired behaviour that currently is not + available in "git rebase -Xsubtree=...". + (merge 5f35900 dg/subtree-rebase-test later to maint). + + * More mark-up updates to typeset strings that are expected to + literally typed by the end user in fixed-width font. + (merge 661c3e9 mm/doc-tt later to maint). + + * "git commit --amend --allow-empty-message -S" for a commit without + any message body could have misidentified where the header of the + commit object ends. + (merge 3324dd8 js/sign-empty-commit-fix later to maint). + + * "git rebase -i --autostash" did not restore the auto-stashed change + when the operation was aborted. + (merge 33ba9c6 ps/rebase-i-auto-unstash-upon-abort later to maint). + + * Git does not know what the contents in the index should be for a + path added with "git add -N" yet, so "git grep --cached" should not + show hits (or show lack of hits, with -L) in such a path, but that + logic does not apply to "git grep", i.e. searching in the working + tree files. But we did so by mistake, which has been corrected. + (merge b8e47d1 nd/ita-cleanup later to maint). + * Other minor clean-ups and documentation updates (merge e51b0df pb/commit-editmsg-path later to maint). (merge b333d0d jk/send-pack-stdio later to maint). (merge fcf0fe9 lf/sideband-returns-void later to maint). - (merge 5819c2e sb/t5614-modernize later to maint). - (merge fe0537a cb/t7810-test-label-fix later to maint). - (merge 412b9a1 jc/t2300-setup later to maint). + (merge c2691e2 ah/unpack-trees-advice-messages later to maint). + (merge 82f6178 nd/doc-new-command later to maint). + (merge fa90ab4 js/t3404-grammo-fix later to maint). -- cgit v1.3 From 08bb3500a2a718c3c78b0547c68601cafa7a8fd9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 19 Jul 2016 13:26:16 -0700 Subject: Sixth batch of topics for 2.10 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 70 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index 4252eb7348..fe921ddd58 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -81,6 +81,9 @@ UI, Workflows & Features format. (merge 5caeeb8 jk/big-and-future-archive-tar later to maint). + * A new configuration variable core.sshCommand has been added to + specify what value for GIT_SSH_COMMAND to use per repository. + Performance, Internal Implementation, Development Support etc. @@ -141,6 +144,31 @@ Performance, Internal Implementation, Development Support etc. * Allow t/perf framework to use the features from the most recent version of Git even when testing an older installed version. + * The commands in the "log/diff" family have had an FILE* pointer in the + data structure they pass around for a long time, but some codepaths + used to always write to the standard output. As a preparatory step + to make "git format-patch" available to the internal callers, these + codepaths have been updated to consistently write into that FILE* + instead. + + * Conversion from unsigned char sha1[20] to struct object_id + continues. + + * Improve the look of the way "git fetch" reports what happened to + each ref that was fetched. + (merge bc437d1 nd/fetch-ref-summary later to maint). + + * The .c/.h sources are marked as such in our .gitattributes file so + that "git diff -W" and friends would work better. + (merge e82675a rs/help-c-source-with-gitattributes later to maint). + + * Code clean-up to avoid using a variable string that compilers may + feel untrustable as printf-style format given to write_file() + helper function. + + * "git p4" used a location outside $GIT_DIR/refs/ to place its + temporary branches, which has been moved to refs/git-p4-tmp/. + Also contains various documentation updates and code clean-ups. @@ -280,6 +308,47 @@ notes for details). tree files. But we did so by mistake, which has been corrected. (merge b8e47d1 nd/ita-cleanup later to maint). + * "git blame -M" missed a single line that was moved within the file. + (merge 17a07e2 dk/blame-move-no-reason-for-1-line-context later to maint). + + * Fix recently introduced codepaths that are involved in parallel + submodule operations, which gave up on reading too early, and + could have wasted CPU while attempting to write under a corner + case condition. + (merge d751dd1 sb/submodule-parallel-fetch later to maint). + + * "git grep -i" has been taught to fold case in non-ascii locales + correctly. + (merge 695f95b nd/icase later to maint). + + * A test that unconditionally used "mktemp" learned that the command + is not necessarily available everywhere. + (merge c578a09 ak/lazy-prereq-mktemp later to maint). + + * There are certain house-keeping tasks that need to be performed at + the very beginning of any Git program, and programs that are not + built-in commands had to do them exactly the same way as "git" + potty does. It was easy to make mistakes in one-off standalone + programs (like test helpers). A common "main()" function that + calls cmd_main() of individual program has been introduced to + make it harder to make mistakes. + (merge de61ceb jk/common-main later to maint). + + * The test framework learned a new helper test_match_signal to + check an exit code from getting killed by an expected signal. + (merge 03c39b3 jk/test-match-signal later to maint). + + * General code clean-up around a helper function to write a + single-liner to a file. + (merge 7eb6e10 jk/write-file later to maint). + + * One part of "git am" had an oddball helper function that called + stuff from outside "his" as opposed to calling what we have "ours", + which was not gender-neutral and also inconsistent with the rest of + the system where outside stuff is usuall called "theirs" in + contrast to "ours". + (merge 715a51b js/am-call-theirs-theirs-in-fallback-3way later to maint). + * Other minor clean-ups and documentation updates (merge e51b0df pb/commit-editmsg-path later to maint). (merge b333d0d jk/send-pack-stdio later to maint). @@ -287,3 +356,4 @@ notes for details). (merge c2691e2 ah/unpack-trees-advice-messages later to maint). (merge 82f6178 nd/doc-new-command later to maint). (merge fa90ab4 js/t3404-grammo-fix later to maint). + (merge c61b2af lf/recv-sideband-cleanup later to maint). -- cgit v1.3 From 8c6d1f9807c67532e7fb545a944b064faff0f70b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 25 Jul 2016 14:17:28 -0700 Subject: Seventh batch of topics for 2.10 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 69 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index fe921ddd58..f9dfc27b33 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -169,6 +169,42 @@ Performance, Internal Implementation, Development Support etc. * "git p4" used a location outside $GIT_DIR/refs/ to place its temporary branches, which has been moved to refs/git-p4-tmp/. + * Existing autoconf generated test for the need to link with pthread + library did not check all the functions from pthread libraries; + recent FreeBSD has some functions in libc but not others, and we + mistakenly thought linking with libc is enough when it is not. + (merge a9b02de ew/autoconf-pthread later to maint). + + * When "git fsck" reports a broken link (e.g. a tree object contains + a blob that does not exist), both containing object and the object + that is referred to were reported with their 40-hex object names. + The command learned the "--name-objects" option to show the path to + the containing object from existing refs (e.g. "HEAD~24^2:file.txt"). + + * Allow http daemon tests in Travis CI tests. + (merge d9d1426 ls/travis-enable-httpd-tests later to maint). + + * Makefile assumed that -lrt is always available on platforms that + want to use clock_gettime() and CLOCK_MONOTONIC, which is not a + case for recent Mac OS X. The necessary symbols are often found in + libc on many modern systems and having -lrt on the command line, as + long as the library exists, had no effect, but when the platform + removes librt.a that is a different matter--having -lrt will break + the linkage. + + This change could be seen as a regression for those who do need to + specify -lrt, as they now specifically ask for NEEDS_LIBRT when + building. Hopefully they are in the minority these days. + + * Further preparatory work on the refs API before the pluggable + backend series can land. + + * Error handling in the codepaths that updates refs has been + improved. + + * The API to iterate over all the refs (i.e. for_each_ref(), etc.) + has been revamped. + Also contains various documentation updates and code clean-ups. @@ -349,6 +385,35 @@ notes for details). contrast to "ours". (merge 715a51b js/am-call-theirs-theirs-in-fallback-3way later to maint). + * "git blame file" allowed the lineage of lines in the uncommitted, + unadded contents of "file" to be inspected, but it refused when + "file" did not appear in the current commit. When "file" was + created by renaming an existing file (but the change has not been + committed), this restriction was unnecessarily tight. + (merge c66b470 mh/blame-worktree later to maint). + + * "git add -N dir/file && git write-tree" produced an incorrect tree + when there are other paths in the same directory that sorts after + "file". + (merge 6d6a782 nd/cache-tree-ita later to maint). + + * "git fetch http://user:pass@host/repo..." scrubbed the userinfo + part, but "git push" didn't. + (merge 68f3c07 jk/push-scrub-url later to maint). + + * "git merge" with renormalization did not work well with + merge-recursive, due to "safer crlf" conversion kicking in when it + shouldn't. + (merge 1335d76 jc/renormalize-merge-kill-safer-crlf later to maint). + + * The use of strbuf in "git rm" to build filename to remove was a bit + suboptimal, which has been fixed. + (merge deb8e15 rs/rm-strbuf-optim later to maint). + + * An age old bug that caused "git diff --ignore-space-at-eol" + misbehave has been fixed. + (merge 044fb19 js/ignore-space-at-eol later to maint). + * Other minor clean-ups and documentation updates (merge e51b0df pb/commit-editmsg-path later to maint). (merge b333d0d jk/send-pack-stdio later to maint). @@ -357,3 +422,7 @@ notes for details). (merge 82f6178 nd/doc-new-command later to maint). (merge fa90ab4 js/t3404-grammo-fix later to maint). (merge c61b2af lf/recv-sideband-cleanup later to maint). + (merge 31471ba rs/use-strbuf-addbuf later to maint). + (merge 503e224 nd/test-helpers later to maint). + (merge 16726cf jc/doc-diff-filter-exclude later to maint). + (merge fd2e7da rs/worktree-use-strbuf-absolute-path later to maint). -- cgit v1.3 From 8213178c86d5583ff809c582d6727ad17b6a0bed Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 28 Jul 2016 13:14:53 -0700 Subject: Eighth batch of topics for 2.10 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 53 +++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 19 deletions(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index f9dfc27b33..aa5edb6747 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -34,7 +34,7 @@ UI, Workflows & Features * "upload-pack" allows a custom "git pack-objects" replacement when responding to "fetch/clone" via the uploadpack.packObjectsHook. - (merge 20b20a2 jk/upload-pack-hook later to maint). + (merge b738396 jk/upload-pack-hook later to maint). * Teach format-patch and mailsplit (hence "am") how a line that happens to begin with "From " in the e-mail message is quoted with @@ -84,6 +84,13 @@ UI, Workflows & Features * A new configuration variable core.sshCommand has been added to specify what value for GIT_SSH_COMMAND to use per repository. + * "git worktree prune" protected worktrees that are marked as + "locked" by creating a file in a known location. "git worktree" + command learned a dedicated command pair to create and remove such + a file, so that the users do not have to do this with editor. + + * A handful of "git svn" updates. + Performance, Internal Implementation, Development Support etc. @@ -156,7 +163,6 @@ Performance, Internal Implementation, Development Support etc. * Improve the look of the way "git fetch" reports what happened to each ref that was fetched. - (merge bc437d1 nd/fetch-ref-summary later to maint). * The .c/.h sources are marked as such in our .gitattributes file so that "git diff -W" and friends would work better. @@ -205,6 +211,9 @@ Performance, Internal Implementation, Development Support etc. * The API to iterate over all the refs (i.e. for_each_ref(), etc.) has been revamped. + * A few tests that specifically target "git rebase -i" have been + added. + Also contains various documentation updates and code clean-ups. @@ -285,7 +294,6 @@ notes for details). bogus offset value to the caller. Use a more benign looking +0000 instead and let "git log" going in such a case, instead of aborting. - (merge bab7483 jk/tzoffset-fix later to maint). * One among four invocations of readlink(1) in our test suite has been rewritten so that the test can run on systems without the @@ -308,58 +316,46 @@ notes for details). finds its subject line did not ignore leading blank lines, as is commonly done by other codepaths. Make it ignore leading blank lines to match. - (merge 054a5ae js/find-commit-subject-ignore-leading-blanks later to maint). * For a long time, we carried an in-code comment that said our colored output would work only when we use fprintf/fputs on Windows, which no longer is the case for the past few years. - (merge 3d0a833 js/color-on-windows-comment later to maint). * "gc.autoPackLimit" when set to 1 should not trigger a repacking when there is only one pack, but the code counted poorly and did so. - (merge 5f4e3bf ew/gc-auto-pack-limit-fix later to maint). * Add a test to specify the desired behaviour that currently is not available in "git rebase -Xsubtree=...". - (merge 5f35900 dg/subtree-rebase-test later to maint). * More mark-up updates to typeset strings that are expected to literally typed by the end user in fixed-width font. - (merge 661c3e9 mm/doc-tt later to maint). * "git commit --amend --allow-empty-message -S" for a commit without any message body could have misidentified where the header of the commit object ends. - (merge 3324dd8 js/sign-empty-commit-fix later to maint). * "git rebase -i --autostash" did not restore the auto-stashed change when the operation was aborted. - (merge 33ba9c6 ps/rebase-i-auto-unstash-upon-abort later to maint). * Git does not know what the contents in the index should be for a path added with "git add -N" yet, so "git grep --cached" should not show hits (or show lack of hits, with -L) in such a path, but that logic does not apply to "git grep", i.e. searching in the working tree files. But we did so by mistake, which has been corrected. - (merge b8e47d1 nd/ita-cleanup later to maint). * "git blame -M" missed a single line that was moved within the file. - (merge 17a07e2 dk/blame-move-no-reason-for-1-line-context later to maint). * Fix recently introduced codepaths that are involved in parallel submodule operations, which gave up on reading too early, and could have wasted CPU while attempting to write under a corner case condition. - (merge d751dd1 sb/submodule-parallel-fetch later to maint). * "git grep -i" has been taught to fold case in non-ascii locales correctly. - (merge 695f95b nd/icase later to maint). * A test that unconditionally used "mktemp" learned that the command is not necessarily available everywhere. - (merge c578a09 ak/lazy-prereq-mktemp later to maint). * There are certain house-keeping tasks that need to be performed at the very beginning of any Git program, and programs that are not @@ -372,7 +368,6 @@ notes for details). * The test framework learned a new helper test_match_signal to check an exit code from getting killed by an expected signal. - (merge 03c39b3 jk/test-match-signal later to maint). * General code clean-up around a helper function to write a single-liner to a file. @@ -383,7 +378,6 @@ notes for details). which was not gender-neutral and also inconsistent with the rest of the system where outside stuff is usuall called "theirs" in contrast to "ours". - (merge 715a51b js/am-call-theirs-theirs-in-fallback-3way later to maint). * "git blame file" allowed the lineage of lines in the uncommitted, unadded contents of "file" to be inspected, but it refused when @@ -414,15 +408,36 @@ notes for details). misbehave has been fixed. (merge 044fb19 js/ignore-space-at-eol later to maint). + * "git notes merge" had a code to see if a path exists (and fails if + it does) and then open the path for writing (when it doesn't). + Replace it with open with O_EXCL. + (merge deb9c15 rs/notes-merge-no-toctou later to maint). + + * "git pack-objects" and "git index-pack" mostly operate with off_t + when talking about the offset of objects in a packfile, but there + were a handful of places that used "unsigned long" to hold that + value, leading to an unintended truncation. + (merge ec9d224 nd/pack-ofs-4gb-limit later to maint). + + * Recent update to "git daemon" tries to enable the socket-level + KEEPALIVE, but when it is spawned via inetd, the standard input + file descriptor may not necessarily be connected to a socket. + Suppress an ENOTSOCK error from setsockopt(). + (merge fab6027 ew/daemon-socket-keepalive later to maint). + + * Recent FreeBSD stopped making perl available at /usr/bin/perl; + switch the default the built-in path to /usr/local/bin/perl on not + too ancient FreeBSD releases. + (merge 259f22a ew/find-perl-on-freebsd-in-local later to maint). + * Other minor clean-ups and documentation updates (merge e51b0df pb/commit-editmsg-path later to maint). (merge b333d0d jk/send-pack-stdio later to maint). (merge fcf0fe9 lf/sideband-returns-void later to maint). (merge c2691e2 ah/unpack-trees-advice-messages later to maint). - (merge 82f6178 nd/doc-new-command later to maint). - (merge fa90ab4 js/t3404-grammo-fix later to maint). (merge c61b2af lf/recv-sideband-cleanup later to maint). (merge 31471ba rs/use-strbuf-addbuf later to maint). (merge 503e224 nd/test-helpers later to maint). (merge 16726cf jc/doc-diff-filter-exclude later to maint). (merge fd2e7da rs/worktree-use-strbuf-absolute-path later to maint). + (merge 406621f sb/submodule-deinit-all later to maint). -- cgit v1.3 From 80460f513ebd7851953f5402dd9744236128b240 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 3 Aug 2016 15:13:16 -0700 Subject: Ninth batch of topics for 2.10 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 61 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index aa5edb6747..a55f43aa8b 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -91,6 +91,20 @@ UI, Workflows & Features * A handful of "git svn" updates. + * "git push" learned to accept and pass extra options to the + receiving end so that hooks can read and react to them. + + * "git status" learned to suggest "merge --abort" during a conflicted + merge, just like it already suggests "rebase --abort" during a + conflicted rebase. + (merge b0a61ab mm/status-suggest-merge-abort later to maint). + + * "git jump" script (in contrib/) has been updated a bit. + (merge a91e692 jk/git-jump later to maint). + + * "git push" and "git clone" learned to give better progress meters + to the end user who is waiting on the terminal. + Performance, Internal Implementation, Development Support etc. @@ -214,6 +228,24 @@ Performance, Internal Implementation, Development Support etc. * A few tests that specifically target "git rebase -i" have been added. + * Dumb http transport on the client side has been optimized. + (merge ecba195 ew/http-walker later to maint). + + * Users of the parse_options_concat() API function need to allocate + extra slots in advance and fill them with OPT_END() when they want + to decide the set of supported options dynamically, which makes the + code error-prone and hard to read. This has been corrected by tweaking + the API to allocate and return a new copy of "struct option" array. + (merge 023ff39 jk/parse-options-concat later to maint). + + * "git fetch" exchanges batched have/ack messages between the sender + and the receiver, initially doubling every time and then falling + back to enlarge the window size linearly. The "smart http" + transport, being an half-duplex protocol, outgrows the preset limit + too quickly and becomes inefficient when interacting with a large + repository. The internal mechanism learned to grow the window size + more aggressively when working with the "smart http" transport. + Also contains various documentation updates and code clean-ups. @@ -430,6 +462,34 @@ notes for details). too ancient FreeBSD releases. (merge 259f22a ew/find-perl-on-freebsd-in-local later to maint). + * "git commit --help" said "--no-verify" is only about skipping the + pre-commit hook, and failed to say that it also skipped the + commit-msg hook. + (merge def480f os/no-verify-skips-commit-msg-too later to maint). + + * "git merge" in Git v2.9 was taught to forbid merging an unrelated + lines of history by default, but that is exactly the kind of thing + the "--rejoin" mode of "git subtree" (in contrib/) wants to do. + "git subtree" has been taught to use the "--allow-unrelated-histories" + option to override the default. + (merge 0f12c7d da/subtree-2.9-regression later to maint). + + * The build procedure for "git persistent-https" helper (in contrib/) + has been updated so that it can be built with more recent versions + of Go. + (merge accb613 pm/build-persistent-https-with-recent-go later to maint). + + * There is an optimization used in "git diff $treeA $treeB" to borrow + an already checked-out copy in the working tree when it is known to + be the same as the blob being compared, expecting that open/mmap of + such a file is faster than reading it from the object store, which + involves inflating and applying delta. This however kicked in even + when the checked-out copy needs to go through the convert-to-git + conversion (including the clean filter), which defeats the whole + point of the optimization. The optimization has been disabled when + the conversion is necessary. + (merge 06dec43 jk/diff-do-not-reuse-wtf-needs-cleaning later to maint). + * Other minor clean-ups and documentation updates (merge e51b0df pb/commit-editmsg-path later to maint). (merge b333d0d jk/send-pack-stdio later to maint). @@ -441,3 +501,4 @@ notes for details). (merge 16726cf jc/doc-diff-filter-exclude later to maint). (merge fd2e7da rs/worktree-use-strbuf-absolute-path later to maint). (merge 406621f sb/submodule-deinit-all later to maint). + (merge 55cbe18 rs/submodule-config-code-cleanup later to maint). -- cgit v1.3 From c6b0597e9ac7277e148e2fd4d7615ac6e0bfb661 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 4 Aug 2016 14:40:34 -0700 Subject: Tenth batch for 2.10 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index a55f43aa8b..a9fb0736d6 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -490,6 +490,11 @@ notes for details). the conversion is necessary. (merge 06dec43 jk/diff-do-not-reuse-wtf-needs-cleaning later to maint). + * "git -c grep.patternType=extended log --basic-regexp" misbehaved + because the internal API to access the grep machinery was not + designed well. + (merge 8465541 jc/grep-commandline-vs-configuration later to maint). + * Other minor clean-ups and documentation updates (merge e51b0df pb/commit-editmsg-path later to maint). (merge b333d0d jk/send-pack-stdio later to maint). @@ -502,3 +507,4 @@ notes for details). (merge fd2e7da rs/worktree-use-strbuf-absolute-path later to maint). (merge 406621f sb/submodule-deinit-all later to maint). (merge 55cbe18 rs/submodule-config-code-cleanup later to maint). + (merge 280abfd sb/pack-protocol-doc-nak later to maint). -- cgit v1.3 From 0aaf2500f1302ebbd871b095003043b6c8e2999f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 8 Aug 2016 14:52:08 -0700 Subject: Eleventh batch for 2.10 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 85 ++++++++++++++++++++++++++++++--------- 1 file changed, 65 insertions(+), 20 deletions(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index a9fb0736d6..8abb67881e 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -105,6 +105,11 @@ UI, Workflows & Features * "git push" and "git clone" learned to give better progress meters to the end user who is waiting on the terminal. + * An entry "git log --decorate" for the tip of the current branch is + shown as "HEAD -> name" (where "name" is the name of the branch); + paint the arrow in the same color as "HEAD", not in the color for + commits. + Performance, Internal Implementation, Development Support etc. @@ -246,6 +251,27 @@ Performance, Internal Implementation, Development Support etc. repository. The internal mechanism learned to grow the window size more aggressively when working with the "smart http" transport. + * Tests for "git svn" have been taught to reuse the lib-httpd test + infrastructure when testing the subversion integration that + interacts with subversion repositories served over the http:// + protocol. + (merge a8a5d25 ew/git-svn-http-tests later to maint). + + * "git pack-objects" has a few options that tell it not to pack + objects found in certain packfiles, which require it to scan .idx + files of all available packs. The codepaths involved in these + operations have been optimized for a common case of not having any + non-local pack and/or any .kept pack. + + * The t3700 test about "add --chmod=-x" have been made a bit more + robust and generally cleaned up. + (merge 766cdc4 ib/t3700-add-chmod-x-updates later to maint). + + * The build procedure learned PAGER_ENV knob that lists what default + environment variable settings to export for popular pagers. This + mechanism is used to tweak the default settings to MORE on FreeBSD. + (merge 995bc22 ew/build-time-pager-tweaks later to maint). + Also contains various documentation updates and code clean-ups. @@ -416,16 +442,13 @@ notes for details). "file" did not appear in the current commit. When "file" was created by renaming an existing file (but the change has not been committed), this restriction was unnecessarily tight. - (merge c66b470 mh/blame-worktree later to maint). * "git add -N dir/file && git write-tree" produced an incorrect tree when there are other paths in the same directory that sorts after "file". - (merge 6d6a782 nd/cache-tree-ita later to maint). * "git fetch http://user:pass@host/repo..." scrubbed the userinfo part, but "git push" didn't. - (merge 68f3c07 jk/push-scrub-url later to maint). * "git merge" with renormalization did not work well with merge-recursive, due to "safer crlf" conversion kicking in when it @@ -438,29 +461,24 @@ notes for details). * An age old bug that caused "git diff --ignore-space-at-eol" misbehave has been fixed. - (merge 044fb19 js/ignore-space-at-eol later to maint). * "git notes merge" had a code to see if a path exists (and fails if it does) and then open the path for writing (when it doesn't). Replace it with open with O_EXCL. - (merge deb9c15 rs/notes-merge-no-toctou later to maint). * "git pack-objects" and "git index-pack" mostly operate with off_t when talking about the offset of objects in a packfile, but there were a handful of places that used "unsigned long" to hold that value, leading to an unintended truncation. - (merge ec9d224 nd/pack-ofs-4gb-limit later to maint). * Recent update to "git daemon" tries to enable the socket-level KEEPALIVE, but when it is spawned via inetd, the standard input file descriptor may not necessarily be connected to a socket. Suppress an ENOTSOCK error from setsockopt(). - (merge fab6027 ew/daemon-socket-keepalive later to maint). * Recent FreeBSD stopped making perl available at /usr/bin/perl; switch the default the built-in path to /usr/local/bin/perl on not too ancient FreeBSD releases. - (merge 259f22a ew/find-perl-on-freebsd-in-local later to maint). * "git commit --help" said "--no-verify" is only about skipping the pre-commit hook, and failed to say that it also skipped the @@ -495,16 +513,43 @@ notes for details). designed well. (merge 8465541 jc/grep-commandline-vs-configuration later to maint). + * Windows port was failing some tests in t4130, due to the lack of + inum in the returned values by its lstat(2) emulation. + (merge 54956df js/t4130-rename-without-ino later to maint). + + * The reflog output format is documented better, and a new format + --date=unix to report the seconds-since-epoch (without timezone) + has been added. + (merge 442f6fd jk/reflog-date later to maint). + + * "git difftool ..." started in a subdirectory failed to + interpret the paths relative to that directory, which has been + fixed. + (merge 32b8c58 jk/difftool-in-subdir later to maint). + + * The characters in the label shown for tags/refs for commits in + "gitweb" output are now properly escaped for proper HTML output. + (merge 77947bb ab/gitweb-link-html-escape later to maint). + + * FreeBSD can lie when asked mtime of a directory, which made the + untracked cache code to fall back to a slow-path, which in turn + caused tests in t7063 to fail because it wanted to verify the + behaviour of the fast-path. + (merge 6b7728d nd/fbsd-lazy-mtime later to maint). + + * Squelch compiler warnings for netmalloc (in compat/) library. + (merge c6c9e18 js/nedmalloc-gcc6-warnings later to maint). + + * A small memory leak in the command line parsing of "git blame" + has been plugged. + + * The API documentation for hashmap was unclear if hashmap_entry + can be safely discarded without any other consideration. State + that it is safe to do so. + (merge 54ba5a1 jc/hashmap-doc-init later to maint). + * Other minor clean-ups and documentation updates - (merge e51b0df pb/commit-editmsg-path later to maint). - (merge b333d0d jk/send-pack-stdio later to maint). - (merge fcf0fe9 lf/sideband-returns-void later to maint). - (merge c2691e2 ah/unpack-trees-advice-messages later to maint). - (merge c61b2af lf/recv-sideband-cleanup later to maint). - (merge 31471ba rs/use-strbuf-addbuf later to maint). - (merge 503e224 nd/test-helpers later to maint). - (merge 16726cf jc/doc-diff-filter-exclude later to maint). - (merge fd2e7da rs/worktree-use-strbuf-absolute-path later to maint). - (merge 406621f sb/submodule-deinit-all later to maint). - (merge 55cbe18 rs/submodule-config-code-cleanup later to maint). - (merge 280abfd sb/pack-protocol-doc-nak later to maint). + (merge 9d1ca1d jk/t4205-cleanup later to maint). + (merge 5f072e0 cp/completion-clone-recurse-submodules later to maint). + (merge bc57b9c rs/use-strbuf-addstr later to maint). + (merge 52db4b0 jh/clean-smudge-f-doc later to maint). -- cgit v1.3 From 27b0ea4038f5976bee9d183ccbc868e9fcd9825e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 10 Aug 2016 12:35:40 -0700 Subject: Twelfth batch for 2.10 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 41 ++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index 8abb67881e..d9ac291f5f 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -97,7 +97,6 @@ UI, Workflows & Features * "git status" learned to suggest "merge --abort" during a conflicted merge, just like it already suggests "rebase --abort" during a conflicted rebase. - (merge b0a61ab mm/status-suggest-merge-abort later to maint). * "git jump" script (in contrib/) has been updated a bit. (merge a91e692 jk/git-jump later to maint). @@ -110,6 +109,13 @@ UI, Workflows & Features paint the arrow in the same color as "HEAD", not in the color for commits. + * "git format-patch" learned format.from configuration variable to + specify the default settings for its "--from" option. + + * "git am -3" calls "git merge-recursive" when it needs to fall back + to a three-way merge; this call has been turned into an internal + subroutine call instead of spawning a separate subprocess. + Performance, Internal Implementation, Development Support etc. @@ -185,7 +191,6 @@ Performance, Internal Implementation, Development Support etc. * The .c/.h sources are marked as such in our .gitattributes file so that "git diff -W" and friends would work better. - (merge e82675a rs/help-c-source-with-gitattributes later to maint). * Code clean-up to avoid using a variable string that compilers may feel untrustable as printf-style format given to write_file() @@ -198,7 +203,6 @@ Performance, Internal Implementation, Development Support etc. library did not check all the functions from pthread libraries; recent FreeBSD has some functions in libc but not others, and we mistakenly thought linking with libc is enough when it is not. - (merge a9b02de ew/autoconf-pthread later to maint). * When "git fsck" reports a broken link (e.g. a tree object contains a blob that does not exist), both containing object and the object @@ -207,7 +211,6 @@ Performance, Internal Implementation, Development Support etc. the containing object from existing refs (e.g. "HEAD~24^2:file.txt"). * Allow http daemon tests in Travis CI tests. - (merge d9d1426 ls/travis-enable-httpd-tests later to maint). * Makefile assumed that -lrt is always available on platforms that want to use clock_gettime() and CLOCK_MONOTONIC, which is not a @@ -241,7 +244,6 @@ Performance, Internal Implementation, Development Support etc. to decide the set of supported options dynamically, which makes the code error-prone and hard to read. This has been corrected by tweaking the API to allocate and return a new copy of "struct option" array. - (merge 023ff39 jk/parse-options-concat later to maint). * "git fetch" exchanges batched have/ack messages between the sender and the receiver, initially doubling every time and then falling @@ -457,7 +459,6 @@ notes for details). * The use of strbuf in "git rm" to build filename to remove was a bit suboptimal, which has been fixed. - (merge deb8e15 rs/rm-strbuf-optim later to maint). * An age old bug that caused "git diff --ignore-space-at-eol" misbehave has been fixed. @@ -483,19 +484,16 @@ notes for details). * "git commit --help" said "--no-verify" is only about skipping the pre-commit hook, and failed to say that it also skipped the commit-msg hook. - (merge def480f os/no-verify-skips-commit-msg-too later to maint). * "git merge" in Git v2.9 was taught to forbid merging an unrelated lines of history by default, but that is exactly the kind of thing the "--rejoin" mode of "git subtree" (in contrib/) wants to do. "git subtree" has been taught to use the "--allow-unrelated-histories" option to override the default. - (merge 0f12c7d da/subtree-2.9-regression later to maint). * The build procedure for "git persistent-https" helper (in contrib/) has been updated so that it can be built with more recent versions of Go. - (merge accb613 pm/build-persistent-https-with-recent-go later to maint). * There is an optimization used in "git diff $treeA $treeB" to borrow an already checked-out copy in the working tree when it is known to @@ -506,16 +504,13 @@ notes for details). conversion (including the clean filter), which defeats the whole point of the optimization. The optimization has been disabled when the conversion is necessary. - (merge 06dec43 jk/diff-do-not-reuse-wtf-needs-cleaning later to maint). * "git -c grep.patternType=extended log --basic-regexp" misbehaved because the internal API to access the grep machinery was not designed well. - (merge 8465541 jc/grep-commandline-vs-configuration later to maint). * Windows port was failing some tests in t4130, due to the lack of inum in the returned values by its lstat(2) emulation. - (merge 54956df js/t4130-rename-without-ino later to maint). * The reflog output format is documented better, and a new format --date=unix to report the seconds-since-epoch (without timezone) @@ -529,16 +524,13 @@ notes for details). * The characters in the label shown for tags/refs for commits in "gitweb" output are now properly escaped for proper HTML output. - (merge 77947bb ab/gitweb-link-html-escape later to maint). * FreeBSD can lie when asked mtime of a directory, which made the untracked cache code to fall back to a slow-path, which in turn caused tests in t7063 to fail because it wanted to verify the behaviour of the fast-path. - (merge 6b7728d nd/fbsd-lazy-mtime later to maint). * Squelch compiler warnings for netmalloc (in compat/) library. - (merge c6c9e18 js/nedmalloc-gcc6-warnings later to maint). * A small memory leak in the command line parsing of "git blame" has been plugged. @@ -546,10 +538,19 @@ notes for details). * The API documentation for hashmap was unclear if hashmap_entry can be safely discarded without any other consideration. State that it is safe to do so. - (merge 54ba5a1 jc/hashmap-doc-init later to maint). + + * Not-so-recent rewrite of "git am" that started making internal + calls into the commit machinery had an unintended regression, in + that no matter how many seconds it took to apply many patches, the + resulting committer timestamp for the resulting commits were all + the same. + (merge 4d9c7e6 jk/reset-ident-time-per-commit later to maint). + + * "git push --force-with-lease" already had enough logic to allow + ensuring that such a push results in creation of a ref (i.e. the + receiving end did not have another push from sideways that would be + discarded by our force-pushing), but didn't expose this possibility + to the users. It does so now. + (merge 9eed4f3 jk/push-force-with-lease-creation later to maint). * Other minor clean-ups and documentation updates - (merge 9d1ca1d jk/t4205-cleanup later to maint). - (merge 5f072e0 cp/completion-clone-recurse-submodules later to maint). - (merge bc57b9c rs/use-strbuf-addstr later to maint). - (merge 52db4b0 jh/clean-smudge-f-doc later to maint). -- cgit v1.3 From 2e3a16b279a9df2e498187871c67e623e12bc8a4 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Tue, 9 Aug 2016 11:53:38 +0300 Subject: Spelling fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit accidently accidentally commited committed dependancy dependency emtpy empty existance existence explicitely explicitly git-upload-achive git-upload-archive hierachy hierarchy indegee indegree intial initial mulitple multiple non-existant non-existent precendence. precedence. priviledged privileged programatically programmatically psuedo-binary pseudo-binary soemwhere somewhere successfull successful transfering transferring uncommited uncommitted unkown unknown usefull useful writting writing Signed-off-by: Ville Skyttä Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.3.10.txt | 2 +- Documentation/RelNotes/2.4.10.txt | 2 +- Documentation/RelNotes/2.5.4.txt | 2 +- Documentation/RelNotes/2.6.1.txt | 2 +- Documentation/git-remote-fd.txt | 2 +- Documentation/gitattributes.txt | 2 +- Documentation/gitmodules.txt | 2 +- commit-slab.h | 2 +- contrib/hooks/multimail/README | 4 ++-- contrib/mw-to-git/.perlcriticrc | 2 +- contrib/mw-to-git/git-remote-mediawiki.perl | 2 +- contrib/subtree/t/t7900-subtree.sh | 2 +- git-p4.py | 2 +- sha1_file.c | 2 +- t/README | 2 +- t/t1006-cat-file.sh | 2 +- t/t3101-ls-tree-dirname.sh | 2 +- t/t3420-rebase-autostash.sh | 4 ++-- t/t6018-rev-list-glob.sh | 2 +- t/t6030-bisect-porcelain.sh | 2 +- t/t7001-mv.sh | 8 ++++---- t/t7810-grep.sh | 2 +- t/t9401-git-cvsserver-crlf.sh | 2 +- transport-helper.c | 8 ++++---- upload-pack.c | 2 +- 25 files changed, 33 insertions(+), 33 deletions(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.3.10.txt b/Documentation/RelNotes/2.3.10.txt index 9d425d814d..20c2d2cacc 100644 --- a/Documentation/RelNotes/2.3.10.txt +++ b/Documentation/RelNotes/2.3.10.txt @@ -7,7 +7,7 @@ Fixes since v2.3.9 * xdiff code we use to generate diffs is not prepared to handle extremely large files. It uses "int" in many places, which can overflow if we have a very large number of lines or even bytes in - our input files, for example. Cap the input size to soemwhere + our input files, for example. Cap the input size to somewhere around 1GB for now. * Some protocols (like git-remote-ext) can execute arbitrary code diff --git a/Documentation/RelNotes/2.4.10.txt b/Documentation/RelNotes/2.4.10.txt index 8621199bc6..702d8d4e22 100644 --- a/Documentation/RelNotes/2.4.10.txt +++ b/Documentation/RelNotes/2.4.10.txt @@ -7,7 +7,7 @@ Fixes since v2.4.9 * xdiff code we use to generate diffs is not prepared to handle extremely large files. It uses "int" in many places, which can overflow if we have a very large number of lines or even bytes in - our input files, for example. Cap the input size to soemwhere + our input files, for example. Cap the input size to somewhere around 1GB for now. * Some protocols (like git-remote-ext) can execute arbitrary code diff --git a/Documentation/RelNotes/2.5.4.txt b/Documentation/RelNotes/2.5.4.txt index a5e8477a4a..b8a2f93ee7 100644 --- a/Documentation/RelNotes/2.5.4.txt +++ b/Documentation/RelNotes/2.5.4.txt @@ -7,7 +7,7 @@ Fixes since v2.5.4 * xdiff code we use to generate diffs is not prepared to handle extremely large files. It uses "int" in many places, which can overflow if we have a very large number of lines or even bytes in - our input files, for example. Cap the input size to soemwhere + our input files, for example. Cap the input size to somewhere around 1GB for now. * Some protocols (like git-remote-ext) can execute arbitrary code diff --git a/Documentation/RelNotes/2.6.1.txt b/Documentation/RelNotes/2.6.1.txt index 1e51363e3c..f37ea89cda 100644 --- a/Documentation/RelNotes/2.6.1.txt +++ b/Documentation/RelNotes/2.6.1.txt @@ -7,7 +7,7 @@ Fixes since v2.6 * xdiff code we use to generate diffs is not prepared to handle extremely large files. It uses "int" in many places, which can overflow if we have a very large number of lines or even bytes in - our input files, for example. Cap the input size to soemwhere + our input files, for example. Cap the input size to somewhere around 1GB for now. * Some protocols (like git-remote-ext) can execute arbitrary code diff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt index e700bafa47..80afca866c 100644 --- a/Documentation/git-remote-fd.txt +++ b/Documentation/git-remote-fd.txt @@ -17,7 +17,7 @@ fetch, push or archive. If only is given, it is assumed to be a bidirectional socket connected to remote Git server (git-upload-pack, git-receive-pack or -git-upload-achive). If both and are given, they are assumed +git-upload-archive). If both and are given, they are assumed to be pipes connected to a remote Git server ( being the inbound pipe and being the outbound pipe. diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 34db3e219b..807577a59f 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -133,7 +133,7 @@ Set to string value "auto":: When `text` is set to "auto", the path is marked for automatic end-of-line conversion. If Git decides that the content is text, its line endings are converted to LF on checkin. - When the file has been commited with CRLF, no conversion is done. + When the file has been committed with CRLF, no conversion is done. Unspecified:: diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 0849d281bb..10dcc08ff9 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -81,7 +81,7 @@ submodule..ignore:: submodule..shallow:: When set to true, a clone of this submodule will be performed as a - shallow clone unless the user explicitely asks for a non-shallow + shallow clone unless the user explicitly asks for a non-shallow clone. diff --git a/commit-slab.h b/commit-slab.h index f84b449413..be16da7728 100644 --- a/commit-slab.h +++ b/commit-slab.h @@ -8,7 +8,7 @@ * * After including this header file, using: * - * define_commit_slab(indegee, int); + * define_commit_slab(indegree, int); * * will let you call the following functions: * diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README index 0c91d19a57..22a23cdb94 100644 --- a/contrib/hooks/multimail/README +++ b/contrib/hooks/multimail/README @@ -294,7 +294,7 @@ multimailhook.htmlInIntro, multimailhook.htmlInFooter like ``link``, the reader will see the HTML source code and not a proper link. - Set ``multimailhook.htmlInIntro`` to true to allow writting HTML + Set ``multimailhook.htmlInIntro`` to true to allow writing HTML formatting in introduction templates. Similarly, set ``multimailhook.htmlInFooter`` for HTML in the footer. @@ -516,7 +516,7 @@ multimailhook.commitLogOpts multimailhook.dateSubstitute String to use as a substitute for ``Date:`` in the output of ``git - log`` while formatting commit messages. This is usefull to avoid + log`` while formatting commit messages. This is useful to avoid emitting a line that can be interpreted by mailers as the start of a cited message (Zimbra webmail in particular). Defaults to ``CommitDate:``. Set to an empty string or ``none`` to deactivate diff --git a/contrib/mw-to-git/.perlcriticrc b/contrib/mw-to-git/.perlcriticrc index 5a9955d757..158958d363 100644 --- a/contrib/mw-to-git/.perlcriticrc +++ b/contrib/mw-to-git/.perlcriticrc @@ -19,7 +19,7 @@ [InputOutput::RequireCheckedSyscalls] functions = open say close -# This rules demands to add a dependancy for the Readonly module. This is not +# This rule demands to add a dependency for the Readonly module. This is not # wished. [-ValuesAndExpressions::ProhibitConstantPragma] diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl index 8dd74a9a40..41e74fba1e 100755 --- a/contrib/mw-to-git/git-remote-mediawiki.perl +++ b/contrib/mw-to-git/git-remote-mediawiki.perl @@ -963,7 +963,7 @@ sub mw_upload_file { print {*STDERR} "Check the configuration of file uploads in your mediawiki.\n"; return $newrevid; } - # Deleting and uploading a file requires a priviledged user + # Deleting and uploading a file requires a privileged user if ($file_deleted) { $mediawiki = connect_maybe($mediawiki, $remotename, $url); my $query = { diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index 9751cfe9e6..3c87ebaf57 100755 --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -948,7 +948,7 @@ test_expect_success 'split a new subtree without --onto option' ' # also test that we still can split out an entirely new subtree # if the parent of the first commit in the tree is not empty, - # then the new subtree has accidently been attached to something + # then the new subtree has accidentally been attached to something git subtree split --prefix="sub dir2" --branch subproj2-br && check_equal "$(git log --pretty=format:%P -1 subproj2-br)" "" ) diff --git a/git-p4.py b/git-p4.py index ac6f4c14fb..fd5ca52462 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1934,7 +1934,7 @@ class P4Submit(Command, P4UserMap): if self.useClientSpec: self.clientSpecDirs = getClientSpec() - # Check for the existance of P4 branches + # Check for the existence of P4 branches branchesDetected = (len(p4BranchesInGit().keys()) > 1) if self.useClientSpec and not branchesDetected: diff --git a/sha1_file.c b/sha1_file.c index 3066b5f71c..7026e4ba78 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1692,7 +1692,7 @@ static int parse_sha1_header_extended(const char *hdr, struct object_info *oi, strbuf_add(oi->typename, type_buf, type_len); /* * Set type to 0 if its an unknown object and - * we're obtaining the type using '--allow-unkown-type' + * we're obtaining the type using '--allow-unknown-type' * option. */ if ((flags & LOOKUP_UNKNOWN_OBJECT) && (type < 0)) diff --git a/t/README b/t/README index 76a0daa3ac..0f764c0aef 100644 --- a/t/README +++ b/t/README @@ -265,7 +265,7 @@ right, so this: $ sh ./t9200-git-cvsexport-commit.sh --run='1-4 !3' will run tests 1, 2, and 4. Items that comes later have higher -precendence. It means that this: +precedence. It means that this: $ sh ./t9200-git-cvsexport-commit.sh --run='!3 1-4' diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh index 4f38078ff3..b19f332694 100755 --- a/t/t1006-cat-file.sh +++ b/t/t1006-cat-file.sh @@ -231,7 +231,7 @@ $tag_content | git cat-file --batch)" ' -test_expect_success "--batch-check for an emtpy line" ' +test_expect_success "--batch-check for an empty line" ' test " missing" = "$(echo | git cat-file --batch-check)" ' diff --git a/t/t3101-ls-tree-dirname.sh b/t/t3101-ls-tree-dirname.sh index 425d858938..327ded4000 100755 --- a/t/t3101-ls-tree-dirname.sh +++ b/t/t3101-ls-tree-dirname.sh @@ -16,7 +16,7 @@ This test runs git ls-tree with the following in a tree. path3/1.txt - a file in a directory path3/2.txt - a file in a directory -Test the handling of mulitple directories which have matching file +Test the handling of multiple directories which have matching file entries. Also test odd filename and missing entries handling. ' . ./test-lib.sh diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 532ff5cbd1..ab8a63e8d6 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -179,7 +179,7 @@ testrebase " --interactive" .git/rebase-merge test_expect_success 'abort rebase -i with --autostash' ' test_when_finished "git reset --hard" && - echo uncommited-content >file0 && + echo uncommitted-content >file0 && ( write_script abort-editor.sh <<-\EOF && echo >"$1" @@ -188,7 +188,7 @@ test_expect_success 'abort rebase -i with --autostash' ' test_must_fail git rebase -i --autostash HEAD^ && rm -f abort-editor.sh ) && - echo uncommited-content >expected && + echo uncommitted-content >expected && test_cmp expected file0 ' diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh index d00f7db868..381f35ed16 100755 --- a/t/t6018-rev-list-glob.sh +++ b/t/t6018-rev-list-glob.sh @@ -257,7 +257,7 @@ test_expect_success 'rev-list accumulates multiple --exclude' ' # "git rev-list" is likely to be a bug in the calling script and may -# deserve an error message, but do cases where set of refs programatically +# deserve an error message, but do cases where set of refs programmatically # given using globbing and/or --stdin need to fail with the same error, or # are we better off reporting a success with no output? The following few # tests document the current behaviour to remind us that we might want to diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 86d1380b9c..5e5370feb4 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -721,7 +721,7 @@ git bisect good 3de952f2416b6084f557ec417709eac740c6818c # first bad commit: [32a594a3fdac2d57cf6d02987e30eec68511498c] Add <4: Ciao for now> into . EOF -test_expect_success 'bisect log: successfull result' ' +test_expect_success 'bisect log: successful result' ' git bisect reset && git bisect start $HASH4 $HASH2 && git bisect good && diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 4a2570ed95..e365d1ff77 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -292,8 +292,8 @@ test_expect_success 'setup submodule' ' echo content >file && git add file && git commit -m "added sub and file" && - mkdir -p deep/directory/hierachy && - git submodule add ./. deep/directory/hierachy/sub && + mkdir -p deep/directory/hierarchy && + git submodule add ./. deep/directory/hierarchy/sub && git commit -m "added another submodule" && git branch submodule ' @@ -485,8 +485,8 @@ test_expect_success 'moving a submodule in nested directories' ' # git status would fail if the update of linking git dir to # work dir of the submodule failed. git status && - git config -f ../.gitmodules submodule.deep/directory/hierachy/sub.path >../actual && - echo "directory/hierachy/sub" >../expect + git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual && + echo "directory/hierarchy/sub" >../expect ) && test_cmp actual expect ' diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index cf3f9ec631..de2405ccba 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -581,7 +581,7 @@ test_expect_success 'log grep (9)' ' ' test_expect_success 'log grep (9)' ' - git log -g --grep-reflog="commit: third" --author="non-existant" --pretty=tformat:%s >actual && + git log -g --grep-reflog="commit: third" --author="non-existent" --pretty=tformat:%s >actual && : >expect && test_cmp expect actual ' diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh index f324b9f010..84787eee9a 100755 --- a/t/t9401-git-cvsserver-crlf.sh +++ b/t/t9401-git-cvsserver-crlf.sh @@ -154,7 +154,7 @@ test_expect_success 'adding files' ' echo "more text" > src.c && GIT_CONFIG="$git_config" cvs -Q add src.c >cvs.log 2>&1 && marked_as . src.c "" && - echo "psuedo-binary" > temp.bin + echo "pseudo-binary" > temp.bin ) && GIT_CONFIG="$git_config" cvs -Q add subdir/temp.bin >cvs.log 2>&1 && marked_as subdir temp.bin "-kb" && diff --git a/transport-helper.c b/transport-helper.c index 4208743605..db2f930c74 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -1103,7 +1103,7 @@ static void transfer_debug(const char *fmt, ...) } /* Stream state: More data may be coming in this direction. */ -#define SSTATE_TRANSFERING 0 +#define SSTATE_TRANSFERRING 0 /* * Stream state: No more data coming in this direction, flushing rest of * data. @@ -1112,7 +1112,7 @@ static void transfer_debug(const char *fmt, ...) /* Stream state: Transfer in this direction finished. */ #define SSTATE_FINISHED 2 -#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERING) +#define STATE_NEEDS_READING(state) ((state) <= SSTATE_TRANSFERRING) #define STATE_NEEDS_WRITING(state) ((state) <= SSTATE_FLUSHING) #define STATE_NEEDS_CLOSING(state) ((state) == SSTATE_FLUSHING) @@ -1369,7 +1369,7 @@ int bidirectional_transfer_loop(int input, int output) state.ptg.dest = 1; state.ptg.src_is_sock = (input == output); state.ptg.dest_is_sock = 0; - state.ptg.state = SSTATE_TRANSFERING; + state.ptg.state = SSTATE_TRANSFERRING; state.ptg.bufuse = 0; state.ptg.src_name = "remote input"; state.ptg.dest_name = "stdout"; @@ -1378,7 +1378,7 @@ int bidirectional_transfer_loop(int input, int output) state.gtp.dest = output; state.gtp.src_is_sock = 0; state.gtp.dest_is_sock = (input == output); - state.gtp.state = SSTATE_TRANSFERING; + state.gtp.state = SSTATE_TRANSFERRING; state.gtp.bufuse = 0; state.gtp.src_name = "stdin"; state.gtp.dest_name = "remote output"; diff --git a/upload-pack.c b/upload-pack.c index d4cc414bc2..ca7f941780 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -836,7 +836,7 @@ int cmd_main(int argc, const char **argv) OPT_BOOL(0, "stateless-rpc", &stateless_rpc, N_("quit after a single request/response exchange")), OPT_BOOL(0, "advertise-refs", &advertise_refs, - N_("exit immediately after intial ref advertisement")), + N_("exit immediately after initial ref advertisement")), OPT_BOOL(0, "strict", &strict, N_("do not try /.git/ if is no Git directory")), OPT_INTEGER(0, "timeout", &timeout, -- cgit v1.3 From 2807cd7b25af07f7175751b8519f649478031f49 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 12 Aug 2016 10:01:42 -0700 Subject: Final batch before 2.10-rc0 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index d9ac291f5f..6d63470de3 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -116,6 +116,10 @@ UI, Workflows & Features to a three-way merge; this call has been turned into an internal subroutine call instead of spawning a separate subprocess. + * The command line completion scripts (in contrib/) now knows about + "git branch --delete/--move [--remote]". + (merge 2703c22 vs/completion-branch-fully-spelled-d-m-r later to maint). + Performance, Internal Implementation, Development Support etc. @@ -274,6 +278,18 @@ Performance, Internal Implementation, Development Support etc. mechanism is used to tweak the default settings to MORE on FreeBSD. (merge 995bc22 ew/build-time-pager-tweaks later to maint). + * The http-backend (the server-side component of smart-http + transport) used to trickle the HTTP header one at a time. Now + these write(2)s are batched. + (merge b36045c ew/http-backend-batch-headers later to maint). + + * When "git rebase" tries to compare set of changes on the updated + upstream and our own branch, it computes patch-id for all of these + changes and attempts to find matches. This has been optimized by + lazily computing the full patch-id (which is expensive) to be + compared only for changes that touch the same set of paths. + (merge b3dfeeb kw/patch-ids-optim later to maint). + Also contains various documentation updates and code clean-ups. @@ -520,7 +536,6 @@ notes for details). * "git difftool ..." started in a subdirectory failed to interpret the paths relative to that directory, which has been fixed. - (merge 32b8c58 jk/difftool-in-subdir later to maint). * The characters in the label shown for tags/refs for commits in "gitweb" output are now properly escaped for proper HTML output. @@ -544,7 +559,6 @@ notes for details). that no matter how many seconds it took to apply many patches, the resulting committer timestamp for the resulting commits were all the same. - (merge 4d9c7e6 jk/reset-ident-time-per-commit later to maint). * "git push --force-with-lease" already had enough logic to allow ensuring that such a push results in creation of a ref (i.e. the @@ -553,4 +567,24 @@ notes for details). to the users. It does so now. (merge 9eed4f3 jk/push-force-with-lease-creation later to maint). + * The mechanism to limit the pack window memory size, when packing is + done using multiple threads (which is the default), is per-thread, + but this was not documented clearly. + (merge 954176c ms/document-pack-window-memory-is-per-thread later to maint). + + * "import-tars" fast-import script (in contrib/) used to ignore a + hardlink target and replaced it with an empty file, which has been + corrected to record the same blob as the other file the hardlink is + shared with. + (merge 04e0869 js/import-tars-hardlinks later to maint). + + * "git mv dir non-existing-dir/" did not work in some environments + the same way as existing mainstream platforms. The code now moves + "dir" to "non-existing-dir", without relying on rename("A", "B/") + that strips the trailing slash of '/'. + (merge 189d035 js/mv-dir-to-new-directory later to maint). + * Other minor clean-ups and documentation updates + (merge 02a8cfa rs/merge-add-strategies-simplification later to maint). + (merge af4941d rs/merge-recursive-string-list-init later to maint). + (merge 1eb47f1 rs/use-strbuf-add-unique-abbrev later to maint). -- cgit v1.3 From 726cc2ba12c4573ab2e623077479c51019e1f3cd Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 14 Aug 2016 14:48:06 -0700 Subject: Git 2.10-rc0 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 22 ++++++++++------------ GIT-VERSION-GEN | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index 6d63470de3..88d336ff16 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -71,8 +71,6 @@ UI, Workflows & Features command line option "--no-show-signature" to countermand it. (merge fce04c3 mj/log-show-signature-conf later to maint). - * A couple of "git svn" updates. - * More markings of messages for i18n, with updates to various tests to pass GETTEXT_POISON tests. @@ -106,8 +104,8 @@ UI, Workflows & Features * An entry "git log --decorate" for the tip of the current branch is shown as "HEAD -> name" (where "name" is the name of the branch); - paint the arrow in the same color as "HEAD", not in the color for - commits. + the arrow is now painted in the same color as "HEAD", not in the + color for commits. * "git format-patch" learned format.from configuration variable to specify the default settings for its "--from" option. @@ -135,19 +133,19 @@ Performance, Internal Implementation, Development Support etc. * "git upload-pack" command has been updated to use the parse-options API. - * The "git apply" standalone program is being libified; this is the - first step to move many state variables into a structure that can - be explicitly (re)initialized to make the machinery callable more - than once. + * The "git apply" standalone program is being libified; the first + step to move many state variables into a structure that can be + explicitly (re)initialized to make the machinery callable more + than once has been merged. * HTTP transport gained an option to produce more detailed debugging trace. (merge 73e57aa ep/http-curl-trace later to maint). - * Instead of taking advantage of a struct string_list that is - allocated with all NULs happens to be STRING_LIST_INIT_NODUP kind, - initialize them explicitly as such, to document their behaviour - better. + * Instead of taking advantage of the fact that a struct string_list + that is allocated with all NULs happens to be the INIT_NODUP kind, + the users of string_list structures are taught to initialize them + explicitly as such, to document their behaviour better. (merge 2721ce2 jk/string-list-static-init later to maint). * HTTPd tests learned to show the server error log to help diagnosing diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 0fe02a6ce2..eea85c3404 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.9.0.GIT +DEF_VER=v2.10.0-rc0 LF=' ' -- cgit v1.3 From 07c92928f2b782330df6e78dd9d019e984d820a7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 15 Aug 2016 10:20:38 -0700 Subject: Relnotes: decribe the updates to the "text=auto" attribute MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Helped-by: Torsten Bögershausen Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index 88d336ff16..179e5751d8 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -235,6 +235,15 @@ Performance, Internal Implementation, Development Support etc. * The API to iterate over all the refs (i.e. for_each_ref(), etc.) has been revamped. + * The handling of the "text = auto" attribute has been updated. + $ echo "* text=auto eol=crlf" >.gitattributes + used to have the same effect as + $ echo "* text=auto eol=crlf" >.gitattributes + $ git config core.eol crlf + i.e. declaring all files are text; the combination now is + equivalent to doing + $ git config core.autocrlf true + * A few tests that specifically target "git rebase -i" have been added. -- cgit v1.3 From 07d1a42badf5a29b030f9d1c4c8dd1ff9fdc8a91 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 17 Aug 2016 10:18:59 -0700 Subject: relnotes: redo the description of text=auto fix Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index 179e5751d8..f4e6a68510 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -235,13 +235,12 @@ Performance, Internal Implementation, Development Support etc. * The API to iterate over all the refs (i.e. for_each_ref(), etc.) has been revamped. - * The handling of the "text = auto" attribute has been updated. + * The handling of the "text=auto" attribute has been corrected. $ echo "* text=auto eol=crlf" >.gitattributes used to have the same effect as - $ echo "* text=auto eol=crlf" >.gitattributes - $ git config core.eol crlf - i.e. declaring all files are text; the combination now is - equivalent to doing + $ echo "* text eol=crlf" >.gitattributes + i.e. declaring all files are text (ignoring "auto"). The + combination has been fixed to be equivalent to doing $ git config core.autocrlf true * A few tests that specifically target "git rebase -i" have been -- cgit v1.3 From d63263a4dee8fc7da9b97bbdedf9c0d1f33024d4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 17 Aug 2016 14:09:17 -0700 Subject: RelNotes: final batch of topics before -rc1 --- Documentation/RelNotes/2.10.0.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index f4e6a68510..4f7460be39 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -296,6 +296,9 @@ Performance, Internal Implementation, Development Support etc. compared only for changes that touch the same set of paths. (merge b3dfeeb kw/patch-ids-optim later to maint). + * A handful of tests that were broken under gettext-poison build have + been fixed. + Also contains various documentation updates and code clean-ups. @@ -590,7 +593,17 @@ notes for details). that strips the trailing slash of '/'. (merge 189d035 js/mv-dir-to-new-directory later to maint). + * The "t/" hierarchy is prone to get an unusual pathname; "make test" + has been taught to make sure they do not contain paths that cannot + be checked out on Windows (and the mechanism can be reusable to + catch pathnames that are not portable to other platforms as need + arises). + (merge c2cafd3 js/test-lint-pathname later to maint). + * Other minor clean-ups and documentation updates (merge 02a8cfa rs/merge-add-strategies-simplification later to maint). (merge af4941d rs/merge-recursive-string-list-init later to maint). (merge 1eb47f1 rs/use-strbuf-add-unique-abbrev later to maint). + (merge ddd0bfa jk/tighten-alloc later to maint). + (merge ecf30b2 rs/mailinfo-lib later to maint). + (merge 0eb75ce sg/reflog-past-root later to maint). -- cgit v1.3 From 2632c897f74b1cc9b5533f467da459b9ec725538 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 19 Aug 2016 15:39:33 -0700 Subject: Git 2.10-rc1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 31 +++++++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index 4f7460be39..0ef70fd9b1 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -118,6 +118,15 @@ UI, Workflows & Features "git branch --delete/--move [--remote]". (merge 2703c22 vs/completion-branch-fully-spelled-d-m-r later to maint). + * "git rev-parse --git-path hooks/" learned to take + core.hooksPath configuration variable (introduced during 2.9 cycle) + into account. + (merge 9445b49 ab/hooks later to maint). + + * "git log --show-signature" and other commands that display the + verification status of PGP signature now shows the longer key-id, + as 32-bit key-id is so last century. + Performance, Internal Implementation, Development Support etc. @@ -600,6 +609,28 @@ notes for details). arises). (merge c2cafd3 js/test-lint-pathname later to maint). + * When "git merge-recursive" works on history with many criss-cross + merges in "verbose" mode, the names the command assigns to the + virtual merge bases could have overwritten each other by unintended + reuse of the same piece of memory. + (merge 5447a76 rs/pull-signed-tag later to maint). + + * "git checkout --detach " used to give the same advice + message as that is issued when "git checkout " (or anything + that is not a branch name) is given, but asking with "--detach" is + an explicit enough sign that the user knows what is going on. The + advice message has been squelched in this case. + (merge 779b88a sb/checkout-explit-detach-no-advice later to maint). + + * "git difftool" by default ignores the error exit from the backend + commands it spawns, because often they signal that they found + differences by exiting with a non-zero status code just like "diff" + does; the exit status codes 126 and above however are special in + that they are used to signal that the command is not executable, + does not exist, or killed by a signal. "git difftool" has been + taught to notice these exit status codes. + (merge 45a4f5d jk/difftool-command-not-found later to maint). + * Other minor clean-ups and documentation updates (merge 02a8cfa rs/merge-add-strategies-simplification later to maint). (merge af4941d rs/merge-recursive-string-list-init later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index eea85c3404..702c067a78 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.10.0-rc0 +DEF_VER=v2.10.0-rc1 LF=' ' -- cgit v1.3 From 5cb0d5ad05e027cbddcb0a3c7518ddeea0f7c286 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 25 Aug 2016 13:56:51 -0700 Subject: Prepare for 2.10.0-rc2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index 0ef70fd9b1..5586111045 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -179,7 +179,7 @@ Performance, Internal Implementation, Development Support etc. the standard output and the standard error of an external process, which is cumbersome to hand-roll correctly without deadlocking. - The codepath to sign data in a prepared buffer with GPG has been + * The codepath to sign data in a prepared buffer with GPG has been updated to use this API to read from the status-fd to check for errors (instead of relying on GPG's exit status). (merge efee955 jk/gpg-interface-cleanup later to maint). @@ -308,6 +308,10 @@ Performance, Internal Implementation, Development Support etc. * A handful of tests that were broken under gettext-poison build have been fixed. + * The recent i18n patch we added during this cycle did a bit too much + refactoring of the messages to avoid word-legos; the repetition has + been reduced to help translators. + Also contains various documentation updates and code clean-ups. @@ -563,7 +567,7 @@ notes for details). caused tests in t7063 to fail because it wanted to verify the behaviour of the fast-path. - * Squelch compiler warnings for netmalloc (in compat/) library. + * Squelch compiler warnings for nedmalloc (in compat/) library. * A small memory leak in the command line parsing of "git blame" has been plugged. @@ -631,6 +635,28 @@ notes for details). taught to notice these exit status codes. (merge 45a4f5d jk/difftool-command-not-found later to maint). + * On Windows, help.browser configuration variable used to be ignored, + which has been corrected. + (merge 6db5967 js/no-html-bypass-on-windows later to maint). + + * The "git -c var[=val] cmd" facility to append a configuration + variable definition at the end of the search order was described in + git(1) manual page, but not in git-config(1), which was more likely + place for people to look for when they ask "can I make a one-shot + override, and if so how?" + (merge ae1f709 dg/document-git-c-in-git-config-doc later to maint). + + * The tempfile (hence its user lockfile) API lets the caller to open + a file descriptor to a temporary file, write into it and then + finalize it by first closing the filehandle and then either + removing or renaming the temporary file. When the process spawns a + subprocess after obtaining the file descriptor, and if the + subprocess has not exited when the attempt to remove or rename is + made, the last step fails on Windows, because the subprocess has + the file descriptor still open. Open tempfile with O_CLOEXEC flag + to avoid this (on Windows, this is mapped to O_NOINHERIT). + (merge 05d1ed6 bw/mingw-avoid-inheriting-fd-to-lockfile later to maint). + * Other minor clean-ups and documentation updates (merge 02a8cfa rs/merge-add-strategies-simplification later to maint). (merge af4941d rs/merge-recursive-string-list-init later to maint). @@ -638,3 +664,4 @@ notes for details). (merge ddd0bfa jk/tighten-alloc later to maint). (merge ecf30b2 rs/mailinfo-lib later to maint). (merge 0eb75ce sg/reflog-past-root later to maint). + (merge 175d38c hv/doc-commit-reference-style later to maint). -- cgit v1.3 From d5cb9cbd64165153a318e1049f8bf14b09a16b11 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 26 Aug 2016 13:59:20 -0700 Subject: Git 2.10-rc2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 3 +++ GIT-VERSION-GEN | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index 5586111045..c110091580 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -252,6 +252,9 @@ Performance, Internal Implementation, Development Support etc. combination has been fixed to be equivalent to doing $ git config core.autocrlf true + * Documentation has been updated to show better example usage + of the updated "text=auto" attribute. + * A few tests that specifically target "git rebase -i" have been added. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 702c067a78..1ca5c0e366 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.10.0-rc1 +DEF_VER=v2.10.0-rc2 LF=' ' -- cgit v1.3 From 5b18e70009487bb156cac18546d6f91105338f4c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 31 Aug 2016 10:21:05 -0700 Subject: A few more fixes before the final 2.10 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.10.0.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Documentation/RelNotes') diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt index c110091580..f4da28ab66 100644 --- a/Documentation/RelNotes/2.10.0.txt +++ b/Documentation/RelNotes/2.10.0.txt @@ -77,7 +77,8 @@ UI, Workflows & Features * "git archive" learned to handle files that are larger than 8GB and commits far in the future than expressible by the traditional US-TAR format. - (merge 5caeeb8 jk/big-and-future-archive-tar later to maint). + (merge 560b0e8 jk/big-and-future-archive-tar later to maint). + * A new configuration variable core.sshCommand has been added to specify what value for GIT_SSH_COMMAND to use per repository. @@ -306,7 +307,7 @@ Performance, Internal Implementation, Development Support etc. changes and attempts to find matches. This has been optimized by lazily computing the full patch-id (which is expensive) to be compared only for changes that touch the same set of paths. - (merge b3dfeeb kw/patch-ids-optim later to maint). + (merge ba67504 kw/patch-ids-optim later to maint). * A handful of tests that were broken under gettext-poison build have been fixed. @@ -660,6 +661,10 @@ notes for details). to avoid this (on Windows, this is mapped to O_NOINHERIT). (merge 05d1ed6 bw/mingw-avoid-inheriting-fd-to-lockfile later to maint). + * Correct an age-old calco (is that a typo-like word for calc) + in the documentation. + (merge 7841c48 ls/packet-line-protocol-doc-fix later to maint). + * Other minor clean-ups and documentation updates (merge 02a8cfa rs/merge-add-strategies-simplification later to maint). (merge af4941d rs/merge-recursive-string-list-init later to maint). @@ -667,4 +672,4 @@ notes for details). (merge ddd0bfa jk/tighten-alloc later to maint). (merge ecf30b2 rs/mailinfo-lib later to maint). (merge 0eb75ce sg/reflog-past-root later to maint). - (merge 175d38c hv/doc-commit-reference-style later to maint). + (merge 4369523 hv/doc-commit-reference-style later to maint). -- cgit v1.3