@matheusbsbs / matheus-bagliano / commits / 56a33c8f1b

Git 1.7.10-rc0

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Mar 7, 2012 at 12:51 UTC 56a33c8f1bb5cef11ddf046f7b570f527ea77d37
2 files changed +58 -6
Documentation/RelNotes/1.7.10.txt
+57 -5
@@ -1,6 +1,31 @@
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 +
29 Updates since v1.7.9
30 --------------------
31
@@ -37,12 +62,19 @@ UI, Workflows & Features
62 lines are taken from the postimage, in order to make it easier to
63 view the output.
64
65 + * "git diff --stat" learned to adjust the width of the output on
66 + wider terminals, and give more columns to pathnames as needed.
67 +
68 * "diff-highlight" filter (in contrib/) was updated to produce more
69 aesthetically pleasing output.
70
71 * "fsck" learned "--no-dangling" option to omit dangling object
72 information.
73
74 + * "git log -G" learned to pay attention to the "-i" option and can
75 + find patch hunks that introduce or remove a string that matches the
76 + given pattern ignoring the case.
77 +
78 * "git merge" in an interactive session learned to spawn the editor
79 by default to let the user edit the auto-generated merge message,
80 to encourage people to explain their merges better. Legacy scripts
@@ -50,6 +82,10 @@ UI, Workflows & Features
82 Both "git merge" and "git pull" can be given --no-edit from the
83 command line to accept the auto-generated merge message.
84
85 + * The advise message given when the user didn't give enough clue on
86 + what to merge to "git pull" and "git merge" has been updated to
87 + be more concise and easier to understand.
88 +
89 * "git push" learned the "--prune" option, similar to "git fetch".
90
91 * "git symbolic-ref" learned the "--short" option to abbreviate the
@@ -72,7 +108,7 @@ UI, Workflows & Features
108
109 Foreign Interface
110
75 - * Improved handling of views, labels and branches in git-p4 (in contrib).
111 + * Improved handling of views, labels and branches in "git-p4" (in contrib).
112
113 * "git-p4" (in contrib) suffered from unnecessary merge conflicts when
114 p4 expanded the embedded $RCS$-like keywords; it can be now told to
@@ -83,11 +119,13 @@ Foreign Interface
119 * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and
120 support incremental imports.
121
122 + * "git difftool/mergetool" learned to drive DeltaWalker.
123 +
124 Performance
125
88 - * During "git upload-pack" in response to "git fetch", unnecessary calls
89 - to parse_object() have been eliminated, to help performance in
90 - repositories with excessive number of refs.
126 + * Unnecessary calls to parse_object() "git upload-pack" makes in
127 + response to "git fetch", have been eliminated, to help performance
128 + in repositories with excessive number of refs.
129
130 Internal Implementation (please report possible regressions)
131
@@ -108,6 +146,9 @@ Internal Implementation (please report possible regressions)
146 * t/Makefile is adjusted to prevent newer versions of GNU make from
147 running tests in seemingly random order.
148
149 + * The code to check if a path points at a file beyond a symbolic link
150 + has been restructured to be thread-safe.
151 +
152 Also contains minor documentation updates and code clean-ups.
153
154
@@ -118,6 +159,17 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
159 releases are contained in this release (see release notes to them for
160 details).
161
162 + * "git bundle" did not record boundary commits correctly when there
163 + are many of them.
164 + (merge efe4be1 tr/maint-bundle-boundary later to maint).
165 +
166 + * "git diff-index" and its friends at the plumbing level showed the
167 + "diff --git" header and nothing else for a path whose cached stat
168 + info is dirty without actual difference when asked to produce a
169 + patch. This was a longstanding bug that we could have fixed long
170 + time ago.
171 + (merge b3f01ff jc/maint-diff-patch-header later to maint).
172 +
173 * The code to synthesize the fake ancestor tree used by 3-way merge
174 fallback in "git am" was not prepared to read a patch created with
175 a non-standard -p<num> value.
@@ -129,7 +181,7 @@ details).
181
182 ---
183 exec >/var/tmp/1
132 -O=v1.7.9.2-383-gb8b5290
184 +O=v1.7.9.3-366-g1e4d087
185 echo O=$(git describe)
186 git log --first-parent --oneline ^maint $O..
187 echo
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v1.7.9.GIT
4 +DEF_VER=v1.7.10-rc0
5
6 LF='
7 '