]>
Commit | Line | Data |
---|---|---|
1e61b764 JH |
1 | GIT v1.5.4 Release Notes |
2 | ======================== | |
3 | ||
1c46ab1f JH |
4 | Removal |
5 | ------- | |
6 | ||
afc67036 JH |
7 | * "git svnimport" was removed in favor of "git svn". It is still there |
8 | in the source tree (contrib/examples) but unsupported. | |
1c46ab1f | 9 | |
7680087e JH |
10 | * As git-commit and git-status have been rewritten, "git runstatus" |
11 | helper script lost all its users and has been removed. | |
12 | ||
1c46ab1f | 13 | |
2221a675 JH |
14 | Deprecation notices |
15 | ------------------- | |
16 | ||
6a7f14c4 | 17 | * The next feature release of git (this change is scheduled for v1.6.0) |
74f6b03c JH |
18 | will by default install dashed form of commands (e.g. "git-commit") |
19 | outside of users' normal $PATH, and will install only selected | |
20 | commands ("git" itself, and "gitk") in $PATH. This implies: | |
2221a675 | 21 | |
6a7f14c4 | 22 | - Using dashed forms of git commands (e.g. "git-commit") from the |
2221a675 JH |
23 | command line has been informally deprecated since early 2006, but |
24 | now it officially is, and will be removed in the future. Use | |
6a7f14c4 | 25 | dashless forms (e.g. "git commit") instead. |
2221a675 | 26 | |
6a7f14c4 | 27 | - Using dashed forms from your scripts, without first prepending the |
2221a675 JH |
28 | return value from "git --exec-path" to the scripts' PATH, has been |
29 | informally deprecated since early 2006, but now it officially is. | |
30 | ||
6a7f14c4 | 31 | - Use of dashed forms with "PATH=$(git --exec-path):$PATH; export |
2221a675 JH |
32 | PATH" early in your script is not deprecated with this change. |
33 | ||
34 | Users are strongly encouraged to adjust their habits and scripts now | |
35 | to prepare for this. | |
36 | ||
37 | * The post-receive hook was introduced in March 2007 to supersede | |
6a7f14c4 | 38 | the post-update hook, primarily to overcome the command line length |
2221a675 | 39 | limitation of the latter. Use of post-update hook will be deprecated |
74f6b03c | 40 | in future versions of git, starting from v1.6.0. |
2221a675 | 41 | |
1c46ab1f JH |
42 | * "git lost-found" was deprecated in favor of "git fsck"'s --lost-found |
43 | option, and will be removed in the future. | |
44 | ||
45 | * "git peek-remote" is deprecated, as "git ls-remote" was written in C | |
6a7f14c4 JK |
46 | and works for all transports; "git peek-remote" will be removed in |
47 | the future. | |
1c46ab1f | 48 | |
5c66d0d4 JH |
49 | * "git repo-config" which was an old name for "git config" command |
50 | has been supported without being advertised for a long time. The | |
51 | next feature release will remove it. | |
52 | ||
74f6b03c | 53 | * From v1.6.0, the repack.usedeltabaseoffset config option will default |
6a7f14c4 | 54 | to true, which will give denser packfiles (i.e. more efficient storage). |
792c1583 NP |
55 | The downside is that git older than version 1.4.4 will not be able |
56 | to directly use a repository packed using this setting. | |
57 | ||
74f6b03c | 58 | * From v1.6.0, the pack.indexversion config option will default to 2, |
792c1583 NP |
59 | which is slightly more efficient, and makes repacking more immune to |
60 | data corruptions. Git older than version 1.5.2 may revert to version 1 | |
61 | of the pack index with a manual "git index-pack" to be able to directly | |
62 | access corresponding pack files. | |
63 | ||
2221a675 | 64 | |
1e61b764 JH |
65 | Updates since v1.5.3 |
66 | -------------------- | |
67 | ||
145d0824 | 68 | * Comes with much improved gitk, with i18n. |
79f3368d | 69 | |
afc67036 JH |
70 | * Comes with "git gui" 0.9.1 with i18n. |
71 | ||
72 | * gitk is now merged as a subdirectory of git.git project, in | |
73 | preparation for its i18n. | |
92b7ba16 | 74 | |
6a7f14c4 | 75 | * progress displays from many commands are a lot nicer to the eye. |
1c46ab1f | 76 | Transfer commands show throughput data. |
92b7ba16 | 77 | |
1c46ab1f JH |
78 | * many commands that pay attention to per-directory .gitignore now do |
79 | so lazily, which makes the usual case go much faster. | |
92b7ba16 | 80 | |
1c46ab1f JH |
81 | * Output processing for '--pretty=format:<user format>' has been |
82 | optimized. | |
2221a675 | 83 | |
6a7f14c4 | 84 | * Rename detection of diff family while detecting exact matches has |
1c46ab1f | 85 | been greatly optimized. |
c238dad4 | 86 | |
6a7f14c4 JK |
87 | * Rename detection of diff family tries to make more natural looking |
88 | pairing. Earlier, if multiple identical rename sources were | |
89 | found in the preimage, the source used was picked pretty much at random. | |
2221a675 | 90 | |
afc67036 JH |
91 | * Value "true" for color.diff and color.status configuration used to |
92 | mean "always" (even when the output is not going to a terminal). | |
93 | This has been corrected to mean the same thing as "auto". | |
94 | ||
74f6b03c JH |
95 | * "git diff" Porcelain now respects diff.external configuration, which |
96 | is another way to specify GIT_EXTERNAL_DIFF. | |
97 | ||
bbff2dce JH |
98 | * "git diff" can be told to use different prefixes other than |
99 | "a/" and "b/" e.g. "git diff --src-prefix=l/ --dst-prefix=k/". | |
100 | ||
101 | * "git diff" sometimes did not quote paths with funny | |
102 | characters properly. | |
103 | ||
104 | * "git log" (and any revision traversal commands) misbehaved | |
105 | when --diff-filter is given but was not asked to actually | |
106 | produce diff. | |
107 | ||
afc67036 JH |
108 | * HTTP proxy can be specified per remote repository using |
109 | remote.*.httpproxy configuration, or global http.proxy configuration | |
110 | variable. | |
111 | ||
112 | * Various Perforce importer updates. | |
113 | ||
114 | * Example update and post-receive hooks have been improved. | |
115 | ||
116 | * Any command that wants to take a commit object name can now use | |
117 | ":/string" syntax to name a commit. | |
118 | ||
1c46ab1f | 119 | * "git reset" is now built-in and its output can be squelched with -q. |
1e61b764 | 120 | |
d6da3cde JH |
121 | * "git reset --hard" does not make any sense in a bare |
122 | repository, but did not error out; fixed. | |
123 | ||
1c46ab1f | 124 | * "git send-email" can optionally talk over ssmtp and use SMTP-AUTH. |
bc12651b | 125 | |
1c46ab1f | 126 | * "git rebase" learned --whitespace option. |
bc12651b | 127 | |
1c46ab1f JH |
128 | * In "git rebase", when you decide not to replay a particular change |
129 | after the command stopped with a conflict, you can say "git rebase | |
92b7ba16 | 130 | --skip" without first running "git reset --hard", as the command now |
e0fda6ab | 131 | runs it for you. |
92b7ba16 | 132 | |
afc67036 JH |
133 | * "git rebase --interactive" mode can now work on detached HEAD. |
134 | ||
6a7f14c4 | 135 | * Other minor to serious bugs in "git rebase -i" have been fixed. |
74f6b03c | 136 | |
afc67036 JH |
137 | * "git rebase" now detaches head during its operation, so after a |
138 | successful "git rebase" operation, the reflog entry branch@{1} for | |
139 | the current branch points at the commit before the rebase was | |
140 | started. | |
141 | ||
142 | * "git rebase -i" also triggers rerere to help your repeated merges. | |
143 | ||
1c46ab1f | 144 | * "git merge" can call the "post-merge" hook. |
bc12651b | 145 | |
1c46ab1f JH |
146 | * "git pack-objects" can optionally run deltification with multiple |
147 | threads. | |
bc12651b | 148 | |
1c46ab1f | 149 | * "git archive" can optionally substitute keywords in files marked with |
bc12651b JH |
150 | export-subst attribute. |
151 | ||
1c46ab1f JH |
152 | * "git cherry-pick" made a misguided attempt to repeat the original |
153 | command line in the generated log message, when told to cherry-pick a | |
154 | commit by naming a tag that points at it. It does not anymore. | |
79f3368d | 155 | |
1c46ab1f JH |
156 | * "git for-each-ref" learned %(xxxdate:<dateformat>) syntax to show the |
157 | various date fields in different formats. | |
79f3368d | 158 | |
1c46ab1f JH |
159 | * "git gc --auto" is a low-impact way to automatically run a variant of |
160 | "git repack" that does not lose unreferenced objects (read: safer | |
161 | than the usual one) after the user accumulates too many loose | |
162 | objects. | |
dee1b1ea | 163 | |
afc67036 JH |
164 | * "git clean" has been rewritten in C. |
165 | ||
1c46ab1f JH |
166 | * You need to explicitly set clean.requireForce to "false" to allow |
167 | "git clean" without -f to do any damage (lack of the configuration | |
168 | variable used to mean "do not require -f option to lose untracked | |
169 | files", but we now use the safer default). | |
92b7ba16 | 170 | |
591aa253 JH |
171 | * The kinds of whitespace errors "git diff" and "git apply" notice (and |
172 | fix) can be controlled via 'core.whitespace' configuration variable | |
173 | and 'whitespace' attribute in .gitattributes file. | |
174 | ||
1c46ab1f JH |
175 | * "git push" learned --dry-run option to show what would happen if a |
176 | push is run. | |
79f3368d | 177 | |
1c46ab1f | 178 | * "git push" does not update a tracking ref on the local side when the |
92b7ba16 JH |
179 | remote refused to update the corresponding ref. |
180 | ||
1c46ab1f | 181 | * "git push" learned --mirror option. This is to push the local refs |
92b7ba16 JH |
182 | one-to-one to the remote, and deletes refs from the remote that do |
183 | not exist anymore in the repository on the pushing side. | |
184 | ||
afc67036 JH |
185 | * "git push" can remove a corrupt ref at the remote site with the usual |
186 | ":ref" refspec. | |
187 | ||
1c46ab1f JH |
188 | * "git remote" knows --mirror mode. This is to set up configuration to |
189 | push into a remote repository to store local branch heads to the same | |
190 | branch on the remote side, and remove branch heads locally removed | |
191 | from local repository at the same time. Suitable for pushing into a | |
192 | back-up repository. | |
193 | ||
194 | * "git remote" learned "rm" subcommand. | |
79f3368d | 195 | |
cdd85915 JS |
196 | * "git cvsserver" can be run via "git shell". Also, "cvs" is |
197 | recognized as a synonym for "git cvsserver", so that CVS users | |
198 | can be switched to git just by changing their login shell. | |
79f3368d | 199 | |
9758ecde JH |
200 | * "git cvsserver" acts more like receive-pack by running post-receive |
201 | and post-update hooks. | |
202 | ||
1c46ab1f | 203 | * "git am" and "git rebase" are far less verbose. |
79f3368d | 204 | |
1c46ab1f JH |
205 | * "git pull" learned to pass --[no-]ff option to underlying "git |
206 | merge". | |
79f3368d | 207 | |
afc67036 JH |
208 | * "git pull --rebase" is a different way to integrate what you fetched |
209 | into your current branch. | |
210 | ||
211 | * "git fast-export" produces datastream that can be fed to fast-import | |
212 | to reproduce the history recorded in a git repository. | |
213 | ||
9758ecde JH |
214 | * "git add -i" takes pathspecs to limit the set of files to work on. |
215 | ||
216 | * "git add -p" is a short-hand to go directly to the selective patch | |
217 | subcommand in the interactive command loop and to exit when done. | |
218 | ||
b2e62a7d JH |
219 | * "git add -i" UI has been colorized. The interactive prompt |
220 | and menu can be colored by setting color.interactive | |
221 | configuration. The diff output (including the hunk picker) | |
222 | are colored with color.diff configuration. | |
9758ecde | 223 | |
afc67036 JH |
224 | * "git commit --allow-empty" allows you to create a single-parent |
225 | commit that records the same tree as its parent, overriding the usual | |
226 | safety valve. | |
227 | ||
228 | * "git commit --amend" can amend a merge that does not change the tree | |
229 | from its first parent. | |
230 | ||
bbff2dce JH |
231 | * "git commit" used to unconditionally strip comment lines that |
232 | began with '#' and removed excess blank lines. This | |
233 | behaviour has been made configurable. | |
234 | ||
9758ecde JH |
235 | * "git commit" has been rewritten in C. |
236 | ||
afc67036 JH |
237 | * "git stash random-text" does not create a new stash anymore. It was |
238 | a UI mistake. Use "git stash save random-text", or "git stash" | |
239 | (without extra args) for that. | |
240 | ||
b2e62a7d JH |
241 | * "git stash clear extra-text" does not clear the whole stash |
242 | anymore. It is tempting to expect "git stash clear stash@{2}" | |
243 | to drop only a single named stash entry, and it is rude to | |
244 | discard everything when that is asked (but not provided). | |
245 | ||
afc67036 JH |
246 | * "git prune --expire <time>" can exempt young loose objects from |
247 | getting pruned. | |
248 | ||
249 | * "git branch --contains <commit>" can list branches that are | |
250 | descendants of a given commit. | |
1e61b764 | 251 | |
1c46ab1f JH |
252 | * "git log" learned --early-output option to help interactive GUI |
253 | implementations. | |
ea559605 | 254 | |
1c46ab1f | 255 | * "git bisect" learned "skip" action to mark untestable commits. |
c238dad4 | 256 | |
591aa253 JH |
257 | * "git bisect visualize" learned a shorter synonym "git bisect view". |
258 | ||
259 | * "git bisect visualize" runs "git log" in a non-windowed | |
260 | environments. It also can be told what command to run (e.g. "git | |
261 | bisect visualize tig"). | |
262 | ||
1c46ab1f JH |
263 | * "git format-patch" learned "format.numbered" configuration variable |
264 | to automatically turn --numbered option on when more than one commits | |
265 | are formatted. | |
c238dad4 | 266 | |
1c46ab1f JH |
267 | * "git ls-files" learned "--exclude-standard" to use the canned set of |
268 | exclude files. | |
dee1b1ea | 269 | |
1c46ab1f JH |
270 | * "git tag -a -f existing" begins the editor session using the existing |
271 | annotation message. | |
dee1b1ea | 272 | |
1c46ab1f JH |
273 | * "git tag -m one -m bar" (multiple -m options) behaves similarly to |
274 | "git commit"; the parameters to -m options are formatted as separate | |
275 | paragraphs. | |
dee1b1ea | 276 | |
74f6b03c JH |
277 | * The format "git show" outputs an annotated tag has been updated to |
278 | include "Tagger: " and "Date: " lines from the tag itself. Strictly | |
279 | speaking this is a backward incompatible change, but this is a | |
6a7f14c4 | 280 | reasonable usability fix and people's scripts shouldn't have been |
74f6b03c JH |
281 | relying on the exact output from "git show" Porcelain anyway. |
282 | ||
bbff2dce JH |
283 | * "git cvsimport" did not notice errors from underlying "cvsps" |
284 | and produced a corrupt import silently. | |
285 | ||
1c46ab1f JH |
286 | * "git cvsexportcommit" learned -w option to specify and switch to the |
287 | CVS working directory. | |
dee1b1ea | 288 | |
1c46ab1f JH |
289 | * "git checkout" from a subdirectory learned to use "../path" to allow |
290 | checking out a path outside the current directory without cd'ing up. | |
ea559605 | 291 | |
591aa253 JH |
292 | * "git checkout" from and to detached HEAD leaves a bit more |
293 | information in the reflog. | |
294 | ||
1c46ab1f | 295 | * "git send-email --dry-run" shows full headers for easier diagnosis. |
92b7ba16 | 296 | |
1c46ab1f | 297 | * "git merge-ours" is now built-in. |
92b7ba16 | 298 | |
2221a675 JH |
299 | * "git svn" learned "info" and "show-externals" subcommands. |
300 | ||
1c46ab1f | 301 | * "git svn" run from a subdirectory failed to read settings from the |
2221a675 JH |
302 | .git/config. |
303 | ||
304 | * "git svn" learned --use-log-author option, which picks up more | |
305 | descriptive name from From: and Signed-off-by: lines in the commit | |
306 | message. | |
92b7ba16 | 307 | |
1e8df762 JH |
308 | * "git svn" wasted way too much disk to record revision mappings |
309 | between svn and git; a new representation that is much more compact | |
310 | for this information has been introduced to correct this. | |
311 | ||
7680087e JH |
312 | * "git svn" left temporary index files it used without cleaning them |
313 | up; this was corrected. | |
314 | ||
591aa253 JH |
315 | * "git status" from a subdirectory now shows relative paths, which |
316 | makes copy-and-pasting for git-checkout/git-add/git-rm easier. The | |
317 | traditional behaviour to show the full path relative to the top of | |
318 | the work tree can be had by setting status.relativepaths | |
6a7f14c4 | 319 | configuration variable to false. |
2221a675 | 320 | |
1e8df762 JH |
321 | * "git blame" kept text for each annotated revision in core needlessly; |
322 | this has been corrected. | |
323 | ||
324 | * "git shortlog" learned to default to HEAD when the standard input is | |
325 | a terminal and the user did not give any revision parameter. | |
326 | ||
327 | * "git shortlog" learned "-e" option to show e-mail addresses as well as | |
328 | authors' names. | |
329 | ||
330 | * "git help" learned "-w" option to show documentation in browsers. | |
331 | ||
c238dad4 JH |
332 | * In addition there are quite a few internal clean-ups. Notably |
333 | ||
334 | - many fork/exec have been replaced with run-command API, | |
335 | brought from the msysgit effort. | |
336 | ||
337 | - introduction and more use of the option parser API. | |
338 | ||
339 | - enhancement and more use of the strbuf API. | |
340 | ||
341 | ||
1e61b764 JH |
342 | Fixes since v1.5.3 |
343 | ------------------ | |
344 | ||
345 | All of the fixes in v1.5.3 maintenance series are included in | |
346 | this release, unless otherwise noted. | |
347 | ||
1c46ab1f JH |
348 | These fixes are only in v1.5.4 and not backported to v1.5.3 maintenance |
349 | series. | |
dee1b1ea | 350 | |
7680087e JH |
351 | * The way "git diff --check" behaves is much more consistent with the way |
352 | "git apply --whitespace=warn" works. | |
353 | ||
1c46ab1f JH |
354 | * "git svn" talking with the SVN over http will correctly quote branch |
355 | and project names. | |
ea559605 | 356 | |
9758ecde JH |
357 | * "git config" did not work correctly on platforms that define |
358 | REG_NOMATCH to an even number. | |
359 | ||
b2e62a7d JH |
360 | * Recent versions of AsciiDoc 8 has a change to break our |
361 | documentation; a workaround has been implemented. | |
362 | ||
bc12651b JH |
363 | -- |
364 | exec >/var/tmp/1 | |
145d0824 | 365 | O=v1.5.4-rc3 |
bc12651b JH |
366 | echo O=`git describe refs/heads/master` |
367 | git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint |