c4dd9b196c · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

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

4 -X-master-at: 00eda23228acb68c85a76f977f4e59f82189ce3f

5 -X-next-at: 169382a66e8adc06d7eb542d356ad22244051e6d

3 +Subject: What's cooking in git.git (Mar 2014, #04; Thu, 20)

4 +X-master-at: 5172cb3bcb2c7e1a609e34cfae64e3b181e0226a

5 +X-next-at: 4443bfdcdf4b1e25b48040987632afd841c9b636

6

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

7 +What's cooking in git.git (Mar 2014, #04; Thu, 20)

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

9

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

@@ -12,7 +12,9 @@ Here are the topics that have been cooking. Commits prefixed with

12 '+' are in 'next'.

13

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

15 -before the v1.9.0 final release.

15 +before the v1.9.0 final release, many of them fallouts from GSoC

16 +microprojects. Many topics that have been marked to be discarded

17 +are finally discarded.

18

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

20 of the repositories listed at

@@ -22,319 +24,280 @@ of the repositories listed at

24 --------------------------------------------------

25 [Graduated to "master"]

26

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 -

33 -

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.

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

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

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

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

31

32

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

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

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

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

36

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).

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

38 + binary search helper function.

39

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.

40

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

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

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

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

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

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

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

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

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

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

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

52 + + diff.c: use ALLOC_GROW()

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

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

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

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

57

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

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

59

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

60

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

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

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

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

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

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

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

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

69 + + transport-helper: mismerge fix

70

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

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

72 + ref mapping and ref deletion in a way similar to the natively

73 + supported transports.

74

78 - Codepaths that parse timestamps in commit objects have been

79 - tightened.

75

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

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

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

79

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

80

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

87 - code".

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

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

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

84

85

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

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

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

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

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

90

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.

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

92 + and ended up cleaning too much.

93

94

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

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

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

97 + + push: detect local refspec errors early

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

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

100

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

102

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

103

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.

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

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

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

107

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

109

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

110

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

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

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

113 + + docs: mark info/grafts as outdated

114

115

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

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

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

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

119

120

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

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

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

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

124

125

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

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

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

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

129 + + cache_tree_find(): remove early return

130 + + cache_tree_find(): remove redundant check

131 + + cache_tree_find(): fix comment formatting

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

133 + + cache_tree_find(): remove redundant checks

134

135

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

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

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

138 + + sha1_file: fix delta_stack memory leak in unpack_entry

139

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).

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

141 + delta chain at runtime.

142

143

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

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

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

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

147

148

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

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

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

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

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

153

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

155 + (counts)".

156

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

157

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

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

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

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

162

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

163

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.

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

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

166 + + Use hashcpy() when copying object names

167

168

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

169 +--------------------------------------------------

170 +[New Topics]

171

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

192 - been marked for i18n/l10n.

172 +* jk/lib-terminal-lazy (2014-03-14) 1 commit

173 + (merged to 'next' on 2014-03-20 at 5de832f)

174 + + t/lib-terminal: make TTY a lazy prerequisite

175

176 + The test helper lib-terminal always run an actual test_expect_* when

177 + included, which screwed up with the use of skil-all that may have to

178 + be done later.

179

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

180 + Will merge to 'master'.

181

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

203 - process and stop using fnmatch(3).

182

183 +* ah/doc-gitk-config (2014-03-20) 1 commit

184 + (merged to 'next' on 2014-03-20 at d671b60)

185 + + Documentation/gitk: document the location of the configulation file

186

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

187 + Will merge to 'master'.

188

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.

189

190 +* as/grep-fullname-config (2014-03-20) 1 commit

191 + - grep: add grep.fullName config variable

192

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

193

194 +* fr/add-interactive-argv-array (2014-03-18) 1 commit

195 + (merged to 'next' on 2014-03-20 at 9d65f3d)

196 + + add: use struct argv_array in run_add_interactive()

197

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"

198 + Will merge to 'master'.

199

200

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

201 +* jk/pack-bitmap (2014-03-17) 1 commit

202 + (merged to 'next' on 2014-03-20 at bba6246)

203 + + pack-objects: turn off bitmaps when skipping objects

204

205 + Instead of dying when asked to (re)pack with the reachability

206 + bitmap when a bitmap cannot be built, just (re)pack without

207 + producing a bitmap in such a case, with a warning.

208

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

209 + Will merge to 'master', and probably to 'maint' later.

210

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

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

211

212 +* jk/pack-bitmap-progress (2014-03-17) 2 commits

213 + (merged to 'next' on 2014-03-20 at c7a83f9)

214 + + pack-objects: show reused packfile objects in "Counting objects"

215 + + pack-objects: show progress for reused packfiles

216

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.)

217 + The progress output while repacking and transferring objects showed

218 + an apparent large silence while writing the objects out of existing

219 + packfiles, when the reachability bitmap was in use.

220

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.

221 + Will merge to 'master', and probably to 'maint' later.

222

223

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

224 +* jk/subtree-prefix (2014-03-17) 1 commit

225 + (merged to 'next' on 2014-03-20 at 81367fa)

226 + + subtree: initialize "prefix" variable

227

228 + A stray environment variable $prefix could have leaked into and

229 + affected the behaviour of the "subtree" script.

230

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

231 + Will merge to 'master'.

232

233

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()

234 +* nd/gc-aggressive (2014-03-17) 4 commits

235 + - gc --aggressive: three phase repacking

236 + - gc --aggressive: make --depth configurable

237 + - pack-objects: support --keep

238 + - environment.c: fix constness for odb_pack_keep()

239

240

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

241 +* nd/index-pack-error-message (2014-03-17) 1 commit

242 + (merged to 'next' on 2014-03-20 at 4d722ac)

243 + + index-pack: report error using the correct variable

244

245 + Will merge to 'master'.

246

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

247

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.

248 +* rr/doc-merge-strategies (2014-03-17) 1 commit

249 + (merged to 'next' on 2014-03-20 at d31f415)

250 + + Documentation/merge-strategies: avoid hyphenated commands

251

281 ---------------------------------------------------

282 -[New Topics]

252 + Will merge to 'master'.

253

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

254

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.

255 +* us/printf-not-echo (2014-03-18) 2 commits

256 + (merged to 'next' on 2014-03-20 at 41205c8)

257 + + test-lib.sh: do not "echo" caller-supplied strings

258 + + rebase -i: do not "echo" random user-supplied strings

259

260 Will merge to 'master'.

261

262

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()

263 +* bb/diff-no-index-dotdot (2014-03-19) 2 commits

264 + (merged to 'next' on 2014-03-20 at 352f48c)

265 + + diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()

266 + + diff-no-index: rename read_directory()

267

268 Will merge to 'master'.

269

270

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

271 +* bg/rebase-off-of-previous-branch (2014-03-19) 1 commit

272 + - rebase: allow "-" short-hand for the previous branch

273

274 Will merge to 'next'.

275

276

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

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

277 +* dt/tests-with-env-not-subshell (2014-03-19) 1 commit

278 + - tests: use "env" to run commands with temporary env-var settings

279

315 - Will merge to 'next'.

280

281 +* hs/simplify-bit-setting-in-fsck-tree (2014-03-20) 1 commit

282 + - fsck: use bitwise-or assignment operator to set flag

283

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

319 - - install_branch_config(): simplify verbose messages logic

284

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.

285 +* mm/status-porcelain-format-i18n-fix (2014-03-20) 2 commits

286 + - SQUASH??? fix decl-after-stmt and simplify

287 + - status: disable translation when --porcelain is used

288

289

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

290 +* ss/test-on-mingw-rsync-path-no-absolute (2014-03-19) 1 commit

291 + (merged to 'next' on 2014-03-20 at 2b7b95d)

292 + + t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync

293

294 + Will merge to 'master'.

295

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

296

337 - Will merge to 'next'.

297 +* sz/mingw-index-pack-threaded (2014-03-19) 1 commit

298 + - Enable index-pack threading in msysgit.

299 +

300 + Still under discussion among Windows folks

301

302 --------------------------------------------------

303 [Stalled]

@@ -348,13 +311,6 @@ of the repositories listed at

311 can squash in a fix to this?

312

