29acbf5cc2 · matheusbsbs/matheus-bagliano

@@ -1,20 +1,20 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Aug 2012, #07; Wed, 22)

4 -X-master-at: 851f7e689efa034701bf41c3be06c927480eaae9

5 -X-next-at: ff27e03d9aa951d799461ff03a3f103000d7ce88

3 +Subject: What's cooking in git.git (Aug 2012, #08; Mon, 27)

4 +X-master-at: 31e0100e89c3f7c05bd7fdf54e084b2039d398ec

5 +X-next-at: 32a1b722418b8b32eafe3b98d890fa239ec128f8

6

7 -What's cooking in git.git (Aug 2012, #07; Wed, 22)

7 +What's cooking in git.git (Aug 2012, #08; Mon, 27)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking. Commits prefixed with '-' are

11 only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.

12

13 -As promised (threatened ;-), the first batch of topics for the next

14 -release are now part of 'master'. They are mostly innocuous

15 -documentation updates, test clean-ups, and all should eventually go

16 -to the maintenance track. The update to git-svn to make it work

17 -better with subversion 1.7 is also included.

13 +New topics started to flow in at the pace a bit faster than

14 +reviewers give comments on them. I've merged half of the second

15 +batch of topics to 'master', and will do the remainder later this

16 +week. They are a bit more substantial changes than the first batch

17 +we merged earlier.

18

19 I'm planning to keep this cycle reasonably short and aim for tagging

20 the result as 1.8.0 at the end of 9th week, on October 21st, after

@@ -27,207 +27,287 @@ repositories listed at

27 http://git-blame.blogspot.com/p/git-public-repositories.html

28

29 --------------------------------------------------

30 -[New Topics]

30 +[Graduated to "master"]

31

32 -* er/doc-fast-import-done (2012-08-22) 1 commit

33 - - fast-import: document the --done option

32 +* ab/diff-write-incomplete-line (2012-08-05) 1 commit

33 + (merged to 'next' on 2012-08-20 at e28b804)

34 + + Fix '\ No newline...' annotation in rewrite diffs

35

35 -Parked in 'pu' in case ESR responds with "Sorry, forgot to sign-off".

36 +(Originally merged to 'next' on 2012-08-07)

37

37 -* nd/am-i18n-fix (2012-08-22) 1 commit

38 - - am: quote string for translation before passing to eval_gettextln

38 +The output from "git diff -B" for a file that ends with an

39 +incomplete line did not put "\ No newline..." on a line of its own.

40

40 -"git am" wasn't marked up for i18n properly.

41 -Will merge to 'next', and eventually to maint-1.7.11 track.

41 +* bc/receive-pack-stdout-protection (2012-08-06) 2 commits

42 + (merged to 'next' on 2012-08-20 at b1b0d18)

43 + + receive-pack: do not leak output from auto-gc to standard output

44 + + t/t5400: demonstrate breakage caused by informational message from prune

45

43 ---------------------------------------------------

44 -[Graduated to "master"]

46 +(Originally merged to 'next' on 2012-08-07)

47

46 -* hv/coding-guidelines (2012-08-15) 1 commit

47 - (merged to 'next' on 2012-08-20 at 4984865)

48 - + Documentation/CodingGuidelines: spell out more shell guidelines

48 +When "git push" triggered the automatic gc on the receiving end, a

49 +message from "git prune" that said it was removing cruft leaked to

50 +the standard output, breaking the communication protocol.

51

50 -(Originally merged to 'next' on 2012-08-18)

52 +* da/difftool-updates (2012-08-21) 13 commits

53 + (merged to 'next' on 2012-08-21 at 332afe4)

54 + + difftool: silence warning

55 + (merged to 'next' on 2012-08-20 at 2fecd90)

56 + + Add Code Compare v2.80.4 as a merge / diff tool for Windows

57 + + mergetool,difftool: Document --tool-help consistently

58 + + difftool: Disable --symlinks on cygwin

59 + + difftool: Handle compare() returning -1

60 + + difftool: Wrap long lines for readability

61 + + difftool: Check all return codes from compare()

62 + + difftool: Handle finding mergetools/ in a path with spaces

63 + + difftool: Use symlinks when diffing against the worktree

64 + + difftool: Call the temp directory "git-difftool"

65 + + difftool: Move option values into a hash

66 + + difftool: Eliminate global variables

67 + + difftool: Simplify print_tool_help()

68 +

69 +(Originally merged to 'next' on 2012-08-10)

70

52 -In earlier days, "imitate the style in the neibouring code" was

53 -sufficient to keep the coherent style, but over time some parts of

54 -the codebase have drifted enough to make it ineffective.

71 +"git difftool --dir-diff" learned to use symbolic links to prepare

72 +temporary copy of the working tree when available.

73

56 -* jc/doc-git-updates (2012-08-17) 1 commit

57 - (merged to 'next' on 2012-08-20 at ab1db71)

58 - + Documentation: update the introductory section

74 +* jc/maint-t7406-rev-parse-max-count-huh (2012-07-30) 1 commit

75 + (merged to 'next' on 2012-08-20 at 3e2598a)

76 + + t7406: fix misleading "rev-parse --max-count=1 HEAD"

77

60 -(Originally merged to 'next' on 2012-08-18)

78 +(Originally merged to 'next' on 2012-07-30)

79

62 -* jc/maint-abbrev-option-cli (2012-08-16) 1 commit

63 - (merged to 'next' on 2012-08-20 at 54d1a5a)

64 - + gitcli: describe abbreviation of long options

80 +Test clean-up, with no behaviour change.

81 +

82 +* jk/docs-docbook-monospace-display (2012-08-07) 1 commit

83 + (merged to 'next' on 2012-08-20 at 0ed30dc)

84 + + docs: monospace listings in docbook output

85

86 (Originally merged to 'next' on 2012-08-18)

