579173e26a · matheusbsbs/matheus-bagliano

@@ -1,19 +1,18 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Mar 2014, #02; Tue, 11)

4 -X-master-at: 384364b5f1aa0c3b7610a1b3c9eca2c210e61b41

5 -X-next-at: d838d6f000d8078a1e28d6780f767cb925fb2632

3 +Subject: What's cooking in git.git (Mar 2014, #03; Fri, 14)

4 +X-master-at: 00eda23228acb68c85a76f977f4e59f82189ce3f

5 +X-next-at: 169382a66e8adc06d7eb542d356ad22244051e6d

6

7 -What's cooking in git.git (Mar 2014, #02; Tue, 11)

7 +What's cooking in git.git (Mar 2014, #03; Fri, 14)

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

9

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

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 -Topics that have been cooking in 'next' for 2.0 have been merged to

15 -'master', which means we are committed to make the next one a big

16 -release. Kind of scary, isn't it?

14 +More topics merged to 'master', some of which have been cooking

15 +before the v1.9.0 final release.

16

17 You can find the changes described here in the integration branches

18 of the repositories listed at

@@ -23,222 +22,336 @@ of the repositories listed at

22 --------------------------------------------------

23 [Graduated to "master"]

24

26 -* cc/starts-n-ends-with-endgame (2013-12-05) 1 commit

27 - (merged to 'next' on 2014-02-25 at 473e143)

28 - + strbuf: remove prefixcmp() and suffixcmp()

25 +* ak/gitweb-fit-image (2014-02-20) 1 commit

26 + (merged to 'next' on 2014-03-06 at ba8cb50)

27 + + gitweb: Avoid overflowing page body frame with large images

28 +

29 + Instead of allowing an <img> to be shown in whatever size, force

30 + scaling it to fit on the page with max-height/max-width css style

31 + attributes.

32

30 - Originally merged to 'next' on 2014-01-07

33

32 - Endgame for the cc/starts-n-ends-with topic; this needs to be

33 - evil-merged with other topics that introduce new uses of

34 - prefix/suffix-cmp functions.

34 +* da/difftool-git-files (2014-03-05) 2 commits

35 + (merged to 'next' on 2014-03-06 at a563ec1)

36 + + t7800: add a difftool test for .git-files

37 + + difftool: support repositories with .git-files

38

39 + "git difftool" misbehaved when the repository is bound to the

40 + working tree with the ".git file" mechanism, where a textual

41 + file ".git" tells us where it is.

42

37 -* gj/push-more-verbose-advice (2013-11-13) 1 commit

38 - (merged to 'next' on 2014-02-25 at 1cd10b0)

39 - + push: switch default from "matching" to "simple"

43

41 - Originally merged to 'next' on 2013-11-21

44 +* jc/check-attr-honor-working-tree (2014-02-06) 2 commits

45 + (merged to 'next' on 2014-03-06 at 960d679)

46 + + check-attr: move to the top of working tree when in non-bare repository

47 + + t0003: do not chdir the whole test process

48

43 - Explain 'simple' and 'matching' in "git push" advice message; the

44 - topmost patch is a rebase of jc/push-2.0-default-to-simple on top

45 - of it.

49 + "git check-attr" when (trying to) work on a repository with a

50 + working tree did not work well when the working tree was specified

51 + via --work-tree (and obviously with --git-dir).

52

53 + The command also works in a bare repository but it reads from the

54 + (possibly stale, irrelevant and/or nonexistent) index, which may

55 + need to be fixed to read from HEAD, but that is a completely

56 + separate issue. As a related tangent to this separate issue, we

57 + may want to also fix "check-ignore", which refuses to work in a

58 + bare repository, to also operate in a bare one.

59

48 -* jc/add-2.0-ignore-removal (2013-04-22) 1 commit

49 - (merged to 'next' on 2014-02-25 at a0d018a)

50 - + git add <pathspec>... defaults to "-A"

60

52 - Originally merged to 'next' on 2013-12-06

61 +* jh/note-trees-record-blobs (2014-02-20) 1 commit

62 + (merged to 'next' on 2014-03-06 at f46852d)

63 + + notes: disallow reusing non-blob as a note object

64

54 - Updated endgame for "git add <pathspec>" that defaults to "--all"

55 - aka "--no-ignore-removal".

65 + "git notes -C <blob>" should not take an object that is not a blob.

66

67

58 -* jc/core-checkstat-2.0 (2013-05-06) 1 commit

59 - (merged to 'next' on 2014-02-25 at 62f6aeb)

60 - + core.statinfo: remove as promised in Git 2.0

68 +* jk/commit-dates-parsing-fix (2014-03-07) 6 commits

69 + (merged to 'next' on 2014-03-07 at 01e9d92)

70 + + show_ident_date: fix tz range check

71 + (merged to 'next' on 2014-03-06 at dd641e2)

72 + + log: do not segfault on gmtime errors

73 + + log: handle integer overflow in timestamps

74 + + date: check date overflow against time_t

75 + + fsck: report integer overflow in author timestamps

76 + + t4212: test bogus timestamps with git-log

77

62 - Originally merged to 'next' on 2013-12-06

78 + Codepaths that parse timestamps in commit objects have been

79 + tightened.

80

81

65 -* jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit

66 - (merged to 'next' on 2014-02-25 at ccfff88)

67 - + diff: remove "diff-files -q" in a version of Git in a distant future

82 +* jk/doc-coding-guideline (2014-02-28) 1 commit

83 + (merged to 'next' on 2014-03-06 at c33101d)

84 + + CodingGuidelines: mention C whitespace rules

85

69 - Originally merged to 'next' on 2013-12-06

86 + Elaborate on a style niggle that has been part of "mimic existing

87 + code".

88

71 - Remove deprecated "-q" option "git diff-files".

89

90 +* jk/http-no-curl-easy (2014-02-18) 1 commit

91 + (merged to 'next' on 2014-03-06 at 56d3f6f)

92 + + http: never use curl_easy_perform

93

74 -* jc/push-2.0-default-to-simple (2013-06-18) 1 commit

75 - (merged to 'next' on 2014-02-25 at 1f0e178)

76 - + push: switch default from "matching" to "simple"

94 + Uses of curl's "multi" interface and "easy" interface do not mix

95 + well when we attempt to reuse outgoing connections. Teach the RPC

96 + over http code, used in the smart HTTP transport, not to use the

97 + "easy" interface.

98

78 - Originally merged to 'next' on 2013-12-06

99

100 +* jk/janitorial-fixes (2014-02-18) 5 commits

101 + (merged to 'next' on 2014-03-06 at dac2de6)

102 + + open_istream(): do not dereference NULL in the error case

103 + + builtin/mv: don't use memory after free

104 + + utf8: use correct type for values in interval table

105 + + utf8: fix iconv error detection

106 + + notes-utils: handle boolean notes.rewritemode correctly

107

81 -* jk/run-network-tests-by-default (2014-02-14) 1 commit

82 - (merged to 'next' on 2014-02-25 at 62a8ad0)

83 - + tests: turn on network daemon tests by default

108

85 - Originally merged to 'next' on 2014-02-20

109 +* jk/remote-pushremote-config-reading (2014-02-24) 1 commit

110 + (merged to 'next' on 2014-03-06 at 9e71ecb)

111 + + remote: handle pushremote config in any order

112

87 - Teach "make test" to run networking tests when possible by default.

113 + "git push" did not pay attention to branch.*.pushremote if it is

114 + defined earlier than remote.pushdefault; the order of these two

115 + variables in the configuration file should not matter, but it did

116 + by mistake.

117

118

90 -* jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit

91 - (merged to 'next' on 2014-02-25 at 9e5c0d2)

92 - + git add: -u/-A now affects the entire working tree

119 +* jl/doc-submodule-update-checkout (2014-02-28) 1 commit

120 + (merged to 'next' on 2014-03-06 at 8cdf5cb)

121 + + submodule update: consistently document the '--checkout' option

122

94 - Originally merged to 'next' on 2013-12-06

123 + Add missing documentation for "submodule update --checkout".

124

125

97 -* ks/combine-diff (2014-02-24) 6 commits

98 - (merged to 'next' on 2014-02-25 at 69e5a87)

99 - + tests: add checking that combine-diff emits only correct paths

100 - + combine-diff: simplify intersect_paths() further

101 - + combine-diff: combine_diff_path.len is not needed anymore

102 - + combine-diff: optimize combine_diff_path sets intersection

103 - + diff test: add tests for combine-diff with orderfile

104 - + diffcore-order: export generic ordering interface

105 - (this branch is used by ks/tree-diff-nway.)

126 +* jm/stash-doc-k-for-keep (2014-02-24) 1 commit

127 + (merged to 'next' on 2014-03-06 at ddd8e48)

128 + + stash doc: mention short form -k in save description

129

107 - Originally merged to 'next' on 2014-02-20

130

109 - Teach combine-diff to honour the path-output-order imposed by

110 - diffcore-order, and optimize how matching paths are found in

111 - the N-way diffs made with parents.

131 +* jn/am-doc-hooks (2014-02-24) 1 commit

132 + (merged to 'next' on 2014-03-06 at 5c1c372)

133 + + am doc: add a pointer to relevant hooks

134

135

114 -* nd/daemonize-gc (2014-02-10) 2 commits

115 - (merged to 'next' on 2014-02-25 at f592335)

116 - + gc: config option for running --auto in background

117 - + daemon: move daemonize() to libgit.a

136 +* jn/bisect-coding-style (2014-03-03) 1 commit

137 + (merged to 'next' on 2014-03-06 at e1de2a5)

138 + + git-bisect.sh: fix a few style issues

139

119 - Originally merged to 'next' on 2014-02-20

140

121 - Allow running "gc --auto" in the background.

141 +* ks/config-file-stdin (2014-02-18) 4 commits

142 + (merged to 'next' on 2014-03-06 at 3e77313)

143 + + config: teach "git config --file -" to read from the standard input

144 + + config: change git_config_with_options() interface

145 + + builtin/config.c: rename check_blob_write() -> check_write()

146 + + config: disallow relative include paths from blobs

147

123 ---------------------------------------------------

124 -[New Topics]

148 + "git config" learned to read from the standard input when "-" is

149 + given as the value to its "--file" parameter (attempting an

150 + operation to update the configuration in the standard input of

151 + course is rejected).

152

126 -* jk/detect-push-typo-early (2014-03-05) 3 commits

127 - - push: detect local refspec errors early

128 - - match_explicit_lhs: allow a "verify only" mode

129 - - match_explicit: hoist refspec lhs checks into their own function

153

131 - Catch "git push $there no-such-branch" early.

154 +* lb/contrib-contacts-looser-diff-parsing (2014-02-18) 1 commit

155 + (merged to 'next' on 2014-03-06 at 1cc4ffe)

156 + + git-contacts: do not fail parsing of good diffs

157

133 - Will merge to 'next'.

158

159 +* mh/object-code-cleanup (2014-02-24) 4 commits

160 + (merged to 'next' on 2014-03-06 at d6b3867)

161 + + sha1_file.c: document a bunch of functions defined in the file

162 + + sha1_file_name(): declare to return a const string

163 + + find_pack_entry(): document last_found_pack

164 + + replace_object: use struct members instead of an array

165

136 -* jk/diff-funcname-cpp-regex (2014-03-05) 1 commit

137 - - diff: simplify cpp funcname regex

166

139 - Has the discussion settled on this?

167 +* mh/replace-refs-variable-rename (2014-02-28) 3 commits

168 + (merged to 'next' on 2014-03-06 at 70bf89b)

169 + + Document some functions defined in object.c

170 + + Add docstrings for lookup_replace_object() and do_lookup_replace_object()

171 + + rename read_replace_refs to check_replace_refs

172

173

142 -* jk/doc-deprecate-grafts (2014-03-05) 1 commit

143 - - docs: mark info/grafts as outdated

174 +* nd/gitignore-trailing-whitespace (2014-03-11) 3 commits

175 + (merged to 'next' on 2014-03-11 at ccdba51)

176 + + t0008: skip trailing space test on Windows

177 + (merged to 'next' on 2014-03-06 at f649a34)

178 + + dir: ignore trailing spaces in exclude patterns

179 + + dir: warn about trailing spaces in exclude patterns

180

145 - Will merge to 'next'.

181 + Trailing whitespaces in .gitignore files, unless they are quoted

182 + for fnmatch(3), e.g. "path\ ", are warned and ignored. Strictly

183 + speaking, this is a backward incompatible change, but very unlikely

184 + to bite any sane user and adjusting should be obvious and easy.

185

186

148 -* rm/strchrnul-not-strlen (2014-03-10) 1 commit

149 - - use strchrnul() in place of strchr() and strlen()

187 +* nd/i18n-progress (2014-02-24) 1 commit

188 + (merged to 'next' on 2014-03-06 at 600fd3e)

189 + + i18n: mark all progress lines for translation

190

151 - Will merge to 'next'.

191 + The progress indicators from various time-consuming commands have

192 + been marked for i18n/l10n.

193

194

154 -* sh/use-hashcpy (2014-03-06) 1 commit

155 - - Use hashcpy() when copying object names

195 +* nd/no-more-fnmatch (2014-02-20) 4 commits

196 + (merged to 'next' on 2014-03-06 at f0b8f12)

197 + + actually remove compat fnmatch source code

198 + + stop using fnmatch (either native or compat)

199 + + Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch"

200 + + use wildmatch() directly without fnmatch() wrapper

201

157 - Will merge to 'next'.

202 + We started using wildmatch() in place of fnmatch(3); complete the

203 + process and stop using fnmatch(3).

204

205

160 -* jc/no-need-for-env-in-sh-scripts (2014-03-06) 1 commit

161 - - *.sh: drop useless use of "env"

206 +* nd/reset-setup-worktree (2014-02-18) 1 commit

207 + (merged to 'next' on 2014-03-06 at d93f20a)

208 + + reset: optionally setup worktree and refresh index on --mixed

209

163 - Will merge to 'next'.

210 + "git reset" needs to refresh the index when working in a working

211 + tree (it can also be used to match the index to the HEAD in an

212 + otherwise bare repository), but it failed to set up the working

213 + tree properly, causing GIT_WORK_TREE to be ignored.

214

215

166 -* jc/tag-contains-with (2014-03-07) 1 commit

167 - - tag: grok "--with" as synonym to "--contains"

216 +* nd/strbuf-inline-styles (2014-03-03) 1 commit

217 + (merged to 'next' on 2014-03-06 at 70b5e56)

218 + + strbuf: style fix -- top opening bracket on a separate line

219

169 - Will merge to 'next'.

220

221 +* rt/help-pretty-prints-cmd-names (2014-02-28) 1 commit

222 + (merged to 'next' on 2014-03-06 at fc607dc)

223 + + help.c: rename function "pretty_print_string_list"

224

172 -* bp/commit-p-editor (2014-03-11) 8 commits

173 - - run-command: mark run_hook_with_custom_index as deprecated

174 - - merge hook tests: fix and update tests

175 - - merge: fix GIT_EDITOR override for commit hook

176 - - commit: fix patch hunk editing with "commit -p -m"

177 - - SQUASH???

178 - - test patch hunk editing with "commit -p -m"

179 - - merge hook tests: use 'test_must_fail' instead of '!'

180 - - merge hook tests: fix missing '&&' in test

225

226 +* rt/links-for-asciidoctor (2014-02-20) 1 commit

227 + (merged to 'next' on 2014-03-06 at 547f13d)

228 + + Documentation: fix documentation AsciiDoc links for external urls

229

183 -* cp/am-patch-format-doc (2014-03-11) 1 commit

184 - - Documentation/git-am: Document supported --patch-format options

230

186 - Will merge to 'next'.

231 +* sg/archive-restrict-remote (2014-02-28) 2 commits

232 + (merged to 'next' on 2014-03-06 at 5fe8998)

233 + + add uploadarchive.allowUnreachable option

234 + + docs: clarify remote restrictions for git-upload-archive

235

236 + Allow loosening remote "git archive" invocation security check that

237 + refuses to serve tree-ish not at the tip of any ref.

238

189 -* dm/configure-iconv-locale-charset (2014-03-11) 1 commit

190 - - configure.ac: link with -liconv for locale_charset()

239

240 +* sh/write-pack-file-warning-message-fix (2014-03-03) 1 commit

241 + (merged to 'next' on 2014-03-06 at 1470b0a)

242 + + write_pack_file: use correct variable in diagnostic

243 + (this branch is used by sh/finish-tmp-packfile.)

244

193 -* jk/clean-d-pathspec (2014-03-11) 2 commits

194 - - clean: simplify dir/not-dir logic

195 - - clean: respect pathspecs with "-d"

245 + A warning from "git pack-objects" were generated by referring to an

246 + incorrect variable when forming the filename that we had trouble

247 + with.

248

197 - "git clean -d pathspec" did not use pathspec correctly.

249

199 - Will merge to 'next' and later down to 'maint'.

250 +* sr/add--interactive-term-readkey (2014-03-03) 2 commits

251 + (merged to 'next' on 2014-03-06 at 9ca7af8)

252 + + git-add--interactive: warn if module for interactive.singlekey is missing

253 + + git-config: document interactive.singlekey requires Term::ReadKey

254

255

202 -* jk/mv-submodules-fix (2014-03-11) 2 commits

203 - - mv: prevent mismatched data when ignoring errors.

204 - - builtin/mv: fix out of bounds write

256 +* ss/completion-rec-sub-fetch-push (2014-02-11) 1 commit

257 + (merged to 'next' on 2014-03-06 at b5bf463)

258 + + completion: teach --recurse-submodules to fetch, pull and push

259

206 - Needs tests.

260

261 +* ta/parse-commit-with-skip-prefix (2014-03-04) 1 commit

262 + (merged to 'next' on 2014-03-06 at 0244988)

263 + + commit.c: use skip_prefix() instead of starts_with()

264

209 -* nd/upload-pack-shallow (2014-03-11) 1 commit

210 - - upload-pack: send shallow info over stdin to pack-objects

265 +

266 +* tg/index-v4-format (2014-02-24) 3 commits

267 + (merged to 'next' on 2014-03-06 at d4ca5a8)

268 + + read-cache: add index.version config variable

269 + + test-lib: allow setting the index format version

270 + + introduce GIT_INDEX_VERSION environment variable

271 +

272 +

273 +* tr/diff-submodule-no-reuse-worktree (2014-02-18) 1 commit

274 + (merged to 'next' on 2014-03-06 at ac8008f)

275 + + diff: do not reuse_worktree_file for submodules

276 +

277 + "git diff --external-diff" incorrectly fed the submodule directory

278 + in the working tree to the external diff driver when it knew it is

279 + the same as one of the versions being compared.

280 +

281 +--------------------------------------------------

282 +[New Topics]

283 +

284 +* jn/wt-status (2014-03-12) 4 commits

285 + (merged to 'next' on 2014-03-14 at 8ac862c)

286 + + wt-status: lift the artificual "at least 20 columns" floor

287 + + wt-status: i18n of section labels

288 + + wt-status: extract the code to compute width for labels

289 + + wt-status: make full label string to be subject to l10n

290 +

291 + Unify the codepaths that format new/modified/changed sections and

292 + conflicted paths in the "git status" output and make it possible to

293 + properly internationalize their output.

294 +

295 + Will merge to 'master'.

296 +

297 +

298 +* es/sh-i18n-envsubst (2014-03-12) 1 commit

299 + (merged to 'next' on 2014-03-14 at e4d5603)

300 + + sh-i18n--envsubst: retire unused string_list_member()

301 +