313

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 -

314 * jk/makefile (2014-02-05) 16 commits

315 - FIXUP

316 - move LESS/LV pager environment to Makefile

@@ -448,29 +404,6 @@ of the repositories listed at

404 This was primarily a RFH ($gmane/239580).

405

406

451 -* fc/completion (2013-12-09) 1 commit

452 - - completion: fix completion of certain aliases

453 -

454 - SZEDER Gábor noticed that this breaks "git -c var=val alias" and

455 - also suggested a better description of the change.

456 -

457 - Has been stalled for a while without much comments from anybody

458 - interested.

459 -

460 - Will discard.

461 -

462 -

463 -* mo/subtree-split-updates (2013-12-10) 3 commits

464 - - subtree: add --edit option

465 - - subtree: allow --squash and --message with push

466 - - subtree: support split --rejoin --squash

467 -

468 - Has been stalled for a while without much comments from anybody

469 - interested.

470 -

471 - Will discard.

472 -

473 -

407 * hv/submodule-ignore-fix (2013-12-06) 4 commits

408 - disable complete ignorance of submodules for index <-> HEAD diff

409 - always show committed submodules in summary after commit

@@ -490,29 +423,6 @@ of the repositories listed at

423 Waiting for a reroll.

424

425

493 -* jc/create-directories-microopt (2013-11-11) 1 commit

494 - - checkout: most of the time we have good leading directories

495 -

496 - Of unknown value until tested on non-Linux platforms (especially

497 - Windows).

498 -

499 - Will discard.

500 -

501 -

502 -* jt/commit-fixes-footer (2013-10-30) 1 commit

503 - - commit: Add -f, --fixes <commit> option to add Fixes: line

504 -

505 - There is an ongoing discussion around this topic; in general I am

506 - fairly negative on a new feature that is too narrow and prefer a

507 - more generic solution that can be tailored for specific needs, as

508 - many people stated in the thread.

509 -

