1Git 2.9 Release Notes 2===================== 3 4Backward compatibility note 5--------------------------- 6 7The end-user facing Porcelain level commands in the "git diff" and 8"git log" by default enables the rename detection; you can still use 9"diff.renames" configuration variable to disable this. 10 11Merging two branches that have no common ancestor with "git merge" is 12by default forbidden now to prevent creating such an unusual merge by 13mistake. 14 15 16Updates since v2.8 17------------------ 18 19UI, Workflows & Features 20 21 * The end-user facing Porcelain level commands like "diff" and "log" 22 now enables the rename detection by default. 23 24 * The credential.helper configuration variable is cumulative and 25 there is no good way to override it from the command line. As 26 a special case, giving an empty string as its value now serves 27 as the signal to clear the values specified in various files. 28 29 * A new "interactive.diffFilter" configuration can be used to 30 customize the diff shown in "git add -i" session. 31 32 * "git p4" now allows P4 author names to be mapped to Git author 33 names. 34 35 * "git rebase -x" can be used without passing "-i" option. 36 37 * "git -c credential.<var>=<value> submodule" can now be used to 38 propagate configuration variables related to credential helper 39 down to the submodules. 40 41 * "git tag" can create an annotated tag without explicitly given an 42 "-a" (or "-s") option (i.e. when a tag message is given). A new 43 configuration variable, tag.forceSignAnnotated, can be used to tell 44 the command to create signed tag in such a situation. 45 46 * "git merge" used to allow merging two branches that have no common 47 base by default, which led to a brand new history of an existing 48 project created and then get pulled by an unsuspecting maintainer, 49 which allowed an unnecessary parallel history merged into the 50 existing project. The command has been taught not to allow this by 51 default, with an escape hatch "--allow-unrelated-histories" option 52 to be used in a rare event that merges histories of two projects 53 that started their lives independently. 54 (merge e379fdf jc/merge-refuse-new-root later to maint). 55 56 * "git apply -v" learned to report paths in the patch that were 57 skipped via --include/--exclude mechanism or being outside the 58 current working directory. 59 (merge 3f57944 nd/apply-report-skip later to maint). 60 61 62Performance, Internal Implementation, Development Support etc. 63 64 * The embedded args argv-array in the child process is used to build 65 the command line to run pack-objects instead of using a separate 66 array of strings. 67 (merge 65a3629 mp/upload-pack-use-embedded-args later to maint). 68 69 * A test for tags has been restructured so that more parts of it can 70 easily be run on a platform without a working GnuPG. 71 72 * The startup_info data, which records if we are working inside a 73 repository (among other things), are now uniformly available to Git 74 subcommand implementations, and Git avoids attempting to touch 75 references when we are not in a repository. 76 (merge 11e6b3f jk/startup-info later to maint). 77 78 * The command line argument parser for "receive-pack" has been 79 rewritten to use parse-options. 80 81 * A major part of "git submodule update" has been ported to C to take 82 advantage of the recently added framework to run download tasks in 83 parallel. 84 85 * Rename bunch of tests on "git clone" for better organization. 86 (merge 8fbb03a sb/clone-t57-t56 later to maint). 87 88 * The tests that involve running httpd leaked the system-wide 89 configuration in /etc/gitconfig to the tested environment. 90 (merge 1fad503 jk/test-httpd-config-nosystem later to maint). 91 92 * Build updates for MSVC. 93 (merge 0ef60af ss/msvc later to maint). 94 95Also contains various documentation updates and code clean-ups. 96 97 98Fixes since v2.8 99---------------- 100 101Unless otherwise noted, all the fixes since v2.8 in the maintenance 102track are contained in this release (see the maintenance releases' 103notes for details). 104 105 * "git config --get-urlmatch", unlike other variants of the "git 106 config --get" family, did not signal error with its exit status 107 when there was no matching configuration. 108 (merge 24990b2 jk/config-get-urlmatch later to maint). 109 110 * The "--local-env-vars" and "--resolve-git-dir" options of "git 111 rev-parse" failed to work outside a repository when the command's 112 option parsing was rewritten in 1.8.5 era. 113 (merge fc7d47f jk/rev-parse-local-env-vars later to maint). 114 115 * "git index-pack --keep[=<msg>] pack-$name.pack" simply did not work. 116 (merge 0e94242 jc/maint-index-pack-keep later to maint). 117 118 * Fetching of history by naming a commit object name directly didn't 119 work across remote-curl transport. 120 (merge 754ecb1 gf/fetch-pack-direct-object-fetch later to maint). 121 122 * A small memory leak in an error codepath has been plugged in xdiff 123 code. 124 (merge 87f1625 rj/xdiff-prepare-plug-leak-on-error-codepath later to maint). 125 126 * strbuf_getwholeline() did not NUL-terminate the buffer on certain 127 corner cases in its error codepath. 128 (merge b709043 jk/getwholeline-getdelim-empty later to maint). 129 130 * "git mergetool" did not work well with conflicts that both sides 131 deleted. 132 (merge a298604 da/mergetool-delete-delete-conflict later to maint). 133 134 * "git send-email" had trouble parsing alias file in mailrc format 135 when lines in it had trailing whitespaces on them. 136 (merge a277d1e jk/send-email-rtrim-mailrc-alias later to maint). 137 138 * When "git merge --squash" stopped due to conflict, the concluding 139 "git commit" failed to read in the SQUASH_MSG that shows the log 140 messages from all the squashed commits. 141 (merge b64c1e0 ss/commit-squash-msg later to maint). 142 143 * "git merge FETCH_HEAD" dereferenced NULL pointer when merging 144 nothing into an unborn history (which is arguably unusual usage, 145 which perhaps was the reason why nobody noticed it). 146 (merge b84e65d jv/merge-nothing-into-void later to maint). 147 148 * Other minor clean-ups and documentation updates 149 (merge aed7480 mm/lockfile-error-message later to maint). 150 (merge bfee614 jc/index-pack later to maint). 151 (merge f870899 ss/exc-flag-is-a-collection-of-bits later to maint). 152 (merge dde7891 pb/t7502-drop-dup later to maint). 153 (merge 3bd1b51 cc/doc-recommend-performance-trace-to-file later to maint). 154 (merge 7d5e9c9 jk/credential-cache-comment-exit later to maint). 155 (merge 16a86d4 nd/apply-doc later to maint). 156 (merge c3f6b85 pb/opt-cmdmode-doc later to maint). 157 (merge 30211fb oa/doc-diff-check later to maint).