302 + Will merge to 'master'.

303 +

304 +

305 +* mh/remove-subtree-long-pathname-fix (2014-03-13) 2 commits

306 + - entry.c: fix possible buffer overflow in remove_subtree()

307 + - checkout_entry(): use the strbuf throughout the function

308

309 Will merge to 'next'.

310

311

215 -* rs/grep-h-c (2014-03-11) 2 commits

216 - - grep: support -h (no header) with --count

217 - - t7810: add missing variables to tests in loop

312 +* nd/indent-fix-connect-c (2014-03-13) 1 commit

313 + - connect.c: SP after "}", not TAB

314

219 - "git grep" learns to handle combination of "-h (no header)" and "-c

220 - (counts)".

315 + Will merge to 'next'.

316 +

317 +

318 +* pw/branch-config-message (2014-03-13) 1 commit

319 + - install_branch_config(): simplify verbose messages logic

320 +

321 + Among the many attempts to microproject #8, this seemed to be the

322 + most "done" among the table based ones; I however tend to think

323 + that the original with minimum refactoring would be easier to read.

324 +

325 +

326 +* ys/fsck-commit-parsing (2014-03-13) 2 commits

327 + - fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant

328 + - fsck.c:fsck_ident(): ident points at a const string

329 +

330 +

331 +* jk/warn-on-object-refname-ambiguity (2014-03-13) 4 commits

332 + - rev-list: disable object/refname ambiguity check with --stdin

333 + - cat-file: restore warn_on_object_refname_ambiguity flag

334 + - cat-file: fix a minor memory leak in batch_objects

335 + - cat-file: refactor error handling of batch_objects

336

337 Will merge to 'next'.

338

339 --------------------------------------------------

340 [Stalled]

341

227 -* ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit

228 - - remote-hg: do not fail on invalid bookmarks

342 +* bc/blame-crlf-test (2014-02-18) 1 commit

343 + - blame: add a failing test for a CRLF issue.

344

230 - Reported to break tests ($gmane/240005)

231 - Expecting a reroll.

345 + I have a feeling that a fix for this should be fairly isolated and

346 + trivial (it should be just the matter of paying attention to the

347 + crlf settings when synthesizing the fake commit)---perhaps somebody

348 + can squash in a fix to this?

349

350

234 -* jk/warn-on-object-refname-ambiguity (2014-01-09) 6 commits

235 - - get_sha1: drop object/refname ambiguity flag

236 - - get_sha1: speed up ambiguous 40-hex test

237 - - FIXUP: teach DO_FOR_EACH_NO_RECURSE to prime_ref_dir()

238 - - refs: teach for_each_ref a flag to avoid recursion

239 - - cat-file: fix a minor memory leak in batch_objects

240 - - cat-file: refactor error handling of batch_objects

351 +* ap/remote-hg-skip-null-bookmarks (2014-01-02) 1 commit

352 + - remote-hg: do not fail on invalid bookmarks

353

354 + Reported to break tests ($gmane/240005)

355 Expecting a reroll.

356

357

@@ -509,363 +622,285 @@ of the repositories listed at

622 --------------------------------------------------

623 [Cooking]

624

512 -* jc/stash-pop-not-popped (2014-02-26) 1 commit

513 - - stash pop: mention we did not drop the stash upon failing to apply

625 +* jk/detect-push-typo-early (2014-03-05) 3 commits

626 + (merged to 'next' on 2014-03-12 at da522e7)

627 + + push: detect local refspec errors early

628 + + match_explicit_lhs: allow a "verify only" mode

629 + + match_explicit: hoist refspec lhs checks into their own function

630

515 - "stash pop", upon failing to apply the stash, refrains from

516 - discarding the stash to avoid information loss. Be more explicit

517 - in the error message.

631 + Catch "git push $there no-such-branch" early.

632

519 - The wording may want to get a bit more bikeshedding, but otherwise

520 - it should be OK for 'next'.

633 + Will merge to 'master'.

634

635

523 -* bg/install-branch-config-skip-prefix (2014-03-06) 2 commits

524 - - branch: use skip_prefix() in install_branch_config()

525 - - t3200-branch: test setting branch as own upstream

636 +* jk/diff-funcname-cpp-regex (2014-03-05) 1 commit

637 + - diff: simplify cpp funcname regex

638

527 - Will merge to 'next'.

639 + Has the discussion settled on this?

640

641

530 -* cn/fetch-prune-overlapping-destination (2014-02-28) 2 commits

531 - - fetch: handle overlaping refspecs on --prune

532 - - fetch: add a failing test for prunning with overlapping refspecs

642 +* jk/doc-deprecate-grafts (2014-03-05) 1 commit

643 + (merged to 'next' on 2014-03-12 at 8d34916)

644 + + docs: mark info/grafts as outdated

645

534 - Protect refs in a hierarchy that can come from more than one remote

535 - hierarcies from incorrect removal by "git fetch --prune".

536 -

537 - Comments?

538 -

539 -

540 -* dd/find-graft-with-sha1-pos (2014-02-27) 1 commit

541 - - commit.c: use the generic "sha1_pos" function for lookup

542 -

543 - Replace a hand-rolled binary search with a call to our generic

544 - binary search helper function.

545 -

546 - Will merge to 'next'.

547 -

548 -

549 -* dd/use-alloc-grow (2014-03-03) 14 commits

550 - - sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()

551 - - read-cache.c: use ALLOC_GROW() in add_index_entry()

552 - - builtin/mktree.c: use ALLOC_GROW() in append_to_tree()

553 - - attr.c: use ALLOC_GROW() in handle_attr_line()

554 - - dir.c: use ALLOC_GROW() in create_simplify()

555 - - reflog-walk.c: use ALLOC_GROW()

556 - - replace_object.c: use ALLOC_GROW() in register_replace_object()

557 - - patch-ids.c: use ALLOC_GROW() in add_commit()

558 - - diffcore-rename.c: use ALLOC_GROW()

559 - - diff.c: use ALLOC_GROW()

560 - - commit.c: use ALLOC_GROW() in register_commit_graft()

561 - - cache-tree.c: use ALLOC_GROW() in find_subtree()

562 - - bundle.c: use ALLOC_GROW() in add_to_ref_list()

563 - - builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()

646 + Will merge to 'master'.

647

565 - Replace open-coded reallocation with ALLOC_GROW() macro.

648

567 - Will merge to 'next'.

649 +* rm/strchrnul-not-strlen (2014-03-10) 1 commit

650 + (merged to 'next' on 2014-03-12 at fad8f12)

651 + + use strchrnul() in place of strchr() and strlen()

652

653 + Will merge to 'master'.

654