510 - cc/interpret-trailers could be such a generic solution (although

511 - there don't seem to be much concensus yet).

512 -

513 - Will discard.

514 -

515 -

426 * np/pack-v4 (2013-09-18) 90 commits

427 . packv4-parse.c: add tree offset caching

428 . t1050: replace one instance of show-index with verify-pack

@@ -528,21 +438,6 @@ of the repositories listed at

438 this topic conflicts with.

439

440

531 -* mf/graph-show-root (2013-10-25) 1 commit

532 - . graph.c: mark root commit differently

533 -

534 - In a repository with multiple-roots, "log --graph", especially with

535 - "--oneline", does not give the reader enough visual cue to see

536 - where one line of history ended and a separate history began.

537 -

538 - This is the version that marks the roots 'x' when they would have

539 - been marked as '*'; Keshav Kini suggested an alternative of giving

540 - an extra blank line after every root, which I tend to think is a

541 - better approach to the problem.

542 -

543 - Will discard.

544 -

545 -

441 * tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits

442 - perf-lib: add test_perf_cleanup target

443 - perf-lib: split starting the test from the execution

@@ -553,38 +448,6 @@ of the repositories listed at

448 Will hold.

449

450

556 -* yt/shortened-rename (2013-10-18) 2 commits

557 - - SQUASH??? style fixes and s/omit/shorten/ where appropriate

558 - - diff.c: keep arrow(=>) on show_stats()'s shortened filename part to make rename visible

559 -

560 - Attempts to give more weight on the fact that a filepair represents

561 - a rename than showing substring of the actual path when diffstat

562 - lines are not wide enough.

563 -

564 - I am not sure if that is solving a right problem, though.

565 -

566 - Will discard.

567 -

568 -

569 -* rv/send-email-cache-generated-mid (2013-08-21) 2 commits

570 - - git-send-email: Cache generated message-ids, use them when prompting

571 - - git-send-email: add optional 'choices' parameter to the ask sub

572 -

573 - Will discard.

574 -

575 -

576 -* rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits

577 - - ### DONTMERGE: needs better explanation on what config they need

578 - - pack-refs.c: Add missing call to git_config()

579 - - show-ref.c: Add missing call to git_config()

580 -

581 - The changes themselves are probably good, but it is unclear what

582 - basic setting needs to be read for which exact operation.

583 -

584 - Will discard, tired of waiting for clarification.

585 - $gmane/228294

586 -

587 -

451 * jc/format-patch (2013-04-22) 2 commits

452 - format-patch: --inline-single

453 - format-patch: rename "no_inline" field

@@ -596,20 +459,6 @@ of the repositories listed at

459 parties.

460

461

599 -* jk/gitweb-utf8 (2013-04-08) 4 commits

600 - - gitweb: Fix broken blob action parameters on blob/commitdiff pages

601 - - gitweb: Don't append ';js=(0|1)' to external links

602 - - gitweb: Make feed title valid utf8

603 - - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch

604 -

605 - Various fixes to gitweb.

606 -

607 - Drew Northup volunteered to take a look into this ($gmane/226216)

608 - but nothing seems to have happened since then.

609 -

610 - Will discard.

611 -

612 -

462 * jc/show-branch (2013-06-07) 5 commits

463 - show-branch: use commit slab to represent bitflags of arbitrary width

464 - show-branch.c: remove "all_mask"

@@ -622,70 +471,95 @@ of the repositories listed at

471 --------------------------------------------------

472 [Cooking]

473

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

474 +* ap/remote-hg-skip-null-bookmarks (2014-03-19) 1 commit

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

476

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

477 + Will merge to 'next'.

478

633 - Will merge to 'master'.

479

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

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

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

483 + + wt-status: i18n of section labels

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

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

486

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

637 - - diff: simplify cpp funcname regex

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

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

489 + properly internationalize their output.

490

639 - Has the discussion settled on this?

491 + Will merge to 'master'.

492

493

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

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

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

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

497

498 Will merge to 'master'.

499

500

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()

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

502 + (merged to 'next' on 2014-03-17 at 68cc994)

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

504 + + checkout_entry(): use the strbuf throughout the function

505

506 Will merge to 'master'.

507

508

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

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

510 + (merged to 'next' on 2014-03-17 at a109efc)

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

512

513 Will merge to 'master'.

514

515

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"

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

517 + - install_branch_config(): simplify verbose messages logic

518

667 - Will merge to 'master'.

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

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

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

522

523

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"

524 +* ys/fsck-commit-parsing (2014-03-19) 2 commits

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

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

527 +

528 + Will merge to 'next'.

529 +

530 +

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

532 + (merged to 'next' on 2014-03-17 at 3f8e98e)

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

534 + + cat-file: restore warn_on_object_refname_ambiguity flag

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

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

537

538 Will merge to 'master'.

539

540

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

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

542 + - diff: simplify cpp funcname regex

543 +

544 + It appears that Peff and Hannes agreed to base the final version

545 + not on this one, but Hannes's version.

546 +

547 +

548 +* bp/commit-p-editor (2014-03-18) 7 commits

549 - run-command: mark run_hook_with_custom_index as deprecated

550 - merge hook tests: fix and update tests

551 - merge: fix GIT_EDITOR override for commit hook

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

682 - - SQUASH???

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

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

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

556

557 + Will merge to 'next'.

558 +

559

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

560 +* cp/am-patch-format-doc (2014-03-17) 2 commits

561 + (merged to 'next' on 2014-03-17 at 7437c77)

562 + + Documentation/git-am: typofix

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

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

565

@@ -693,25 +567,18 @@ of the repositories listed at

567

568

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

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

697 -

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 -

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

705 - and ended up cleaning too much.

570 + (merged to 'next' on 2014-03-20 at 4443bfd)

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

572

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

573 + Will merge to 'master'.

574

575

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

576 +* jk/mv-submodules-fix (2014-03-17) 2 commits

577 + (merged to 'next' on 2014-03-17 at 7cae3b1)

578 + + mv: prevent mismatched data when ignoring errors.

579 + + builtin/mv: fix out of bounds write

580

714 - Needs tests.

581 + Will merge to 'master'.

582

583

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

@@ -721,17 +588,6 @@ of the repositories listed at

588 Will merge to 'master'.

589

590

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 -

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

730 - (counts)".

731 -

732 - Will merge to 'master'.

733 -

734 -

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

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

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

@@ -745,14 +601,6 @@ of the repositories listed at

601 Will merge to 'master'.

602

603

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 -

753 - Will merge to 'master'.

754 -

755 -

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

605 - fetch: handle overlaping refspecs on --prune

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

@@ -763,38 +611,6 @@ of the repositories listed at

611 Comments?

612

613

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 -

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 -

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 -

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

794 -

795 - Will merge to 'master'.

796 -

797 -

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

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

616 + skip_prefix(): scan prefix only once

@@ -808,7 +624,9 @@ of the repositories listed at

624 Will merge to 'master'.

625

626

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

627 +* jk/shallow-update-fix (2014-03-17) 3 commits

628 + (merged to 'next' on 2014-03-17 at 011942e)

629 + + shallow: verify shallow file after taking lock

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

631 + shallow: automatically clean up shallow tempfiles

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

@@ -820,25 +638,6 @@ of the repositories listed at

638 Will merge to 'master'.

639

640

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 -

827 - Will merge to 'master'.

828 -

829 -

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 -

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

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

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

@@ -848,82 +647,21 @@ of the repositories listed at

647 Will merge to 'master'.

648

649

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 -

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 -

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

864 -

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

866 -

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

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

877 - + sha1_file: fix delta_stack memory leak in unpack_entry

878 -

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 -

884 -

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

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

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

653

654

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

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 -

904 - Will merge to 'master'.

905 -

906 -

655 * nd/commit-editor-cleanup (2014-02-25) 3 commits

908 - - commit: add --cleanup=scissors

909 - - wt-status.c: move cut-line print code out to wt_status_add_cut_line

910 - - wt-status.c: make cut_line[] const to shrink .data section a bit

656 + (merged to 'next' on 2014-03-17 at 986605d)

657 + + commit: add --cleanup=scissors

658 + + wt-status.c: move cut-line print code out to wt_status_add_cut_line

659 + + wt-status.c: make cut_line[] const to shrink .data section a bit

660

661 "git commit --cleanup=<mode>" learned a new mode, scissors.

662

914 - Will merge to 'next'.

915 -

663

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

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

919 -

920 - I am not sure if this is even needed.

921 -

922 - Will discard.

923 -

924 -

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

926 - - FIXUP: minimum compilation fix

664 +* nd/multiple-work-trees (2014-03-17) 28 commits

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

666 - gc: support prune --repos

667 - gc: style change -- no SP before closing bracket

@@ -941,18 +679,19 @@ of the repositories listed at

679 - git-stash: avoid hardcoding $GIT_DIR/logs/....

680 - *.sh: avoid hardcoding $GIT_DIR/hooks/...

681 - git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

944 - - Add new environment variable $GIT_COMMON_DIR

682 + - $GIT_COMMON_DIR: a new environment variable

683 - commit: use SEQ_DIR instead of hardcoding "sequencer"

684 - fast-import: use git_path() for accessing .git dir instead of get_git_dir()

685 - reflog: avoid constructing .lock path with git_path

686 - *.sh: respect $GIT_INDEX_FILE

949 - - Make git_path() aware of file relocation in $GIT_DIR

687 + - git_path(): be aware of file relocation in $GIT_DIR

688 - path.c: group git_path(), git_pathdup() and strbuf_git_path() together

689 - path.c: rename vsnpath() to do_git_path()

952 - - Convert git_snpath() to strbuf_git_path()

690 + - git_snpath(): retire and replace with strbuf_git_path()

691 + - path.c: make get_pathname() call sites return const char *

692 - path.c: make get_pathname() return strbuf instead of static buffer

693

955 - The series needs a serious review.

694 + Replaced with v5 (with minor fixes already squashed in).

695

696

697 * ks/tree-diff-nway (2014-03-04) 19 commits

@@ -984,13 +723,15 @@ of the repositories listed at

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

724

725

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

726 +* nd/log-show-linear-break (2014-03-20) 2 commits

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

728 + - object.h: centralize object flag allocation

729

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

731 output.

732

993 - Will hold.

733 + The implementation seems to have got worse compared to the previous

734 + round. Will hold.

735

736

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

@@ -1011,14 +752,20 @@ of the repositories listed at

752

753

754 * 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

755 + (merged to 'next' on 2014-03-17 at 21a598d)

756 + + request-pull: documentation updates

757 + + request-pull: resurrect "pretty refname" feature

758 + + request-pull: test updates

759 + + request-pull: pick up tag message as before

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

761 + + request-pull: more strictly match local/remote branches

762 +

763 + Discard the accumulated "heuristics" to guess from which branch the

764 + result wants to be pulled from and make sure what the end user

765 + specified is not second-guessed by "git request-pull", to avoid

766 + mistakes.

767

1021 - Will merge to 'next'.

768 + Will merge to 'master'.

769

770

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

@@ -1038,22 +785,6 @@ of the repositories listed at

785 messages.

786

787

1041 -* bl/blame-full-history (2014-01-14) 1 commit

1042 - - blame: new option --prefer-first to better handle merged cherry-picks

1043 -

1044 - By disabling the tree-same optimization (which is consistent with

1045 - the default behaviour of "git log"-family of commands), make "git

1046 - blame" sometimes produce different result from the original code.

1047 -

1048 - Because the "git blame" output can give result for each line from

1049 - only one lineage of the history, however, this can be only useful

1050 - when you are lucky---unlike "--full-history" of "git log"-family,

1051 - where we can show commits from both lineages of histories with an

1052 - equal weight. See $gmane/240392 for more detailed discussion.

1053 -

1054 - Will discard.

1055 -

1056 -

788 * tr/merge-recursive-index-only (2014-02-05) 3 commits

789 - merge-recursive: -Xindex-only to leave worktree unchanged

790 - merge-recursive: internal flag to avoid touching the worktree

@@ -1061,45 +792,3 @@ of the repositories listed at

792 (this branch is used by tr/remerge-diff.)

793

794 Will hold.

1064 -

1065 ---------------------------------------------------

1066 -[Discarded]

1067 -

1068 -* tb/repack-fix-renames (2014-02-05) 1 commit

1069 - . repack.c: rename a few variables

1070 -

1071 - Perhaps unneeded, as the longer-term plan is to drop the codeblock

1072 - this change touches.

1073 -

1074 -

1075 -* ks/diff-c-with-diff-order (2014-02-03) 5 commits

1076 - . combine-diff: simplify intersect_paths() further

1077 - . combine-diff: combine_diff_path.len is not needed anymore

1078 - . combine-diff: optimize combine_diff_path sets intersection

1079 - . diff test: add tests for combine-diff with orderfile

1080 - . diffcore-order: export generic ordering interface

1081 -

1082 - Now part of ks/combine-diff topic.

1083 -

1084 -

1085 -* ks/tree-diff-more (2014-02-24) 15 commits

1086 - - tree-diff: reuse base str(buf) memory on sub-tree recursion

1087 - - tree-diff: no need to call "full" diff_tree_sha1 from show_path()

1088 - - tree-diff: rework diff_tree interface to be sha1 based

1089 - - tree-diff: remove special-case diff-emitting code for empty-tree cases

1090 - - tree-diff: simplify tree_entry_pathcmp

1091 - - tree-diff: show_path prototype is not needed anymore

1092 - - tree-diff: rename compare_tree_entry -> tree_entry_pathcmp

1093 - - tree-diff: move all action-taking code out of compare_tree_entry()

1094 - - tree-diff: don't assume compare_tree_entry() returns -1,0,1

1095 - - tree-diff: consolidate code for emitting diffs and recursion in one place

1096 - - tree-diff: show_tree() is not needed

1097 - - tree-diff: no need to pass match to skip_uninteresting()

1098 - - tree-diff: no need to manually verify that there is no mode change for a path

1099 - - combine-diff: move changed-paths scanning logic into its own function

1100 - - combine-diff: move show_log_first logic/action out of paths scanning

1101 - (this branch is used by ks/tree-diff-nway; uses ks/combine-diff.)

1102 -

1103 - Code refactoring.

1104 -

1105 - Now part of ks/tree-diff-nway.

What's cooking (2014/03 #04)