87

68 -We did not document that many commands take unique prefix

69 -abbreviations of long options (e.g. "--option" may be the only flag

70 -that the command accepts that begin with "--opt", in which case you

71 -can give "--opt") anywhere easy to find for new people.

88 +The documentation in the TeXinfo format was using indented output

89 +for materials meant to be examples that are better typeset in

90 +monospace.

91

73 -* jc/maint-rev-list-topo-doc (2012-08-15) 1 commit

74 - (merged to 'next' on 2012-08-20 at 0f669d2)

75 - + rev-list docs: clarify --topo-order description

92 +* jk/maint-diff-nul40-as-sentinel (2012-07-29) 1 commit

93 + + diff: do not use null sha1 as a sentinel value

94 + (this branch is used by jk/maint-null-in-trees.)

95

77 -(Originally merged to 'next' on 2012-08-18)

96 +"git diff" had a confusion between taking data from a path in the

97 +working tree and taking data from an object that happens to have

98 +name 0{40} recorded in a tree.

99

79 -It was unclear what "--topo-order" was really about in the

80 -documentation. It is not just about "children before parent", but

81 -also about "don't mix lineages".

100 +* jk/maint-null-in-trees (2012-07-29) 2 commits

101 + (merged to 'next' on 2012-08-20 at 5bc2c49)

102 + + fsck: detect null sha1 in tree entries

103 + + do not write null sha1s to on-disk index

104 + (this branch uses jk/maint-diff-nul40-as-sentinel.)

105

83 -* jc/tag-doc (2012-08-06) 1 commit

84 - (merged to 'next' on 2012-08-20 at 9eb658e)

