i18n: fix auto detection of gettext scheme for shell scripts
[git/git.git] / Documentation / RelNotes / 1.7.10.txt
1 Git v1.7.10 Release Notes
2 =========================
4 Compatibility Notes
5 -------------------
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.
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:
18 #!/bin/sh
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.
29 Updates since v1.7.9
30 --------------------
32 UI, Workflows & Features
34 * Teams for localizing the messages from the Porcelain layer of
35 commands are starting to form, thanks to Jiang Xin who volunteered
36 to be the localization coordinator. An initial set of translated
37 messages for simplified chinese is available.
39 * The configuration mechanism learned an "include" facility; an
40 assignment to the include.path pseudo-variable causes the named
41 file to be included in-place when Git looks up configuration
42 variables.
44 * A content filter (clean/smudge) used to be just a way to make the
45 recorded contents "more useful", and allowed to fail; a filter can
46 now optionally be marked as "required".
48 * Options whose names begin with "--no-" (e.g. the "--no-verify"
49 option of the "git commit" command) can be negated by omitting
50 "no-" from its name, e.g. "git commit --verify".
52 * "git am" learned to pass "-b" option to underlying "git mailinfo", so
53 that a bracketed string other than "PATCH" at the beginning can be kept.
55 * "git clone" learned "--single-branch" option to limit cloning to a
56 single branch (surprise!); tags that do not point into the history
57 of the branch are not fetched.
59 * "git clone" learned to detach the HEAD in the resulting repository
60 when the user specifies a tag with "--branch" (e.g., "--branch=v1.0").
61 Clone also learned to print the usual "detached HEAD" advice in such
62 a case, similar to "git checkout v1.0".
64 * When showing a patch while ignoring whitespace changes, the context
65 lines are taken from the postimage, in order to make it easier to
66 view the output.
68 * "git diff --stat" learned to adjust the width of the output on
69 wider terminals, and give more columns to pathnames as needed.
71 * "diff-highlight" filter (in contrib/) was updated to produce more
72 aesthetically pleasing output.
74 * "fsck" learned "--no-dangling" option to omit dangling object
75 information.
77 * "git log -G" and "git log -S" learned to pay attention to the "-i"
78 option. With "-i", "log -G" ignores the case when finding patch
79 hunks that introduce or remove a string that matches the given
80 pattern. Similarly with "-i", "log -S" ignores the case when
81 finding the commit the given block of text appears or disappears
82 from the file.
84 * "git merge" in an interactive session learned to spawn the editor
85 by default to let the user edit the auto-generated merge message,
86 to encourage people to explain their merges better. Legacy scripts
87 can export GIT_MERGE_AUTOEDIT=no to retain the historical behavior.
88 Both "git merge" and "git pull" can be given --no-edit from the
89 command line to accept the auto-generated merge message.
91 * The advice message given when the user didn't give enough clue on
92 what to merge to "git pull" and "git merge" has been updated to
93 be more concise and easier to understand.
95 * "git push" learned the "--prune" option, similar to "git fetch".
97 * The whole directory that houses a top-level superproject managed by
98 "git submodule" can be moved to another place.
100 * "git symbolic-ref" learned the "--short" option to abbreviate the
101 refname it shows unambiguously.
103 * "git tag --list" can be given "--points-at <object>" to limit its
104 output to those that point at the given object.
106 * "gitweb" allows intermediate entries in the directory hierarchy
107 that leads to a project to be clicked, which in turn shows the
108 list of projects inside that directory.
110 * "gitweb" learned to read various pieces of information for the
111 repositories lazily, instead of reading everything that could be
112 needed (including the ones that are not necessary for a specific
113 task).
115 * Project search in "gitweb" shows the substring that matched in the
116 project name and description highlighted.
118 Foreign Interface
120 * Improved handling of views, labels and branches in "git-p4" (in contrib).
122 * "git-p4" (in contrib) suffered from unnecessary merge conflicts when
123 p4 expanded the embedded $RCS$-like keywords; it can be now told to
124 unexpand them.
126 * Some "git-svn" updates.
128 * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and
129 support incremental imports.
131 * "git difftool/mergetool" learned to drive DeltaWalker.
133 Performance
135 * Unnecessary calls to parse_object() "git upload-pack" makes in
136 response to "git fetch", have been eliminated, to help performance
137 in repositories with excessive number of refs.
139 Internal Implementation (please report possible regressions)
141 * Recursive call chains in "git index-pack" to deal with long delta
142 chains have been flattened, to reduce the stack footprint.
144 * Use of add_extra_ref() API is now gone, to make it possible to
145 cleanly restructure the overall refs API.
147 * The command line parser of "git pack-objects" now uses parse-options
148 API.
150 * The test suite supports the new "test_pause" helper function.
152 * Parallel to the test suite, there is a beginning of performance
153 benchmarking framework.
155 * t/Makefile is adjusted to prevent newer versions of GNU make from
156 running tests in seemingly random order.
158 * The code to check if a path points at a file beyond a symbolic link
159 has been restructured to be thread-safe.
161 * When pruning directories that has become empty during "git prune"
162 and "git prune-packed", call closedir() that iterates over a
163 directory before rmdir() it.
165 Also contains minor documentation updates and code clean-ups.
168 Fixes since v1.7.9
169 ------------------
171 Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
172 releases are contained in this release (see release notes to them for
173 details).
175 * "git bundle" did not record boundary commits correctly when there
176 are many of them.
177 (merge efe4be1 tr/maint-bundle-boundary later to maint).
179 * "git diff-index" and its friends at the plumbing level showed the
180 "diff --git" header and nothing else for a path whose cached stat
181 info is dirty without actual difference when asked to produce a
182 patch. This was a longstanding bug that we could have fixed long
183 time ago.
184 (merge b3f01ff jc/maint-diff-patch-header later to maint).
186 * The code to synthesize the fake ancestor tree used by 3-way merge
187 fallback in "git am" was not prepared to read a patch created with
188 a non-standard -p<num> value.
189 (merge a61ba26 jc/am-3-nonstandard-popt later to maint).
191 * "gitweb" used to drop warnings in the log file when "heads" view is
192 accessed in a repository whose HEAD does not point at a valid
193 branch.
195 * "gitweb" did use quotemeta() to prepare search string when asked to
196 do a fixed-string project search, but did not use it by mistake and
197 used the user-supplied string instead.
198 (merge e65ceb6 jn/maint-do-not-match-with-unsanitized-searchtext later to maint).
200 ---
201 exec >/var/tmp/1
202 O=v1.7.10-rc0-15-g9a4c97e
203 echo O=$(git describe)
204 git log --first-parent --oneline ^maint $O..
205 echo
206 git shortlog --no-merges ^maint $O..