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