Git 1.7.10-rc1
[git/git.git] / Documentation / RelNotes / 1.7.10.txt
1 Git v1.7.10 Release Notes
2 =========================
3
4 Compatibility Notes
5 -------------------
6
7 * From this release on, the "git merge" command in an interactive
8 session will start an editor when it automatically resolves the
9 merge for the user to explain the resulting commit, just like the
10 "git commit" command does when it wasn't given a commit message.
11
12 If you have a script that runs "git merge" and keeps its standard
13 input and output attached to the user's terminal, and if you do not
14 want the user to explain the resulting merge commits, you can
15 export GIT_MERGE_AUTOEDIT environment variable set to "no", like
16 this:
17
18 #!/bin/sh
19 GIT_MERGE_AUTOEDIT=no
20 export GIT_MERGE_AUTOEDIT
21
22 to disable this behaviour (if you want your users to explain their
23 merge commits, you do not have to do anything). Alternatively, you
24 can give the "--no-edit" option to individual invocations of the
25 "git merge" command if you know everybody who uses your script has
26 Git v1.7.8 or newer.
27
28 * The "--binary/-b" options to "git am" have been a no-op for quite a
29 while and were deprecated in mid 2008 (v1.6.0). When you give these
30 options to "git am", it will now warn and ask you not to use them.
31
32
33 Updates since v1.7.9
34 --------------------
35
36 UI, Workflows & Features
37
38 * Teams for localizing the messages from the Porcelain layer of
39 commands are starting to form, thanks to Jiang Xin who volunteered
40 to be the localization coordinator. An initial set of translated
41 messages for simplified chinese is available.
42
43 * The configuration mechanism learned an "include" facility; an
44 assignment to the include.path pseudo-variable causes the named
45 file to be included in-place when Git looks up configuration
46 variables.
47
48 * A content filter (clean/smudge) used to be just a way to make the
49 recorded contents "more useful", and allowed to fail; a filter can
50 now optionally be marked as "required".
51
52 * Options whose names begin with "--no-" (e.g. the "--no-verify"
53 option of the "git commit" command) can be negated by omitting
54 "no-" from its name, e.g. "git commit --verify".
55
56 * "git am" learned to pass "-b" option to underlying "git mailinfo", so
57 that a bracketed string other than "PATCH" at the beginning can be kept.
58
59 * "git clone" learned "--single-branch" option to limit cloning to a
60 single branch (surprise!); tags that do not point into the history
61 of the branch are not fetched.
62
63 * "git clone" learned to detach the HEAD in the resulting repository
64 when the user specifies a tag with "--branch" (e.g., "--branch=v1.0").
65 Clone also learned to print the usual "detached HEAD" advice in such
66 a case, similar to "git checkout v1.0".
67
68 * When showing a patch while ignoring whitespace changes, the context
69 lines are taken from the postimage, in order to make it easier to
70 view the output.
71
72 * "git diff --stat" learned to adjust the width of the output on
73 wider terminals, and give more columns to pathnames as needed.
74
75 * "diff-highlight" filter (in contrib/) was updated to produce more
76 aesthetically pleasing output.
77
78 * "fsck" learned "--no-dangling" option to omit dangling object
79 information.
80
81 * "git log -G" and "git log -S" learned to pay attention to the "-i"
82 option. With "-i", "log -G" ignores the case when finding patch
83 hunks that introduce or remove a string that matches the given
84 pattern. Similarly with "-i", "log -S" ignores the case when
85 finding the commit the given block of text appears or disappears
86 from the file.
87
88 * "git merge" in an interactive session learned to spawn the editor
89 by default to let the user edit the auto-generated merge message,
90 to encourage people to explain their merges better. Legacy scripts
91 can export GIT_MERGE_AUTOEDIT=no to retain the historical behavior.
92 Both "git merge" and "git pull" can be given --no-edit from the
93 command line to accept the auto-generated merge message.
94
95 * The advice message given when the user didn't give enough clue on
96 what to merge to "git pull" and "git merge" has been updated to
97 be more concise and easier to understand.
98
99 * "git push" learned the "--prune" option, similar to "git fetch".
100
101 * The whole directory that houses a top-level superproject managed by
102 "git submodule" can be moved to another place.
103
104 * "git symbolic-ref" learned the "--short" option to abbreviate the
105 refname it shows unambiguously.
106
107 * "git tag --list" can be given "--points-at <object>" to limit its
108 output to those that point at the given object.
109
110 * "gitweb" allows intermediate entries in the directory hierarchy
111 that leads to a project to be clicked, which in turn shows the
112 list of projects inside that directory.
113
114 * "gitweb" learned to read various pieces of information for the
115 repositories lazily, instead of reading everything that could be
116 needed (including the ones that are not necessary for a specific
117 task).
118
119 * Project search in "gitweb" shows the substring that matched in the
120 project name and description highlighted.
121
122 * A new script "diffall" is added to contrib/; it drives an
123 external tool to perform a directory diff of two Git revisions
124 in one go, unlike "difftool" that compares one file at a time.
125
126 Foreign Interface
127
128 * Improved handling of views, labels and branches in "git-p4" (in contrib).
129
130 * "git-p4" (in contrib) suffered from unnecessary merge conflicts when
131 p4 expanded the embedded $RCS$-like keywords; it can be now told to
132 unexpand them.
133
134 * Some "git-svn" updates.
135
136 * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and
137 support incremental imports.
138
139 * "git difftool/mergetool" learned to drive DeltaWalker.
140
141 Performance
142
143 * Unnecessary calls to parse_object() "git upload-pack" makes in
144 response to "git fetch", have been eliminated, to help performance
145 in repositories with excessive number of refs.
146
147 Internal Implementation (please report possible regressions)
148
149 * Recursive call chains in "git index-pack" to deal with long delta
150 chains have been flattened, to reduce the stack footprint.
151
152 * Use of add_extra_ref() API is now gone, to make it possible to
153 cleanly restructure the overall refs API.
154
155 * The command line parser of "git pack-objects" now uses parse-options
156 API.
157
158 * The test suite supports the new "test_pause" helper function.
159
160 * Parallel to the test suite, there is a beginning of performance
161 benchmarking framework.
162
163 * t/Makefile is adjusted to prevent newer versions of GNU make from
164 running tests in seemingly random order.
165
166 * The code to check if a path points at a file beyond a symbolic link
167 has been restructured to be thread-safe.
168
169 * When pruning directories that has become empty during "git prune"
170 and "git prune-packed", call closedir() that iterates over a
171 directory before rmdir() it.
172
173 Also contains minor documentation updates and code clean-ups.
174
175
176 Fixes since v1.7.9
177 ------------------
178
179 Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
180 releases are contained in this release (see release notes to them for
181 details).
182
183 * The "remaining" subcommand to "git rerere" was not documented.
184 (merge 3e7a1df ph/rerere-doc later to maint).
185
186 * "git tag -s" honored "gpg.program" configuration variable since
187 1.7.9, but "git tag -v" and "git verify-tag" didn't.
188 (merge a2c2506 az/verify-tag-use-gpg-config later to maint).
189
190 * When "git config" diagnoses an error in a configuration file and
191 shows the line number for the offending line, it miscounted if the
192 error was at the end of line.
193 (merge 4b34059 ms/maint-config-error-at-eol-linecount later to maint).
194
195 * "gitweb" used to drop warnings in the log file when "heads" view is
196 accessed in a repository whose HEAD does not point at a valid
197 branch.
198
199 ---
200 exec >/var/tmp/1
201 O=v1.7.10-rc0-50-gd973dc0
202 echo O=$(git describe)
203 git log --first-parent --oneline ^maint $O..
204 echo
205 git shortlog --no-merges ^maint $O..