570 -* dk/skip-prefix-scan-only-once (2014-03-03) 1 commit

571 - - skip_prefix(): scan prefix only once

655

573 - Updaste implementation of skip_prefix() to scan only once; given

574 - that most "prefix" arguments to the inline function are constant

575 - strings whose strlen() can be determined at the compile time, this

576 - might actually make things worse with a compiler with sufficient

577 - intelligence.

656 +* sh/use-hashcpy (2014-03-06) 1 commit

657 + (merged to 'next' on 2014-03-12 at cf2735a)

658 + + Use hashcpy() when copying object names

659

660 + Will merge to 'master'.

661

580 -* jk/doc-coding-guideline (2014-02-28) 1 commit

581 - (merged to 'next' on 2014-03-06 at c33101d)

582 - + CodingGuidelines: mention C whitespace rules

662

584 - Elaborate on a style niggle that has been part of "mimic existing

585 - code".

663 +* jc/no-need-for-env-in-sh-scripts (2014-03-06) 1 commit

664 + (merged to 'next' on 2014-03-12 at dfd3234)

665 + + *.sh: drop useless use of "env"

666

667 Will merge to 'master'.

668

669

590 -* jk/shallow-update-fix (2014-02-27) 2 commits

591 - - shallow: automatically clean up shallow tempfiles

592 - - shallow: use stat_validity to check for up-to-date file

670 +* jc/tag-contains-with (2014-03-07) 1 commit

671 + (merged to 'next' on 2014-03-12 at e120644)

672 + + tag: grok "--with" as synonym to "--contains"

673

594 - Serving objects from a shallow repository needs to write a

595 - temporary file to be used, but the serving upload-pack may not have

596 - write access to the repository which is meant to be read-only.

674 + Will merge to 'master'.

675

598 - Will merge to 'next'.

676

677 +* bp/commit-p-editor (2014-03-11) 8 commits

678 + - run-command: mark run_hook_with_custom_index as deprecated

679 + - merge hook tests: fix and update tests

680 + - merge: fix GIT_EDITOR override for commit hook

681 + - commit: fix patch hunk editing with "commit -p -m"

682 + - SQUASH???

683 + - test patch hunk editing with "commit -p -m"

684 + - merge hook tests: use 'test_must_fail' instead of '!'

685 + - merge hook tests: fix missing '&&' in test

686

601 -* jl/doc-submodule-update-checkout (2014-02-28) 1 commit

602 - (merged to 'next' on 2014-03-06 at 8cdf5cb)

603 - + submodule update: consistently document the '--checkout' option

687

605 - Add missing documentation for "submodule update --checkout".

688 +* cp/am-patch-format-doc (2014-03-11) 1 commit

689 + (merged to 'next' on 2014-03-12 at 17c3ada)

690 + + Documentation/git-am: Document supported --patch-format options

691

692 Will merge to 'master'.

693

694

610 -* jn/bisect-coding-style (2014-03-03) 1 commit

611 - (merged to 'next' on 2014-03-06 at e1de2a5)

612 - + git-bisect.sh: fix a few style issues

695 +* dm/configure-iconv-locale-charset (2014-03-11) 1 commit

696 + - configure.ac: link with -liconv for locale_charset()

697

614 - Will merge to 'master'.

698

699 +* jk/clean-d-pathspec (2014-03-11) 2 commits

700 + (merged to 'next' on 2014-03-12 at aaae6ee)

701 + + clean: simplify dir/not-dir logic

702 + + clean: respect pathspecs with "-d"

703

617 -* jn/branch-lift-unnecessary-name-length-limit (2014-03-05) 1 commit

618 - - branch.c: delete size check of newly tracked branch names

704 + "git clean -d pathspec" did not use the given pathspec correctly

705 + and ended up cleaning too much.

706

620 - Will merge to 'next'.

707 + Will merge to 'master' and then later to 'maint'.

708

709

623 -* mh/simplify-cache-tree-find (2014-03-05) 6 commits

624 - - cache_tree_find(): use path variable when passing over slashes

625 - - cache_tree_find(): remove early return

626 - - cache_tree_find(): remove redundant check

627 - - cache_tree_find(): fix comment formatting

628 - - cache_tree_find(): find the end of path component using strchrnul()

629 - - cache_tree_find(): remove redundant checks

710 +* jk/mv-submodules-fix (2014-03-11) 2 commits

711 + - mv: prevent mismatched data when ignoring errors.

712 + - builtin/mv: fix out of bounds write

713

631 - Will merge to 'next'.

714 + Needs tests.

715

716

634 -* nd/strbuf-inline-styles (2014-03-03) 1 commit

635 - (merged to 'next' on 2014-03-06 at 70b5e56)

636 - + strbuf: style fix -- top opening bracket on a separate line

717 +* nd/upload-pack-shallow (2014-03-11) 1 commit

718 + (merged to 'next' on 2014-03-14 at d40b8c3)

719 + + upload-pack: send shallow info over stdin to pack-objects

720

721 Will merge to 'master'.

722

723

641 -* nd/tag-version-sort (2014-02-27) 1 commit

642 - - tag: support --sort=<spec>

643 -

644 - Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output.

645 -

646 - Will merge to 'next'.

647 -

724 +* rs/grep-h-c (2014-03-11) 2 commits

725 + (merged to 'next' on 2014-03-12 at 0341bd8)

726 + + grep: support -h (no header) with --count

727 + + t7810: add missing variables to tests in loop

728

649 -* rt/help-pretty-prints-cmd-names (2014-02-28) 1 commit

650 - (merged to 'next' on 2014-03-06 at fc607dc)

651 - + help.c: rename function "pretty_print_string_list"

729 + "git grep" learns to handle combination of "-h (no header)" and "-c

730 + (counts)".

731

732 Will merge to 'master'.

733

734

656 -* sg/archive-restrict-remote (2014-02-28) 2 commits

657 - (merged to 'next' on 2014-03-06 at 5fe8998)

658 - + add uploadarchive.allowUnreachable option

659 - + docs: clarify remote restrictions for git-upload-archive

660 -

661 - Allow loosening remote "git archive" invocation security check that

662 - refuses to serve tree-ish not at the tip of any ref.

735 +* jc/stash-pop-not-popped (2014-02-26) 1 commit

736 + (merged to 'next' on 2014-03-14 at 9ba1de8)

737 + + stash pop: mention we did not drop the stash upon failing to apply

738

664 - Will merge to 'master'.

739 + "stash pop", upon failing to apply the stash, refrains from

740 + discarding the stash to avoid information loss. Be more explicit

741 + in the error message.

742

743 + The wording may want to get a bit more bikeshedding.

744

