4 Backward compatibility notes
5 ----------------------------
7 When "git push [$there]" does not say what to push, we have used the
8 traditional "matching" semantics so far (all your branches were sent
9 to the remote as long as there already are branches of the same name
10 over there). In Git 2.0, the default is now the "simple" semantics,
13 - only the current branch to the branch with the same name, and only
14 when the current branch is set to integrate with that remote
15 branch, if you are pushing to the same remote as you fetch from; or
17 - only the current branch to the branch with the same name, if you
18 are pushing to a remote that is not where you usually fetch from.
20 You can use the configuration variable "push.default" to change
21 this. If you are an old-timer who wants to keep using the
22 "matching" semantics, you can set the variable to "matching", for
23 example. Read the documentation for other possibilities.
25 When "git add -u" and "git add -A" are run inside a subdirectory
26 without specifying which paths to add on the command line, they
27 operate on the entire tree for consistency with "git commit -a" and
28 other commands (these commands used to operate only on the current
29 subdirectory). Say "git add -u ." or "git add -A ." if you want to
30 limit the operation to the current directory.
32 "git add <path>" is the same as "git add -A <path>" now, so that
33 "git add dir/" will notice paths you removed from the directory and
34 record the removal. In older versions of Git, "git add <path>" used
35 to ignore removals. You can say "git add --ignore-removal <path>" to
36 add only added or modified paths in <path>, if you really want to.
38 The "-q" option to "git diff-files", which does *NOT* mean "quiet",
39 has been removed (it told Git to ignore deletion, which you can do
40 with "git diff-files --diff-filter=d").
42 "git request-pull" lost a few "heuristics" that often led to mistakes.
45 Updates since v1.9 series
46 -------------------------
48 UI, Workflows & Features
50 * The "rev-parse --parseopt" mechanism used by scripted Porcelains to
51 parse command line options and to give help text learned to take
52 the argv-help (the placeholder string for an option parameter,
53 e.g. "key-id" in "--gpg-sign=<key-id>").
55 * The pattern to find where the function begins in C/C++ used in
56 "diff" and "grep -p" have been updated to help C++ source better.
58 * "git rebase" learned to interpret a lone "-" as "@{-1}", the
59 branch that we were previously on.
61 * "git commit --cleanup=<mode>" learned a new mode, scissors.
63 * "git tag --list" output can be sorted using "version sort" with
64 "--sort=version:refname".
66 * Discard the accumulated "heuristics" to guess from which branch the
67 result wants to be pulled from and make sure what the end user
68 specified is not second-guessed by "git request-pull", to avoid
69 mistakes. When you pushed out your 'master' branch to your public
70 repository as 'for-linus', use the new "master:for-linus" syntax to
71 denote the branch to be pulled.
73 * "git grep" learned to behave in a way similar to native grep when
74 "-h" (no header) and "-c" (count) options are given.
76 * transport-helper, fast-import and fast-export have been updated to
77 allow the ref mapping and ref deletion in a way similar to the
78 natively supported transports.
80 * The "simple" mode is the default for "git push".
82 * "git add -u" and "git add -A", when run without any pathspec, is a
83 tree-wide operation even when run inside a subdirectory of a
86 * "git add <path> is the same as "git add -A <path>" now.
88 * "core.statinfo" configuration variable, which is a
89 never-advertised synonym to "core.checkstat", has been removed.
91 * The "-q" option to "git diff-files", which does *NOT* mean
92 "quiet", has been removed (it told Git to ignore deletion, which
93 you can do with "git diff-files --diff-filter=d").
95 * Server operators can loosen the "tips of refs only" restriction for
96 the remote archive service with the uploadarchive.allowUnreachable
99 * The progress indicators from various time-consuming commands have
100 been marked for i18n/l10n.
102 * "git notes -C <blob>" diagnoses an attempt to use an object that
103 is not a blob as an error.
105 * "git config" learned to read from the standard input when "-" is
106 given as the value to its "--file" parameter (attempting an
107 operation to update the configuration in the standard input of
110 * Trailing whitespaces in .gitignore files, unless they are quoted
111 for fnmatch(3), e.g. "path\ ", are warned and ignored. Strictly
112 speaking, this is a backward incompatible change, but very unlikely
113 to bite any sane user and adjusting should be obvious and easy.
115 * Many commands that create commits, e.g. "pull", "rebase",
116 learned to take the --gpg-sign option on the command line.
118 * "git commit" can be told to always GPG sign the resulting commit
119 by setting "commit.gpgsign" configuration variable to true (the
120 command line option --no-gpg-sign should override it).
122 * "git pull" can be told to only accept fast-forward by setting the
123 new "pull.ff" configuration.
125 * "git reset" learned "-N" option, which does not reset the index
126 fully for paths the index knows about but the tree-ish the command
127 resets to does not (these paths are kept as intend-to-add entries).
130 Performance, Internal Implementation, etc.
132 * We started using wildmatch() in place of fnmatch(3) a few releases
133 ago; complete the process and stop using fnmatch(3).
135 * Uses of curl's "multi" interface and "easy" interface do not mix
136 well when we attempt to reuse outgoing connections. Teach the RPC
137 over http code, used in the smart HTTP transport, not to use the
140 * The bitmap-index feature from JGit has been ported, which should
141 significantly improve performance when serving objects form a
142 repository that uses it.
144 * The way "git log --cc" shows a combined diff against multiple
145 parents have been optimized.
147 * The prefixcmp() and suffixcmp() functions are gone. Use
148 starts_with() and ends_with(), and also consider if skip_prefix()
149 suits your needs better when using the former.
152 Also contains various documentation updates and code clean-ups. Many
153 of them came from flurry of activities as GSoC candidate microproject
157 Fixes since v1.9 series
158 -----------------------
160 Unless otherwise noted, all the fixes since v1.9 in the maintenance
161 track are contained in this release (see the maintenance releases'
164 * "git status --porcelain --branch" showed its output with labels
165 "ahead/behind/gone" translated to the user's locale.
166 (merge 7a76c28 mm/status-porcelain-format-i18n-fix later to maint).
169 * "git repack" died when asked to (re)pack with the reachability
170 bitmap when a bitmap cannot be built; instead, just (re)pack
171 without producing a bitmap in such a case, with a warning.
172 (merge 373c67d jk/pack-bitmap later to maint).
175 * The progress output while repacking and transferring objects showed
176 an apparent large silence while writing the objects out of existing
177 packfiles, when the reachability bitmap was in use.
178 (merge 78d2214 jk/pack-bitmap-progress later to maint).
181 * A stray environment variable $prefix could have leaked into and
182 affected the behaviour of the "subtree" script (in contrib/).
185 * When it is not necessary to edit a commit log message (e.g. "git
186 commit -m" is given a message without specifying "-e"), we used to
187 disable the spawning of the editor by overriding GIT_EDITOR, but
188 this means all the uses of the editor, other than to edit the
189 commit log message, are also affected.
190 (merge b549be0 bp/commit-p-editor later to maint).
193 * "git mv" that moves a submodule forgot to adjust the array that
194 uses to keep track of which submodules were to be moved to update
196 (merge fb8a4e8 jk/mv-submodules-fix later to maint).
198 * Length limit for the pathname used when removing a path in a deep
199 subdirectory has been removed to avoid buffer overflows.
200 (merge 2f29e0c mh/remove-subtree-long-pathname-fix later to maint).
202 * The test helper lib-terminal always run an actual test_expect_*
203 when included, which screwed up with the use of skil-all that may
204 have to be done later.
205 (merge 7e27173 jk/lib-terminal-lazy later to maint).
207 * "git index-pack" used a wrong variable to name the keep-file in an
208 error message when the file cannot be written or closed.
209 (merge de983a0 nd/index-pack-error-message later to maint).
211 * "rebase -i" produced a broken insn sheet when the title of a commit
212 happened to contain '\n' (or ended with '\c') due to a careless use
214 (merge cb1aefd us/printf-not-echo later to maint).
216 * There were a few instances of 'git-foo' remaining in the
217 documentation that should have been spelled 'git foo'.
218 (merge 3c3e6f5 rr/doc-merge-strategies later to maint).
220 * Serving objects from a shallow repository needs to write a
221 new file to hold the temporary shallow boundaries but it was not
222 cleaned when we exit due to die() or a signal.
223 (merge 7839632 jk/shallow-update-fix later to maint).
225 * When "git stash pop" stops after failing to apply the stash
226 (e.g. due to conflicting changes), the stash is not dropped. State
227 that explicitly in the output to let the users know.
228 (merge 2d4c993 jc/stash-pop-not-popped later to maint).
230 * The labels in "git status" output that describe the nature of
231 conflicts (e.g. "both deleted") were limited to 20 bytes, which was
232 too short for some l10n (e.g. fr).
233 (merge c7cb333 jn/wt-status later to maint).
235 * "git clean -d pathspec" did not use the given pathspec correctly
236 and ended up cleaning too much.
237 (merge 1f2e108 jk/clean-d-pathspec later to maint).
239 * "git difftool" misbehaved when the repository is bound to the
240 working tree with the ".git file" mechanism, where a textual file
241 ".git" tells us where it is.
242 (merge fcfec8b da/difftool-git-files later to maint).
244 * "git push" did not pay attention to branch.*.pushremote if it is
245 defined earlier than remote.pushdefault; the order of these two
246 variables in the configuration file should not matter, but it did
248 (merge 98b406f jk/remote-pushremote-config-reading later to maint).
250 * Codepaths that parse timestamps in commit objects have been
252 (merge 3f419d4 jk/commit-dates-parsing-fix later to maint).
254 * "git diff --external-diff" incorrectly fed the submodule directory
255 in the working tree to the external diff driver when it knew it is
256 the same as one of the versions being compared.
257 (merge aba4727 tr/diff-submodule-no-reuse-worktree later to maint).
259 * "git reset" needs to refresh the index when working in a working
260 tree (it can also be used to match the index to the HEAD in an
261 otherwise bare repository), but it failed to set up the working
262 tree properly, causing GIT_WORK_TREE to be ignored.
263 (merge b7756d4 nd/reset-setup-worktree later to maint).
265 * "git check-attr" when working on a repository with a working tree
266 did not work well when the working tree was specified via the
267 --work-tree (and obviously with --git-dir) option.
268 (merge cdbf623 jc/check-attr-honor-working-tree later to maint).
270 * "merge-recursive" was broken in 1.7.7 era and stopped working in
271 an empty (temporary) working tree, when there are renames
272 involved. This has been corrected.
273 (merge 6e2068a bk/refresh-missing-ok-in-merge-recursive later to maint.)
275 * "git rev-parse" was loose in rejecting command line arguments
276 that do not make sense, e.g. "--default" without the required
277 value for that option.
278 (merge a43219f ds/rev-parse-required-args later to maint.)
280 * include.path variable (or any variable that expects a path that
281 can use ~username expansion) in the configuration file is not a
282 boolean, but the code failed to check it.
283 (merge 67beb60 jk/config-path-include-fix later to maint.)
285 * Commands that take pathspecs on the command line misbehaved when
286 the pathspec is given as an absolute pathname (which is a
287 practice not particularly encouraged) that points at a symbolic
288 link in the working tree.
289 (merge later 655ee9e mw/symlinks to maint.)
291 * "git diff --quiet -- pathspec1 pathspec2" sometimes did not return
292 correct status value.
293 (merge f34b205 nd/diff-quiet-stat-dirty later to maint.)
295 * Attempting to deepen a shallow repository by fetching over smart
296 HTTP transport failed in the protocol exchange, when no-done
297 extension was used. The fetching side waited for the list of
298 shallow boundary commits after the sending end stopped talking to
300 (merge 0232852 nd/http-fetch-shallow-fix later to maint.)
302 * Allow "git cmd path/", when the 'path' is where a submodule is
303 bound to the top-level working tree, to match 'path', despite the
304 extra and unnecessary trailing slash (such a slash is often
305 given by command line completion).
306 (merge 2e70c01 nd/submodule-pathspec-ending-with-slash later to maint.)