85 - + Documentation: do not mention .git/refs/* directories

106 +(Originally merged to 'next' on 2012-07-30)

107

87 -(Originally merged to 'next' on 2012-08-18)

108 +We do not want a link to 0{40} object stored anywhere in our objects.

109 +

110 +* js/grep-patterntype-config (2012-08-03) 1 commit

111 + (merged to 'next' on 2012-08-20 at 39a0431)

112 + + grep: add a grep.patternType configuration setting

113 +

114 +(Originally merged to 'next' on 2012-08-09)

115

89 -Our documentation used to assume having files in .git/refs/*

90 -directories was the only to have branches and tags, but that is not

91 -true for quite some time.

92 -

93 -* jc/test-prereq (2012-08-04) 8 commits

94 - (merged to 'next' on 2012-08-20 at dd44c4a)

95 - + t3910: use the UTF8_NFD_TO_NFC test prereq

96 - + test-lib: provide UTF8 behaviour as a prerequisite

97 - + t0050: use the SYMLINKS test prereq

98 - + t0050: use the CASE_INSENSITIVE_FS test prereq

99 - + test-lib: provide case insensitivity as a prerequisite

100 - + test: allow prerequisite to be evaluated lazily

101 - + test: rename $satisfied to $satisfied_prereq

102 -

103 -(Originally merged to 'next' on 2012-08-04)

104 -

105 -Teaches the test framework to probe rarely used prerequistes lazily,

106 -and make use of it for detecting SYMLINKS, CASE_INSENSITIVE_FS and

107 -NKD/NKC MacOS x gotcha.

108 -

109 -* jk/check-docs-update (2012-08-08) 8 commits

110 - (merged to 'next' on 2012-08-20 at d51021d)

111 - + check-docs: get documented command list from Makefile

112 - + check-docs: drop git-help special-case

113 - + check-docs: list git-gui as a command

114 - + check-docs: factor out command-list

115 - + command-list: mention git-credential-* helpers

116 - + command-list: add git-sh-i18n

117 - + check-docs: update non-command documentation list

118 - + check-docs: mention gitweb specially

116 +"grep" learned to use a non-standard pattern type by default if a

117 +configuration variable tells it to.

118

120 -(Originally merged to 'next' on 2012-08-18)

119 +* mm/push-default-switch-warning (2012-06-24) 1 commit

120 + (merged to 'next' on 2012-08-20 at 553e6c0)

121 + + push: start warning upcoming default change for push.default

122

122 -Simplify "make check-docs" implementation and update its coverage.

123 +(Originally merged to 'next' on 2012-06-26)

124

124 -* js/gitweb-path-info-unquote (2012-08-15) 1 commit

125 - (merged to 'next' on 2012-08-20 at a4aa740)

126 - + gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO

125 +In the next major release, we will switch "git push [$there]" that

126 +does not say what to push from the traditional "matching" to the

127 +updated "simple" semantics, that pushes the current branch to the

128 +branch with the same name only when the current branch is set to

129 +integrate with that remote branch (all other cases will error out).

130

128 -(Originally merged to 'next' on 2012-08-15)

131 +--------------------------------------------------

132 +[New Topics]

133

130 -Stripping of PATH_INFO in gitweb did not take url style quoting into

131 -account, failing to notice directories with funny characters e.g. SP

132 -in their paths.

134 +* cn/branch-set-upstream-to (2012-08-23) 3 commits

135 + - branch: deprecate --set-upstream and show help if we detect possible mistaken use

136 + - branch: add --unset-upstream option

137 + - branch: introduce --set-upstream-to

138

134 -* mk/test-seq (2012-08-04) 1 commit

135 - (merged to 'next' on 2012-08-20 at c373e0e)

136 - + tests: Introduce test_seq

137 - (this branch is used by ab/diff-write-incomplete-line.)

139 +"git branch --set-upstream origin/master" is a common mistake to

140 +create a local branch 'origin/master' and set it to integrate with

141 +the current branch. With a plan to deprecate this option, introduce

142 +"git branch (-u|--set-upstream-to) origin/master" that sets the

143 +current branch to integrate with 'origin/master' remote tracking

144 +branch.

145

139 -(Originally merged to 'next' on 2012-08-06)

146 +Wainting for a reroll

147 +that tightens its error checking.

148

141 -Add a compatibility/utility function to the test framework.

149 +* jc/dotdot-is-parent-directory (2012-08-23) 1 commit

150 + - specifying ranges: we did not mean to make ".." an empty set

151

143 -* mm/die-with-dashdash-help (2012-08-03) 1 commit

144 - (merged to 'next' on 2012-08-20 at ebe0e1a)

145 - + setup: clarify error messages for file/revisions ambiguity

152 +"git log .." errored out saying it is both rev range and a path when

153 +there is no disambiguating "--" is on the command line. Update the

154 +command line parser to interpret ".." as a path in such a case.

155

147 -(Originally merged to 'next' on 2012-08-09)

156 +Will merge to 'next'.

157

149 -Reword error messages.

150 -

151 -* ms/git-svn-1.7 (2012-08-02) 20 commits

152 - (merged to 'next' on 2012-08-21 at ae8aff9)

153 - + git-svn: remove ad-hoc canonicalizations

154 - + git-svn: canonicalize newly-minted URLs

155 - + git-svn: introduce add_path_to_url function

156 - + git-svn: canonicalize earlier

157 - + git-svn: replace URL escapes with canonicalization

158 - + git-svn: attempt to mimic SVN 1.7 URL canonicalization

159 - + t9107: fix typo

160 - + t9118: workaround inconsistency between SVN versions

161 - + Git::SVN{,::Ra}: canonicalize earlier

162 - + git-svn: path canonicalization uses SVN API

163 - + Git::SVN::Utils: remove irrelevant comment

164 - + git-svn: add join_paths() to safely concatenate paths

165 - + git-svn: factor out _collapse_dotdot function

166 - + git-svn: use SVN 1.7 to canonicalize when possible

167 - + git-svn: move canonicalization to Git::SVN::Utils

168 - + use Git::SVN{,::RA}->url accessor globally

169 - + use Git::SVN->path accessor globally

170 - + Git::SVN::Ra: use accessor for URLs

171 - + Git::SVN: use accessor for URLs internally

172 - + Git::SVN: use accessors internally for path

173 -

174 -A series by Michael Schwern via Eric to update git-svn to revamp the

175 -way URLs are internally passed around, to make it work with SVN 1.7.

176 -

177 -* mv/pull-r-for-rebase (2012-08-17) 1 commit

178 - (merged to 'next' on 2012-08-20 at 9743071)

179 - + man: git pull -r is a short for --rebase

158 +* jc/maint-mergetool-style-fix (2012-08-23) 1 commit

159 + - mergetool: style fixes

160

181 -(Originally merged to 'next' on 2012-08-18)

161 +As the title says.

162

183 -A minor documentation update.

163 +Will merge to 'next'.

164

185 -* nd/index-errno (2012-08-06) 1 commit

186 - (merged to 'next' on 2012-08-20 at 34076c6)

187 - + read_index_from: remove bogus errno assignments

165 +* js/compat-itimer (2012-08-24) 1 commit

166 + - Support for setitimer() on platforms lacking it

167

189 -(Originally merged to 'next' on 2012-08-06)

168 +Pieces to support compilation on __TANDEM.

169

191 -Assignments to errno before calling system functions that used to

192 -matter in the old code were left behind after the code structure

193 -changed sufficiently to make them useless.

170 +* js/compat-mkdir (2012-08-24) 1 commit

171 + - compat: some mkdir() do not like a slash at the end

172

195 -* pg/maint-apply-remove-unused-variable (2012-08-05) 1 commit

196 - (merged to 'next' on 2012-08-20 at 260975b)

197 - + apply: delete unused deflate_origlen from patch struct

173 +Pieces to support compilation on __TANDEM.

174

199 -(Originally merged to 'next' on 2012-08-05)

175 +Will merge to 'next'.

176

201 -Remove an unused field.

177 +* js/no-curl-easy-strerror-on-old-curl (2012-08-23) 1 commit

178 + - http.c: don't use curl_easy_strerror prior to curl-7.12.0

179

203 -* tr/maint-send-email-2047 (2012-07-31) 1 commit

204 - (merged to 'next' on 2012-08-20 at cf5ee1c)

205 - + send-email: improve RFC2047 quote parsing

180 +Pieces to support compilation on __TANDEM.

181

207 -(Originally merged to 'next' on 2012-08-09)

182 +Will merge to 'next'.

183

209 -"git send-email" did not unquote encoded words that appear on the

210 -header correctly, and lost "_" from strings.

184 +* js/use-sc-open-max (2012-08-24) 1 commit

185 + - sha1_file.c: introduce get_max_fd_limit() helper

186

212 -* tr/merge-recursive-flush (2012-08-03) 1 commit

213 - (merged to 'next' on 2012-08-20 at 00aeb19)

214 - + merge-recursive: eliminate flush_buffer() in favor of write_in_full()

187 +Pieces to support compilation on __TANDEM.

188

216 -(Originally merged to 'next' on 2012-08-09)

189 +Will merge to 'next'.

190

218 -Remove unnecessary code.

191 +* ph/credential-refactor (2012-08-27) 6 commits

192 + - wincred: port to generic credential helper (UNTESTED)

193 + - Merge branch 'ef/win32-cred-helper' into ph/credential-refactor

194 + - osxkeychain: port to generic credential helper implementation

195 + - gnome-keyring: port to generic helper implementation

196 + - contrib: add generic credential helper

197 + - contrib: add credential helper for GnomeKeyring

198 + (this branch uses ef/win32-cred-helper.)

199 +

200 +Adds a new credential helper to support Gnome keyring and attempts

201 +to refactor to share code among OSX keychain, Gnome keyring and

202 +Win32 credential helpers.

203 +

204 +Waiting for test results with the tip one

205 +to decide whether the series should be rerolled or reduced to only

206 +the first one.

207 +

208 +* jc/apply-binary-p0 (2012-08-24) 1 commit

209 + - apply: compute patch->def_name correctly under -p0

210 +

211 +"git apply -p0" did not parse pathnames on "diff --git" line

212 +correctly. This caused patches that had pathnames in no other

213 +places to be mistakenly rejected (most notably, binary patch that

214 +does not rename nor change mode). Textual patches, renames or

215 +mode changes have preimage and postimage pathnames in different

216 +places in a form that can be parsed unambiguously and did not suffer

217 +from this problem.

218

220 -* tr/void-diff-setup-done (2012-08-03) 1 commit

221 - (merged to 'next' on 2012-08-20 at 2f21f63)

222 - + diff_setup_done(): return void

219 +Will merge to 'next'.

220

224 -(Originally merged to 'next' on 2012-08-09)

221 +* jc/maint-doc-checkout-b-always-takes-branch-name (2012-08-26) 1 commit

222 + - doc: "git checkout -b/-B/--orphan" always takes a branch name

223 +

224 +The synopsis said "checkout [-B branch]" to make it clear the branch

225 +name is a parameter to the option, but the heading for the option

226 +description was "-B::", not "-B branch::", making the documentation

227 +misleading. There may be room in documentation pages of other

228 +commands for similar improvements (hint, hint).

229 +

230 +Will merge to 'next'.

231 +

232 +* jk/maint-http-half-auth-push (2012-08-27) 8 commits

233 + - http: prompt for credentials on failed POST

234 + - http: factor out http error code handling

235 + - t: test http access to "half-auth" repositories

236 + - t: test basic smart-http authentication

237 + - t/lib-httpd: recognize */smart/* repos as smart-http

238 + - t/lib-httpd: only route auth/dumb to dumb repos

239 + - t5550: factor out http auth setup

240 + - t5550: put auth-required repo in auth/dumb

241 +

242 +Pushing to smart HTTP server with recent Git fails without having

243 +the username in the URL to force authentication, if the server is

244 +configured to allow GET anonymously, while requiring authentication

245 +for POST.

246 +

247 +Will merge to 'next'.

248 +

249 +* jx/test-real-path (2012-08-27) 1 commit

250 + - test: set the realpath of CWD as TRASH_DIRECTORY

251 +

252 +Running tests with the "trash" directory elsewhere with the "--root"

253 +option did not work well if the directory was specified by a symbolic

254 +link pointing at it.

255 +

256 +Waiting for a Tested-by.

257 +

258 +* mh/fetch-filter-refs (2012-08-26) 17 commits

259 + - filter_refs(): simplify logic

260 + - fetch_pack(): free matching heads

261 + - cmd_fetch_pack(): simplify computation of return value

262 + - fetch-pack: report missing refs even if no existing refs were received

263 + - cmd_fetch_pack: return early if finish_connect() returns an error

264 + - filter_refs(): compress unmatched refs in heads array

265 + - filter_refs(): do not leave gaps in return_refs

266 + - filter_refs(): simplify by removing optimization

267 + - Pass nr_heads to filter_refs() by reference

268 + - Pass nr_heads to everything_local() by reference

269 + - Pass nr_heads to do_pack_ref() by reference

270 + - Let fetch_pack() inform caller about number of unique heads

271 + - filter_refs(): do not check the same head_pos twice

272 + - fetch-pack.c: name local variables more consistently

273 + - fetch_pack(): reindent function decl and defn

274 + - Rename static function fetch_pack() to http_fetch_pack()

275 + - t5500: add tests of error output for missing refs

276 +

277 +Code simplification and clarification.

278 +Waiting for a follow-up patch based on Peff's idea.

279 +

280 +* nd/branch-v-alignment (2012-08-27) 1 commit

281 + - branch -v: align even when branch names are in UTF-8

282 +

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

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

285 +were counting in bytes, not in display columns.

286 +

287 +Will merge to 'next'.

288 +

289 +* jc/merge-bases (2012-08-27) 5 commits

290 + - get_merge_bases_many(): walk from many tips in parallel

291 + - in_merge_bases(): omit unnecessary redundant common ancestor reduction

292 + - http-push: use in_merge_bases() for fast-forward check

293 + - receive-pack: use in_merge_bases() for fast-forward check

294 + - in_merge_bases(): support only one "other" commit

295

226 -Remove unnecessary code.

296 +Optimises the "merge-base" computation a bit, and also updates its

297 +users that do not need the full merge-base information to call a

298 +cheaper subset. The most important one is the second from the tip

299 +done by Thomas.

300 +

301 +Needs sign-off.

302

303 --------------------------------------------------

304 [Stalled]

305

306 +* er/doc-fast-import-done (2012-08-22) 1 commit

307 + - fast-import: document the --done option

308 +

309 +Parked in 'pu' in case ESR responds with "Sorry, forgot to sign-off".

310 +

311 * jc/add-delete-default (2012-08-13) 1 commit

312 - git add: notice removal of tracked paths by default

313

@@ -277,12 +357,6 @@ Expecting a reroll.

357 Performance concerns from Windows folks. Also the series lacks

358 proper sign-offs.

359

280 -* jl/submodule-rm (2012-07-05) 2 commits

281 - - rm: remove submodules from the index and the .gitmodules file

282 - - rm: don't fail when removing populated submodules

283 -

284 -Expecting a reroll.

285 -

360 * mb/remote-default-nn-origin (2012-07-11) 6 commits

361 - Teach get_default_remote to respect remote.default.

362 - Test that plain "git fetch" uses remote.default when on a detached HEAD.

@@ -333,24 +407,45 @@ working :-<.

407 --------------------------------------------------

408 [Cooking]

409

410 +* jl/submodule-rm (2012-08-27) 1 commit

411 + - Teach rm to remove submodules unless they contain a git directory

412 +

413 +"git rm submodule" cannot blindly remove a submodule directory as

414 +its working tree may have local changes, and worse yet, it may even

415 +have its repository embedded in it. Teach it some special cases

416 +where it is safe to remove a submodule, specifically, when there is

417 +no local changes in the submodule working tree, and its repository

418 +is not embedded in its working tree but is elsewhere and uses the

419 +gitfile mechanism to point at it.

420 +

421 +* nd/am-i18n-fix (2012-08-22) 1 commit

422 + (merged to 'next' on 2012-08-24 at f8e9a63)

423 + + am: quote string for translation before passing to eval_gettextln

424 +

425 +"git am" wasn't marked up for i18n properly.

426 +

427 +Will merge to 'master' as part of the fourth batch.

428 +

429 * lt/commit-tree-guess-utf-8 (2012-08-21) 1 commit

337 - - commit/commit-tree: correct latin1 to utf-8

430 + (merged to 'next' on 2012-08-24 at d16ac69)

431 + + commit/commit-tree: correct latin1 to utf-8

432

433 Teaches "git commit" and "git commit-tree" the "we are told to use

434 utf-8 in log message, but this does not look like utf-8---attempt to

435 pass it through convert-from-latin1-to-utf8 and see if it makes

436 sense" heuristics "git mailinfo" already uses.

437

344 -Will merge to 'next'.

438 +Will merge to 'master' as part of the fourth batch.

439

440 * kk/maint-for-each-ref-multi-sort (2012-08-21) 2 commits

347 - - for-each-ref: Fix sort with multiple keys

348 - - t6300: test sort with multiple keys

441 + (merged to 'next' on 2012-08-24 at 28a5db4)

442 + + for-each-ref: Fix sort with multiple keys

443 + + t6300: test sort with multiple keys

444

445 "git for-each-ref" did not currectly support more than one --sort

446 option.

447

353 -Will merge to 'next'.

448 +Will merge to 'master' as part of the fourth batch.

449

450 * fa/remote-svn (2012-08-22) 16 commits

451 - Add a test script for remote-svn

@@ -371,107 +466,118 @@ Will merge to 'next'.

466 - Implement a remote helper for svn in C

467 (this branch is used by fa/vcs-svn.)

468

374 -* fa/vcs-svn (2012-08-22) 4 commits

469 +* fa/vcs-svn (2012-08-26) 8 commits

470 + - t9020-*.sh: Skip all tests when python not available

471 + - t9020-*.sh: Fix urls passed to git-remote in test setup

472 + - remote-testsvn.c: avoid use of the getline() function

473 + - vcs-svn: Fix 'fa/remote-svn' and 'fa/vcs-svn' in pu

474 - vcs-svn: remove repo_tree

475 - vcs-svn/svndump: rewrite handle_node(), begin|end_revision()

476 - vcs-svn/svndump: restructure node_ctx, rev_ctx handling

477 - svndump: move struct definitions to .h

478 (this branch uses fa/remote-svn.)

479

480 +The tip ones should be squashed in.

481 +Waiting for a reroll.

482 +

483 * nd/i18n-parseopt-help (2012-08-22) 66 commits

382 - - Use imperative form in help usage to describe an action

383 - - Reduce translations by using same terminologies

384 - - i18n: write-tree: mark parseopt strings for translation

385 - - i18n: verify-tag: mark parseopt strings for translation

386 - - i18n: verify-pack: mark parseopt strings for translation

387 - - i18n: update-server-info: mark parseopt strings for translation

388 - - i18n: update-ref: mark parseopt strings for translation

389 - - i18n: update-index: mark parseopt strings for translation

390 - - i18n: tag: mark parseopt strings for translation

391 - - i18n: symbolic-ref: mark parseopt strings for translation

392 - - i18n: show-ref: mark parseopt strings for translation

393 - - i18n: show-branch: mark parseopt strings for translation

394 - - i18n: shortlog: mark parseopt strings for translation

395 - - i18n: rm: mark parseopt strings for translation

396 - - i18n: revert, cherry-pick: mark parseopt strings for translation

397 - - i18n: rev-parse: mark parseopt strings for translation

398 - - i18n: reset: mark parseopt strings for translation

399 - - i18n: rerere: mark parseopt strings for translation

400 - - i18n: status: mark parseopt strings for translation

401 - - i18n: replace: mark parseopt strings for translation

402 - - i18n: remote: mark parseopt strings for translation

403 - - i18n: read-tree: mark parseopt strings for translation

404 - - i18n: push: mark parseopt strings for translation

405 - - i18n: prune: mark parseopt strings for translation

406 - - i18n: prune-packed: mark parseopt strings for translation

407 - - i18n: pack-refs: mark parseopt strings for translation

408 - - i18n: pack-objects: mark parseopt strings for translation

409 - - i18n: notes: mark parseopt strings for translation

410 - - i18n: name-rev: mark parseopt strings for translation

411 - - i18n: mv: mark parseopt strings for translation

412 - - i18n: mktree: mark parseopt strings for translation

413 - - i18n: merge: mark parseopt strings for translation

414 - - i18n: merge-file: mark parseopt strings for translation

415 - - i18n: merge-base: mark parseopt strings for translation

416 - - i18n: ls-tree: mark parseopt strings for translation

417 - - i18n: ls-files: mark parseopt strings for translation

418 - - i18n: log: mark parseopt strings for translation

419 - - i18n: init-db: mark parseopt strings for translation

420 - - i18n: help: mark parseopt strings for translation

421 - - i18n: hash-object: mark parseopt strings for translation

422 - - i18n: grep: mark parseopt strings for translation

423 - - i18n: gc: mark parseopt strings for translation

424 - - i18n: fsck: mark parseopt strings for translation

425 - - i18n: format-patch: mark parseopt strings for translation

426 - - i18n: for-each-ref: mark parseopt strings for translation

427 - - i18n: fmt-merge-msg: mark parseopt strings for translation

428 - - i18n: fetch: mark parseopt strings for translation

429 - - i18n: fast-export: mark parseopt strings for translation

430 - - i18n: describe: mark parseopt strings for translation

431 - - i18n: config: mark parseopt strings for translation

432 - - i18n: count-objects: mark parseopt strings for translation

433 - - i18n: commit: mark parseopt strings for translation

434 - - i18n: column: mark parseopt strings for translation

435 - - i18n: clone: mark parseopt strings for translation

436 - - i18n: clean: mark parseopt strings for translation

437 - - i18n: cherry: mark parseopt strings for translation

438 - - i18n: checkout: mark parseopt strings for translation

439 - - i18n: checkout-index: mark parseopt strings for translation

440 - - i18n: check-attr: mark parseopt strings for translation

441 - - i18n: cat-file: mark parseopt strings for translation

442 - - i18n: branch: mark parseopt strings for translation

443 - - i18n: blame: mark parseopt strings for translation

444 - - i18n: add: mark parseopt strings for translation

445 - - i18n: bisect--helper: mark parseopt strings for translation

446 - - i18n: archive: mark parseopt strings for translation

447 - - i18n: mark "style" in OPT_COLUMN() for translation

484 + (merged to 'next' on 2012-08-24 at 2a04ce0)

485 + + Use imperative form in help usage to describe an action

486 + + Reduce translations by using same terminologies

487 + + i18n: write-tree: mark parseopt strings for translation

488 + + i18n: verify-tag: mark parseopt strings for translation

489 + + i18n: verify-pack: mark parseopt strings for translation

490 + + i18n: update-server-info: mark parseopt strings for translation

491 + + i18n: update-ref: mark parseopt strings for translation

492 + + i18n: update-index: mark parseopt strings for translation

493 + + i18n: tag: mark parseopt strings for translation

494 + + i18n: symbolic-ref: mark parseopt strings for translation

495 + + i18n: show-ref: mark parseopt strings for translation

496 + + i18n: show-branch: mark parseopt strings for translation

497 + + i18n: shortlog: mark parseopt strings for translation

498 + + i18n: rm: mark parseopt strings for translation

499 + + i18n: revert, cherry-pick: mark parseopt strings for translation

500 + + i18n: rev-parse: mark parseopt strings for translation

501 + + i18n: reset: mark parseopt strings for translation

502 + + i18n: rerere: mark parseopt strings for translation

503 + + i18n: status: mark parseopt strings for translation

504 + + i18n: replace: mark parseopt strings for translation

505 + + i18n: remote: mark parseopt strings for translation

506 + + i18n: read-tree: mark parseopt strings for translation

507 + + i18n: push: mark parseopt strings for translation

508 + + i18n: prune: mark parseopt strings for translation

509 + + i18n: prune-packed: mark parseopt strings for translation

510 + + i18n: pack-refs: mark parseopt strings for translation

511 + + i18n: pack-objects: mark parseopt strings for translation

512 + + i18n: notes: mark parseopt strings for translation

513 + + i18n: name-rev: mark parseopt strings for translation

514 + + i18n: mv: mark parseopt strings for translation

515 + + i18n: mktree: mark parseopt strings for translation

516 + + i18n: merge: mark parseopt strings for translation

517 + + i18n: merge-file: mark parseopt strings for translation

518 + + i18n: merge-base: mark parseopt strings for translation

519 + + i18n: ls-tree: mark parseopt strings for translation

520 + + i18n: ls-files: mark parseopt strings for translation

521 + + i18n: log: mark parseopt strings for translation

522 + + i18n: init-db: mark parseopt strings for translation

523 + + i18n: help: mark parseopt strings for translation

524 + + i18n: hash-object: mark parseopt strings for translation

525 + + i18n: grep: mark parseopt strings for translation

526 + + i18n: gc: mark parseopt strings for translation

527 + + i18n: fsck: mark parseopt strings for translation

528 + + i18n: format-patch: mark parseopt strings for translation

529 + + i18n: for-each-ref: mark parseopt strings for translation

530 + + i18n: fmt-merge-msg: mark parseopt strings for translation

531 + + i18n: fetch: mark parseopt strings for translation

532 + + i18n: fast-export: mark parseopt strings for translation

533 + + i18n: describe: mark parseopt strings for translation

534 + + i18n: config: mark parseopt strings for translation

535 + + i18n: count-objects: mark parseopt strings for translation

536 + + i18n: commit: mark parseopt strings for translation

537 + + i18n: column: mark parseopt strings for translation

538 + + i18n: clone: mark parseopt strings for translation

539 + + i18n: clean: mark parseopt strings for translation

540 + + i18n: cherry: mark parseopt strings for translation

541 + + i18n: checkout: mark parseopt strings for translation

542 + + i18n: checkout-index: mark parseopt strings for translation

543 + + i18n: check-attr: mark parseopt strings for translation

544 + + i18n: cat-file: mark parseopt strings for translation

545 + + i18n: branch: mark parseopt strings for translation

546 + + i18n: blame: mark parseopt strings for translation

547 + + i18n: add: mark parseopt strings for translation

548 + + i18n: bisect--helper: mark parseopt strings for translation

549 + + i18n: archive: mark parseopt strings for translation

550 + + i18n: mark "style" in OPT_COLUMN() for translation

551

552 A lot of i18n mark-up for the help text from "git <cmd> -h".

553

451 -Will merge to 'next'.

554 +Will merge to 'master' as part of the fourth batch.

555

556 * tr/maint-parseopt-avoid-empty (2012-08-20) 1 commit

454 - - gettext: do not translate empty string

557 + (merged to 'next' on 2012-08-24 at cffa9a0)

558 + + gettext: do not translate empty string

559

456 -A workaround to avoid doing _(""), which translates to magic string

457 -in the .po files.

560 +A workaround to avoid doing _(""), which translates to unwanted

561 +magic string in the .po files.

562

459 -Will merge to 'next'.

563 +Will merge to 'master' as part of the fourth batch.

564

565 * jk/config-warn-on-inaccessible-paths (2012-08-21) 4 commits

462 - - warn_on_inaccessible(): a helper to warn on inaccessible paths

463 - - attr: warn on inaccessible attribute files

464 - - gitignore: report access errors of exclude files

465 - - config: warn on inaccessible files

566 + (merged to 'next' on 2012-08-24 at 7470bd6)

567 + + warn_on_inaccessible(): a helper to warn on inaccessible paths

568 + + attr: warn on inaccessible attribute files

569 + + gitignore: report access errors of exclude files

570 + + config: warn on inaccessible files

571

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

573 them because they do not exist, but unable to read existing ones

574 need to be diagnosed.

575

471 -Will merge to 'next'.

576 +Will merge to 'master' as part of the fourth batch.

577

473 -* nd/i18n-poison-test-updates (2012-08-21) 6 commits

578 +* nd/i18n-poison-test-updates (2012-08-27) 7 commits

579 - Fix tests under GETTEXT_POISON on parseopt

580 + - Fix tests under GETTEXT_POISON on git-remote

581 - Fix tests under GETTEXT_POISON on pack-object

582 - Fix tests under GETTEXT_POISON on git-apply

583 - Fix tests under GETTEXT_POISON on diffstat

@@ -479,6 +585,9 @@ Will merge to 'next'.

585 - Fix tests under GETTEXT_POISON on relative dates

586

587 Updates to tests that can be broken with gettext-poison builds.

588 +Queued with trivial fix-ups.

589 +

590 +Will merge to 'next'.

591

592 * jc/daemon-access-hook (2012-08-15) 1 commit

593 (merged to 'next' on 2012-08-20 at c8f5b2e)

@@ -502,6 +611,7 @@ Will merge to 'master' as part of the third batch.

611 * ef/win32-cred-helper (2012-08-16) 1 commit

612 (merged to 'next' on 2012-08-20 at bd5c651)

613 + contrib: add win32 credential-helper

614 + (this branch is used by ph/credential-refactor.)

615

616 Credential helper for Win32 to allow access to the keychain of

617 the logged-in user.

@@ -544,19 +654,6 @@ As the title says.

654

655 Will merge to 'master' as part of the second batch.

656

547 -* bc/receive-pack-stdout-protection (2012-08-06) 2 commits

548 - (merged to 'next' on 2012-08-20 at b1b0d18)

549 - + receive-pack: do not leak output from auto-gc to standard output

550 - + t/t5400: demonstrate breakage caused by informational message from prune

551 -

552 -(Originally merged to 'next' on 2012-08-07)

553 -

554 -When "git push" triggered the automatic gc on the receiving end, a

555 -message from "git prune" that said it was removing cruft leaked to

556 -the standard output, breaking the communication protocol.

557 -

558 -Will merge to 'master' as part of the second batch.

559 -

657 * bc/prune-info (2012-08-07) 1 commit

658 (merged to 'next' on 2012-08-20 at 1bc9e66)

659 + prune.c: only print informational message in show_only or verbose mode

@@ -565,18 +662,6 @@ Teach "git prune" without "-v" to be silent about leftover temporary files.

662

663 Will merge to 'master' as part of the second batch.

664

568 -* jk/docs-docbook-monospace-display (2012-08-07) 1 commit

569 - (merged to 'next' on 2012-08-20 at 0ed30dc)

570 - + docs: monospace listings in docbook output

571 -

572 -(Originally merged to 'next' on 2012-08-18)

573 -

574 -The documentation in the TeXinfo format was using indented output

575 -for materials meant to be examples that are better typeset in

576 -monospace.

577 -

578 -Will merge to 'master' as part of the second batch.

579 -

665 * jc/maint-protect-sh-from-ifs (2012-08-08) 1 commit

666 (merged to 'next' on 2012-08-20 at 8b00562)

667 + sh-setup: protect from exported IFS

@@ -615,20 +700,25 @@ not advertise that they are available. Fix fetch-pack not to do so.

700 Will merge to 'master' as part of the second batch.

701

702 * pw/p4-use-client-spec-branch-detection (2012-08-20) 5 commits

618 - - git p4: make branch detection work with --use-client-spec

619 - - git p4: do wildcard decoding in stripRepoPath

620 - - git p4: set self.branchPrefixes in initialization

621 - - git p4 test: add broken --use-client-spec --detect-branches tests

622 - - git p4 test: move client_view() function to library

703 + (merged to 'next' on 2012-08-24 at 08abc61)

704 + + git p4: make branch detection work with --use-client-spec

705 + + git p4: do wildcard decoding in stripRepoPath

706 + + git p4: set self.branchPrefixes in initialization

707 + + git p4 test: add broken --use-client-spec --detect-branches tests

708 + + git p4 test: move client_view() function to library

709 +

710 +Fixes "git p4" when "--use-client-spec" and "--detect-branches" are

711 +used together (the command used to misdetect branches).

712

624 -Will merge to 'next' and soon to 'master'.

713 +Will merge to 'master' as part of the fourth batch.

714

715 * jc/maint-push-refs-all (2012-08-07) 2 commits

716 - get_fetch_map(): tighten checks on dest refs

717 - fetch/push: allow refs/*:refs/*

718

719 Allows pushing and fetching refs/stash.

631 -Need to send it out to the list for review.

720 +

721 +Will merge to 'next'.

722

723 * jk/version-string (2012-08-10) 3 commits

724 (merged to 'next' on 2012-08-20 at 6d207bb)

@@ -646,28 +736,6 @@ understands it.

736

737 Will merge to 'master' as part of the third batch.

738

649 -* js/grep-patterntype-config (2012-08-03) 1 commit

650 - (merged to 'next' on 2012-08-20 at 39a0431)

651 - + grep: add a grep.patternType configuration setting

652 -

653 -(Originally merged to 'next' on 2012-08-09)

654 -

655 -"grep" learned to use a non-standard pattern type by default if a

656 -configuration variable tells it to.

657 -

658 -Will merge to 'master' as part of the second batch.

659 -

660 -* ab/diff-write-incomplete-line (2012-08-05) 1 commit

661 - (merged to 'next' on 2012-08-20 at e28b804)

662 - + Fix '\ No newline...' annotation in rewrite diffs

663 -

664 -(Originally merged to 'next' on 2012-08-07)

665 -

666 -The output from "git diff -B" for a file that ends with an

667 -incomplete line did not put "\ No newline..." on a line of its own.

668 -

669 -Will merge to 'master' as part of the second batch.

670 -

739 * tg/index-v5 (2012-08-17) 13 commits

740 - p0002-index.sh: add perf test for the index formats

741 - update-index.c: rewrite index when index-version is given

@@ -709,23 +777,6 @@ silently proceed.

777

778 Will merge to 'master' as part of the third batch.

779

712 -* jc/maint-t7406-rev-parse-max-count-huh (2012-07-30) 1 commit

713 - (merged to 'next' on 2012-08-20 at 3e2598a)

714 - + t7406: fix misleading "rev-parse --max-count=1 HEAD"

715 -

716 -(Originally merged to 'next' on 2012-07-30)

717 -

718 -Test clean-up, with no behaviour change.

719 -Will merge to 'master' as part of the second batch.

720 -

721 -* jk/maint-diff-nul40-as-sentinel (2012-07-29) 1 commit

722 - + diff: do not use null sha1 as a sentinel value

723 - (this branch is used by jk/maint-null-in-trees.)

724 -

725 -"git diff" had a confusion between taking data from a path in the

726 -working tree and taking data from an object that happens to have

727 -name 0{40} recorded in a tree.

728 -

780 * mz/cherry-code-cleanup (2012-07-29) 3 commits

781 (merged to 'next' on 2012-08-20 at bfb0457)

782 + cherry: remove redundant check for merge commit

@@ -749,70 +800,23 @@ status for a case that was documented, and introduce a new code for

800

801 Will merge to 'master' as part of the third batch.

802

752 -* jk/maint-null-in-trees (2012-07-29) 2 commits

753 - (merged to 'next' on 2012-08-20 at 5bc2c49)

754 - + fsck: detect null sha1 in tree entries

755 - + do not write null sha1s to on-disk index

756 - (this branch uses jk/maint-diff-nul40-as-sentinel.)

757 -

758 -(Originally merged to 'next' on 2012-07-30)

759 -

760 -We do not want a link to 0{40} object stored anywhere in our objects.

761 -

762 -Will merge to 'master' as part of the second batch.

763 -

764 -* sz/submodule-force-update (2012-07-25) 1 commit

765 - - Make 'git submodule update --force' always check out submodules.

766 -

767 -We may want a documentation update and a few tests.

768 -

769 -Kicked back to 'pu'.

770 -

771 -* da/difftool-updates (2012-08-21) 13 commits

772 - (merged to 'next' on 2012-08-21 at 332afe4)

773 - + difftool: silence warning

774 - (merged to 'next' on 2012-08-20 at 2fecd90)

775 - + Add Code Compare v2.80.4 as a merge / diff tool for Windows

776 - + mergetool,difftool: Document --tool-help consistently

777 - + difftool: Disable --symlinks on cygwin

778 - + difftool: Handle compare() returning -1

779 - + difftool: Wrap long lines for readability

780 - + difftool: Check all return codes from compare()

781 - + difftool: Handle finding mergetools/ in a path with spaces

782 - + difftool: Use symlinks when diffing against the worktree

783 - + difftool: Call the temp directory "git-difftool"

784 - + difftool: Move option values into a hash

785 - + difftool: Eliminate global variables

786 - + difftool: Simplify print_tool_help()

787 -

788 -(Originally merged to 'next' on 2012-08-10)

803 +* sz/submodule-force-update (2012-08-24) 1 commit

804 + (merged to 'next' on 2012-08-24 at f82b466)

805 + + Make 'git submodule update --force' always check out submodules.

806

790 -"git difftool --dir-diff" learned to use symbolic links to prepare

791 -temporary copy of the working tree when available.

807 +"git submodule update --force" used to leave the working tree of the

808 +submodule intact when there were local changes. It is more intiutive

809 +to make "--force" a sign to run "checkout -f" to overwrite them.

810

793 -Will merge to 'master' as part of the second batch.

811 +Will merge to 'master' as part of the third batch.

812

813 * jk/no-more-pre-exec-callback (2012-06-05) 1 commit

814 - pager: drop "wait for output to run less" hack

815

816 (Originally merged to 'next' on 2012-07-23)

817

800 -Will defer until the end of the 2012,

801 -waiting for older "less" to go extinct.

802 -

803 -* mm/push-default-switch-warning (2012-06-24) 1 commit

804 - (merged to 'next' on 2012-08-20 at 553e6c0)

805 - + push: start warning upcoming default change for push.default

806 -

807 -(Originally merged to 'next' on 2012-06-26)

808 -

809 -In the next major release, we will switch "git push [$there]" that

810 -does not say what to push from the traditional "matching" to the

811 -updated "simple" semantics, that pushes the current branch to the

812 -branch with the same name only when the current branch is set to

813 -integrate with that remote branch (all other cases will error out).

814 -

815 -Will merge to 'master' as part of the second batch.

818 +Will defer until the end of the 2012.

819 +while waiting for older "less" to go extinct.

820

821 --------------------------------------------------

822 [Discarded]

What's cooking (2012/08 #08)