667 -* sh/finish-tmp-packfile (2014-03-03) 2 commits

668 - - finish_tmp_packfile():use strbuf for pathname construction

669 - - Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile

670 - (this branch uses sh/write-pack-file-warning-message-fix.)

745 + Will merge to 'master'.

746

672 - Will merge to 'next'.

747

748 +* bg/install-branch-config-skip-prefix (2014-03-06) 2 commits

749 + (merged to 'next' on 2014-03-12 at 9d04564)

750 + + branch: use skip_prefix() in install_branch_config()

751 + + t3200-branch: test setting branch as own upstream

752

675 -* sh/write-pack-file-warning-message-fix (2014-03-03) 1 commit

676 - (merged to 'next' on 2014-03-06 at 1470b0a)

677 - + write_pack_file: use correct variable in diagnostic

678 - (this branch is used by sh/finish-tmp-packfile.)

753 + Will merge to 'master'.

754

680 - A warning from "git pack-objects" were generated by referring to an

681 - incorrect variable when forming the filename that we had trouble

682 - with.

755

684 - Will merge to 'master'.

756 +* cn/fetch-prune-overlapping-destination (2014-02-28) 2 commits

757 + - fetch: handle overlaping refspecs on --prune

758 + - fetch: add a failing test for prunning with overlapping refspecs

759

760 + Protect refs in a hierarchy that can come from more than one remote

761 + hierarcies from incorrect removal by "git fetch --prune".

762

687 -* sr/add--interactive-term-readkey (2014-03-03) 2 commits

688 - (merged to 'next' on 2014-03-06 at 9ca7af8)

689 - + git-add--interactive: warn if module for interactive.singlekey is missing

690 - + git-config: document interactive.singlekey requires Term::ReadKey

763 + Comments?

764

692 - Will merge to 'master'.

765

766 +* dd/find-graft-with-sha1-pos (2014-02-27) 1 commit

767 + (merged to 'next' on 2014-03-12 at 0383d59)

768 + + commit.c: use the generic "sha1_pos" function for lookup

769

695 -* ta/parse-commit-with-skip-prefix (2014-03-04) 1 commit

696 - (merged to 'next' on 2014-03-06 at 0244988)

697 - + commit.c: use skip_prefix() instead of starts_with()

770 + Replace a hand-rolled binary search with a call to our generic

771 + binary search helper function.

772

773 Will merge to 'master'.

774

775

702 -* ak/gitweb-fit-image (2014-02-20) 1 commit

703 - (merged to 'next' on 2014-03-06 at ba8cb50)

704 - + gitweb: Avoid overflowing page body frame with large images

776 +* dd/use-alloc-grow (2014-03-03) 14 commits

777 + (merged to 'next' on 2014-03-12 at ed82259)

778 + + sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()

779 + + read-cache.c: use ALLOC_GROW() in add_index_entry()

780 + + builtin/mktree.c: use ALLOC_GROW() in append_to_tree()

781 + + attr.c: use ALLOC_GROW() in handle_attr_line()

782 + + dir.c: use ALLOC_GROW() in create_simplify()

783 + + reflog-walk.c: use ALLOC_GROW()

784 + + replace_object.c: use ALLOC_GROW() in register_replace_object()

785 + + patch-ids.c: use ALLOC_GROW() in add_commit()

786 + + diffcore-rename.c: use ALLOC_GROW()

787 + + diff.c: use ALLOC_GROW()

788 + + commit.c: use ALLOC_GROW() in register_commit_graft()

789 + + cache-tree.c: use ALLOC_GROW() in find_subtree()

790 + + bundle.c: use ALLOC_GROW() in add_to_ref_list()

791 + + builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()

792

706 - Instead of allowing an <img> to be shown in whatever size, force

707 - scaling it to fit on the page with max-height/max-width css style

708 - attributes.

793 + Replace open-coded reallocation with ALLOC_GROW() macro.

794

795 Will merge to 'master'.

796

797

713 -* da/difftool-git-files (2014-03-05) 2 commits

714 - (merged to 'next' on 2014-03-06 at a563ec1)

715 - + t7800: add a difftool test for .git-files

716 - + difftool: support repositories with .git-files

798 +* dk/skip-prefix-scan-only-once (2014-03-03) 1 commit

799 + (merged to 'next' on 2014-03-14 at ff375fc)

800 + + skip_prefix(): scan prefix only once

801

718 - "git difftool" misbehaved when the repository is bound to the

719 - working tree with the ".git file" mechanism, where a textual

720 - file ".git" tells us where it is.

802 + Update implementation of skip_prefix() to scan only once; given

803 + that most "prefix" arguments to the inline function are constant

804 + strings whose strlen() can be determined at the compile time, this

805 + might actually make things worse with a compiler with sufficient

806 + intelligence.

807

808 Will merge to 'master'.

809

810

725 -* jk/commit-dates-parsing-fix (2014-03-07) 6 commits

726 - (merged to 'next' on 2014-03-07 at 01e9d92)

727 - + show_ident_date: fix tz range check

728 - (merged to 'next' on 2014-03-06 at dd641e2)

729 - + log: do not segfault on gmtime errors

730 - + log: handle integer overflow in timestamps

731 - + date: check date overflow against time_t

732 - + fsck: report integer overflow in author timestamps

733 - + t4212: test bogus timestamps with git-log

811 +* jk/shallow-update-fix (2014-02-27) 2 commits

812 + (merged to 'next' on 2014-03-12 at ce5abbf)

813 + + shallow: automatically clean up shallow tempfiles

814 + + shallow: use stat_validity to check for up-to-date file

815 +

816 + Serving objects from a shallow repository needs to write a

817 + temporary file to be used, but the serving upload-pack may not have

818 + write access to the repository which is meant to be read-only.

819

820 Will merge to 'master'.

821

822

738 -* jk/diff-filespec-cleanup (2014-02-24) 1 commit

739 - - diffcore.h: be explicit about the signedness of is_binary

823 +* jn/branch-lift-unnecessary-name-length-limit (2014-03-05) 1 commit

824 + (merged to 'next' on 2014-03-12 at bd0fb0e)

825 + + branch.c: delete size check of newly tracked branch names

826

741 - Will merge to 'next' and then to 'master' and 'maint'.

827 + Will merge to 'master'.

828

829

744 -* jk/remote-pushremote-config-reading (2014-02-24) 1 commit

745 - (merged to 'next' on 2014-03-06 at 9e71ecb)

746 - + remote: handle pushremote config in any order

830 +* mh/simplify-cache-tree-find (2014-03-05) 6 commits

831 + (merged to 'next' on 2014-03-12 at c29aa24)

832 + + cache_tree_find(): use path variable when passing over slashes

