f65ed83c7e · matheusbsbs/matheus-bagliano

@@ -68,6 +68,9 @@ UI, Workflows & Features

68 * The "-Xours" backend option to "git merge -s recursive" now takes

69 effect even on binary files.

70

71 + * "git rebase -i" learned the "--edit-todo" option to open an editor

72 + to edit the insn sheet.

73 +

74

75 Foreign Interface

76

@@ -129,89 +132,84 @@ Unless otherwise noted, all the fixes since v1.7.12 in the

132 maintenance track are contained in this release (see release notes

133 to them for details).

134

135 + * The attribute system may be asked for a path that itself or its

136 + leading directories no longer exists in the working tree, and it is

137 + fine if we cannot open .gitattribute file in such a case. Failure

138 + to open per-directory .gitattributes with error status other than

139 + ENOENT and ENOTDIR should be diagnosed, but it wasn't.

140 +

141 + * When looking for $HOME/.gitconfig etc., it is OK if we cannot read

142 + them because they do not exist, but we did not diagnose existing

143 + files that we cannot read.

144 +

145 * When "git am" is fed an input that has multiple "Content-type: ..."

146 header, it did not grok charset= attribute correctly.

134 - (merge 176943b jc/maint-mailinfo-mime-attr later to maint).

147

148 * "git blame MAKEFILE" run in a history that has "Makefile" but not

149 "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got

150 confused on a case insensitive filesystem and failed to do so.

139 - (merge 9aeaab6 jc/maint-blame-no-such-path later to maint).

151

152 * Even during a conflicted merge, "git blame $path" always meant to

153 blame uncommitted changes to the "working tree" version; make it

154 more useful by showing cleanly merged parts as coming from the other

155 branch that is being merged.

145 - (merge 9aeaab6 jc/maint-blame-no-such-path later to maint).

156 +

157 + * Output from "git branch -v" contains "(no branch)" that could be

158 + localized, but the code to align it along with the names of

159 + branches were counting in bytes, not in display columns.

160 +

161 + * "git cherry-pick A C B" used to replay changes in A and then B and

162 + then C if these three commits had committer timestamps in that

163 + order, which is not what the user who said "A C B" naturally

164 + expects.

165

166 * Documentation talked about "first line of commit log" when it meant

167 the title of the commit. The description was clarified by defining

168 how the title is decided and rewording the casual mention of "first

169 line" to "title".

151 - (merge 52ffe99 jw/doc-commit-title later to maint).

170

153 - * The attribute system may be asked for a path that itself or its

154 - leading directories no longer exists in the working tree, and it is

155 - fine if we cannot open .gitattribute file in such a case. Failure

156 - to open per-directory .gitattributes with error status other than

157 - ENOENT and ENOTDIR should be diagnosed, but it wasn't.

158 -

159 - * "git log --all-match --grep=A --grep=B" ought to show commits that

160 - mention both A and B, but when these three options are used with

161 - --author or --committer, it showed commits that mention either A or

162 - B (or both) instead.

163 - (merge 39f2e01 jc/maint-log-grep-all-match later to maint).

171 + * "git cvsimport" did not thoroughly cleanse tag names that it

172 + inferred from the names of the tags it obtained from CVS, which

173 + caused "git tag" to barf and stop the import in the middle.

174

175 * Earlier we made the diffstat summary line that shows the number of

176 lines added/deleted localizable, but it was found irritating having

177 to see them in various languages on a list whose discussion language

178 is English.

169 - (merge 218adaa nd/maint-diffstat-summary later to maint).

179

180 * "git fetch --all", when passed "--no-tags", did not honor the

181 "--no-tags" option while fetching from individual remotes (the same

182 issue existed with "--tags", but combination "--all --tags" makes

183 much less sense than "--all --no-tags").

175 - (merge 8556646 dj/fetch-all-tags later to maint).

184

177 - * The subcommand in "git remote" to remove a defined remote was