833 + + cache_tree_find(): remove early return

834 + + cache_tree_find(): remove redundant check

835 + + cache_tree_find(): fix comment formatting

836 + + cache_tree_find(): find the end of path component using strchrnul()

837 + + cache_tree_find(): remove redundant checks

838

839 Will merge to 'master'.

840

841

751 -* jk/repack-pack-keep-objects (2014-03-03) 1 commit

752 - - repack: add `repack.packKeptObjects` config var

753 -

754 - Will merge to 'next'.

755 -

842 +* nd/tag-version-sort (2014-02-27) 1 commit

843 + (merged to 'next' on 2014-03-14 at 4e7f714)

844 + + tag: support --sort=<spec>

845

757 -* jm/stash-doc-k-for-keep (2014-02-24) 1 commit

758 - (merged to 'next' on 2014-03-06 at ddd8e48)

759 - + stash doc: mention short form -k in save description

846 + Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output.

847

848 Will merge to 'master'.

849

850

764 -* jn/am-doc-hooks (2014-02-24) 1 commit

765 - (merged to 'next' on 2014-03-06 at 5c1c372)

766 - + am doc: add a pointer to relevant hooks

851 +* sh/finish-tmp-packfile (2014-03-03) 2 commits

852 + (merged to 'next' on 2014-03-12 at 410d45d)

853 + + finish_tmp_packfile():use strbuf for pathname construction

854 + + Merge branch 'sh/write-pack-file-warning-message-fix' into sh/finish-tmp-packfile

855

856 Will merge to 'master'.

857

858

771 -* mh/object-code-cleanup (2014-02-24) 4 commits

772 - (merged to 'next' on 2014-03-06 at d6b3867)

773 - + sha1_file.c: document a bunch of functions defined in the file

774 - + sha1_file_name(): declare to return a const string

775 - + find_pack_entry(): document last_found_pack

776 - + replace_object: use struct members instead of an array

859 +* jk/diff-filespec-cleanup (2014-02-24) 1 commit

860 + (merged to 'next' on 2014-03-12 at 184c2aa)

861 + + diffcore.h: be explicit about the signedness of is_binary

862

778 - Will merge to 'master'.

863 + Portability fix to a topic already in v1.9

864

865 + Will merge to 'master' and then later to 'maint'.

866

781 -* nd/i18n-progress (2014-02-24) 1 commit

782 - (merged to 'next' on 2014-03-06 at 600fd3e)

783 - + i18n: mark all progress lines for translation

867 +

868 +* jk/repack-pack-keep-objects (2014-03-03) 1 commit

869 + (merged to 'next' on 2014-03-12 at 3fd2335)

870 + + repack: add `repack.packKeptObjects` config var

871

872 Will merge to 'master'.

873

874

875 * nd/sha1-file-delta-stack-leakage-fix (2014-02-24) 1 commit

789 - - sha1_file: fix delta_stack memory leak in unpack_entry

876 + (merged to 'next' on 2014-03-12 at 9d1a621)

877 + + sha1_file: fix delta_stack memory leak in unpack_entry

878

791 - Will merge to 'next' and then to 'master' and 'maint'.

879 + Fix a small leak in the delta stack used when resolving a long

880 + delta chain at runtime.

881

882 + Will merge to 'master' and then later to 'maint'.

883

794 -* tc/commit-dry-run-exit-status-tests (2014-02-24) 1 commit

795 - - demonstrate git-commit --dry-run exit code behaviour

884

797 - Will merge to 'next'.

885 +* tc/commit-dry-run-exit-status-tests (2014-02-24) 1 commit

886 + (merged to 'next' on 2014-03-12 at b839886)

887 + + demonstrate git-commit --dry-run exit code behaviour

888

889

890 * fc/transport-helper-fixes (2014-02-24) 7 commits

801 - - remote-bzr: support the new 'force' option

802 - - test-hg.sh: tests are now expected to pass

803 - - transport-helper.c: do not overwrite forced bit

804 - - transport-helper: check for 'forced update' message

805 - - transport-helper: add 'force' to 'export' helpers

806 - - transport-helper: don't update refs in dry-run

807 - - transport-helper: mismerge fix

891 + (merged to 'next' on 2014-03-12 at 5d7c69a)

892 + + remote-bzr: support the new 'force' option

893 + + test-hg.sh: tests are now expected to pass

894 + + transport-helper.c: do not overwrite forced bit

895 + + transport-helper: check for 'forced update' message

896 + + transport-helper: add 'force' to 'export' helpers

897 + + transport-helper: don't update refs in dry-run

898 + + transport-helper: mismerge fix

899

900 Updates transport-helper, fast-import and fast-export to allow the

901 ref mapping and ref deletion in a way similar to the natively

902 supported transports.

903

813 - Will merge to 'next'.

814 -

815 -

816 -* bc/blame-crlf-test (2014-02-18) 1 commit

817 - - blame: add a failing test for a CRLF issue.

818 -

819 - I have a feeling that a fix for this should be fairly isolated and

820 - trivial (it should be just the matter of paying attention to the

821 - crlf settings when synthesizing the fake commit)---perhaps somebody

822 - can squash in a fix to this?

823 -

824 -

825 -* jk/http-no-curl-easy (2014-02-18) 1 commit

826 - (merged to 'next' on 2014-03-06 at 56d3f6f)

827 - + http: never use curl_easy_perform

828 -

829 - Avoid use of the curl-easy family of functions, which interferes

830 - with connection reuse in a negative way.

831 -

832 - Will merge to 'master' and then to 'maint'.

833 -

834 -

835 -* jk/janitorial-fixes (2014-02-18) 5 commits

836 - (merged to 'next' on 2014-03-06 at dac2de6)

837 - + open_istream(): do not dereference NULL in the error case

838 - + builtin/mv: don't use memory after free

839 - + utf8: use correct type for values in interval table

840 - + utf8: fix iconv error detection

841 - + notes-utils: handle boolean notes.rewritemode correctly

842 -

843 - Will merge to 'master'.

844 -

845 -

846 -* ks/config-file-stdin (2014-02-18) 4 commits

847 - (merged to 'next' on 2014-03-06 at 3e77313)

848 - + config: teach "git config --file -" to read from the standard input

849 - + config: change git_config_with_options() interface

850 - + builtin/config.c: rename check_blob_write() -> check_write()

851 - + config: disallow relative include paths from blobs

852 -

853 - Will merge to 'master'.

854 -

855 -

856 -* lb/contrib-contacts-looser-diff-parsing (2014-02-18) 1 commit

857 - (merged to 'next' on 2014-03-06 at 1cc4ffe)