178 - "rm" and the command did not take a fully-spelled "remove".

179 - (merge e17dba8 nd/maint-remote-remove later to maint).

185 + * "git fetch" over http had an old workaround for an unlikely server

186 + misconfiguration; it turns out that this hurts debuggability of the

187 + configuration in general, and has been reverted.

188 + (merge 6ac964a sp/maint-http-info-refs-no-retry later to maint).

189 +

190 + * "git fetch" over http advertised that it supports "deflate", which

191 + is much less common, and did not advertise more common "gzip" on

192 + its Accept-Encoding header.

193 + (merge aa90b96 sp/maint-http-enable-gzip later to maint).

194

195 * After "gitk" showed the contents of a tag, neither "Reread

196 references" nor "Reload" did not update what is shown as the

197 contents of it, when the user overwrote the tag with "git tag -f".

198

185 - * "git cvsimport" did not thoroughly cleanse tag names that it

186 - inferred from the names of the tags it obtained from CVS, which

187 - caused "git tag" to barf and stop the import in the middle.

188 -

189 - * "git show --format='%ci'" did not give timestamp correctly for

190 - commits created without human readable name on "committer" line.

191 - (merge e27ddb6 jc/maint-ident-missing-human-name later to maint).

192 -

193 - * "git cherry-pick A C B" used to replay changes in A and then B and

194 - then C if these three commits had committer timestamps in that

195 - order, which is not what the user who said "A C B" naturally

196 - expects.

197 - (merge a73e22e mz/cherry-pick-cmdline-order later to maint).

198 -

199 - * "git show --quiet" ought to be a synonym for "git show -s", but

200 - wasn't.

201 - (merge f9c75d8 jk/maint-quiet-is-synonym-to-s-in-log later to maint).

199 + * "git log --all-match --grep=A --grep=B" ought to show commits that

200 + mention both A and B, but when these three options are used with

201 + --author or --committer, it showed commits that mention either A or

202 + B (or both) instead.

203

204 * "git p4", when "--use-client-spec" and "--detect-branches" are used

205 together, misdetected branches.

205 - (merge 21ef5df pw/p4-use-client-spec-branch-detection later to maint).

206

207 - * Output from "git branch -v" contains "(no branch)" that could be

208 - localized, but the code to align it along with the names of

209 - branches were counting in bytes, not in display columns.

210 - (merge 1452bd6 nd/branch-v-alignment later to maint).

207 + * When you misspell the command name you give to the "exec" action in

208 + the "git rebase -i" insn sheet, you are told that 'rebase' is not a

209 + git subcommand from "git rebase --continue".

210

212 - * When looking for $HOME/.gitconfig etc., it is OK if we cannot read

213 - them because they do not exist, but we did not diagnose existing

214 - files that we cannot read.

211 + * The subcommand in "git remote" to remove a defined remote was

212 + "rm" and the command did not take a fully-spelled "remove".

213

214 * The interactive prompt "git send-email" gives was error prone. It

215 asked "What e-mail address do you want to use?" with the address it

@@ -219,4 +217,14 @@ to them for details).

217 tempting the user to say "y". But the response was taken as "No,

218 please use 'y' as the e-mail address instead", which is most

219 certainly not what the user meant.

222 - (merge 6183749 sb/send-email-reconfirm-fix later to maint).

220 +

221 + * "git show --format='%ci'" did not give timestamp correctly for

222 + commits created without human readable name on "committer" line.

223 +

224 + * "git show --quiet" ought to be a synonym for "git show -s", but

225 + wasn't.

226 +

227 + * "git submodule frotz" was not diagnosed as "frotz" being an unknown

228 + subcommand to "git submodule"; the user instead got a complaint

229 + that "git submodule status" was run with an unknown path "frotz".

230 + (merge af9c9f9 rr/maint-submodule-unknown-cmd later to maint).

Update draft release notes to 1.8.0