858 - + git-contacts: do not fail parsing of good diffs

859 -

860 - Will merge to 'master'.

861 -

862 -

863 -* mh/replace-refs-variable-rename (2014-02-28) 3 commits

864 - (merged to 'next' on 2014-03-06 at 70bf89b)

865 - + Document some functions defined in object.c

866 - + Add docstrings for lookup_replace_object() and do_lookup_replace_object()

867 - + rename read_replace_refs to check_replace_refs

868 -

904 Will merge to 'master'.

905

906

@@ -879,31 +914,6 @@ of the repositories listed at

914 Will merge to 'next'.

915

916

882 -* nd/no-more-fnmatch (2014-02-20) 4 commits

883 - (merged to 'next' on 2014-03-06 at f0b8f12)

884 - + actually remove compat fnmatch source code

885 - + stop using fnmatch (either native or compat)

886 - + Revert "test-wildmatch: add "perf" command to compare wildmatch and fnmatch"

887 - + use wildmatch() directly without fnmatch() wrapper

888 -

889 - We started using wildmatch() in place of fnmatch(3); complete the

890 - process and stop using fnmatch(3).

891 -

892 - Will merge to 'master'.

893 -

894 -

895 -* nd/reset-setup-worktree (2014-02-18) 1 commit

896 - (merged to 'next' on 2014-03-06 at d93f20a)

897 - + reset: optionally setup worktree and refresh index on --mixed

898 -

899 - "git reset" needs to refresh the index when working in a working

900 - tree (it can also be used to match the index to the HEAD in an

901 - otherwise bare repository), but it failed to set up the working

902 - tree properly, causing GIT_WORK_TREE to be ignored.

903 -

904 - Will merge to 'master'.

905 -

906 -

917 * po/git-help-user-manual (2014-02-18) 1 commit

918 - Provide a 'git help user-manual' route to the docbook

919

@@ -912,33 +922,6 @@ of the repositories listed at

922 Will discard.

923

924

915 -* rt/links-for-asciidoctor (2014-02-20) 1 commit

916 - (merged to 'next' on 2014-03-06 at 547f13d)

917 - + Documentation: fix documentation AsciiDoc links for external urls

918 -

919 - Will merge to 'master'.

920 -

921 -

922 -* tg/index-v4-format (2014-02-24) 3 commits

923 - (merged to 'next' on 2014-03-06 at d4ca5a8)

924 - + read-cache: add index.version config variable

925 - + test-lib: allow setting the index format version

926 - + introduce GIT_INDEX_VERSION environment variable

927 -

928 - Will merge to 'master'.

929 -

930 -

931 -* tr/diff-submodule-no-reuse-worktree (2014-02-18) 1 commit

932 - (merged to 'next' on 2014-03-06 at ac8008f)

933 - + diff: do not reuse_worktree_file for submodules

934 -

935 - "git diff --external-diff" incorrectly fed the submodule directory

936 - in the working tree to the external diff driver when it knew it is

937 - the same as one of the versions being compared.

938 -

939 - Will merge to 'master'.

940 -

941 -

925 * nd/multiple-work-trees (2014-03-06) 28 commits

926 - FIXUP: minimum compilation fix

927 - count-objects: report unused files in $GIT_DIR/repos/...

@@ -1001,61 +984,13 @@ of the repositories listed at

984 2-way diff-tree, which is very nice.

985

986

1004 -* nd/gitignore-trailing-whitespace (2014-03-11) 3 commits

1005 - (merged to 'next' on 2014-03-11 at ccdba51)

1006 - + t0008: skip trailing space test on Windows

1007 - (merged to 'next' on 2014-03-06 at f649a34)

1008 - + dir: ignore trailing spaces in exclude patterns

1009 - + dir: warn about trailing spaces in exclude patterns

1010 -

1011 - Warn and then ignore trailing whitespaces in .gitignore files,

1012 - unless they are quoted for fnmatch(3), e.g. "path\ ".

1013 -

1014 - Will merge to 'master'.

1015 -

1016 -

987 * nd/log-show-linear-break (2014-02-10) 1 commit

988 - log: add --show-linear-break to help see non-linear history

989

990 Attempts to show where a single-strand-of-pearls break in "git log"

991 output.

992

1023 - Will merge to 'next'.

1024 -

1025 -

1026 -* ss/completion-rec-sub-fetch-push (2014-02-11) 1 commit

1027 - (merged to 'next' on 2014-03-06 at b5bf463)

1028 - + completion: teach --recurse-submodules to fetch, pull and push

1029 -

1030 - Will merge to 'master'.

1031 -

1032 -

1033 -* jh/note-trees-record-blobs (2014-02-20) 1 commit

1034 - (merged to 'next' on 2014-03-06 at f46852d)

1035 - + notes: disallow reusing non-blob as a note object

1036 -

1037 - "git notes -C <blob>" should not take an object that is not a blob.

1038 -

1039 - Will merge to 'master'.

1040 -

1041 -

1042 -* jc/check-attr-honor-working-tree (2014-02-06) 2 commits

1043 - (merged to 'next' on 2014-03-06 at 960d679)

1044 - + check-attr: move to the top of working tree when in non-bare repository

1045 - + t0003: do not chdir the whole test process

1046 -

1047 - "git check-attr" when (trying to) work on a repository with a

1048 - working tree did not work well when the working tree was specified

1049 - via --work-tree (and obviously with --git-dir).

1050 -

1051 - The command also works in a bare repository but it reads from the

1052 - (possibly stale, irrelevant and/or nonexistent) index, which may

1053 - need to be fixed to read from HEAD, but that is a completely

1054 - separate issue. As a related tangent to this separate issue, we

1055 - may want to also fix "check-ignore", which refuses to work in a

1056 - bare repository, to also operate in a bare one.

1057 -

1058 - Will merge to 'master'.

993 + Will hold.

994

995

996 * tr/remerge-diff (2014-02-26) 5 commits

@@ -1075,14 +1010,15 @@ of the repositories listed at

1010 'master'.

1011

1012

1078 -* lt/request-pull (2014-02-25) 5 commits

1013 +* lt/request-pull (2014-03-13) 6 commits

1014 + - request-pull: documentation updates

1015 - request-pull: resurrect "pretty refname" feature

1016 - request-pull: test updates

1017 - request-pull: pick up tag message as before

1018 - request-pull: allow "local:remote" to specify names on both ends

1019 - request-pull: more strictly match local/remote branches

1020

1085 - Needs doc update but otherwise it should be ready for 'next'.

1021 + Will merge to 'next'.

1022

1023

1024 * cc/interpret-trailers (2014-03-07) 11 commits

What's cooking (2014/03 #03)