65ef6cbb0a · matheusbsbs/matheus-bagliano

@@ -1,145 +1,211 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Aug 2011, #07; Wed, 24)

3 -X-master-at: b7fcd007153b5021ed70ddc0a224127f14601bbc

4 -X-next-at: aa5cf7ba43e1b74c3a0aae0ca2989879d9a46233

2 +Subject: What's cooking in git.git (Sep 2011, #01; Fri, 2)

3 +X-master-at: b32128793de296348a565e8f7c4257ec82208a48

4 +X-next-at: be4d2450c3dc8f2570ac5b51987d355b67eef11a

5

6 -What's cooking in git.git (Aug 2011, #07; Wed, 24)

6 +What's cooking in git.git (Sep 2011, #01; Fri, 2)

7 --------------------------------------------------

8

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

10 only in 'pu' while commits prefixed with '+' are in 'next'.

11

12 +Some of the recent patches are fixes to new feature topics already merged

13 +to "master" and are being fast tracked for 1.7.7-rc1, but otherwise

14 +patches for new features and fixes to longstanding issues will stay in

15 +'pu' or 'next' until the 1.7.7 final.

16 +

17 --------------------------------------------------

13 -[Stalled]

18 +[New Topics]

19

15 -* jk/add-i-hunk-filter (2011-07-27) 5 commits

16 - (merged to 'next' on 2011-08-11 at 8ff9a56)

17 - + add--interactive: add option to autosplit hunks

18 - + add--interactive: allow negatation of hunk filters

19 - + add--interactive: allow hunk filtering on command line

20 - + add--interactive: factor out regex error handling

21 - + add--interactive: refactor patch mode argument processing

20 +* mh/check-ref-format-print-normalize (2011-08-27) 2 commits

21 + (merged to 'next' on 2011-08-30 at e827410)

22 + + Forbid DEL characters in reference names

23 + + check-ref-format --print: Normalize refnames that start with slashes

24

23 -Needs documentation updates.

25 +Will merge to "master".

26

25 -* jh/receive-count-limit (2011-05-23) 10 commits

26 - - receive-pack: Allow server to refuse pushes with too many objects

27 - - pack-objects: Estimate pack size; abort early if pack size limit is exceeded

28 - - send-pack/receive-pack: Allow server to refuse pushing too large packs

29 - - pack-objects: Allow --max-pack-size to be used together with --stdout

30 - - send-pack/receive-pack: Allow server to refuse pushes with too many commits

31 - - pack-objects: Teach new option --max-commit-count, limiting #commits in pack

32 - - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities

33 - - Tighten rules for matching server capabilities in server_supports()

34 - - send-pack: Attempt to retrieve remote status even if pack-objects fails

35 - - Update technical docs to reflect side-band-64k capability in receive-pack

27 +* bk/ancestry-path (2011-08-25) 3 commits

28 + (merged to 'next' on 2011-09-02 at d05ba5d)

29 + + revision: do not include sibling history in --ancestry-path output

30 + + revision: keep track of the end-user input from the command line

31 + + rev-list: Demonstrate breakage with --ancestry-path --all

32

37 -Would need another round to separate per-pack and per-session limits.

33 +The topic came up a bit too late in the cycle.

34 +Will cook for a while.

35

39 -* jm/mergetool-pathspec (2011-06-22) 2 commits

40 - - mergetool: Don't assume paths are unmerged

41 - - mergetool: Add tests for filename with whitespace

36 +* mg/branch-list (2011-08-28) 5 commits

37 + (merged to 'next' on 2011-09-02 at b818eae)

38 + + branch: allow pattern arguments

39 + + branch: introduce --list option

40 + + git-branch: introduce missing long forms for the options

41 + + git-tag: introduce long forms for the options

42 + + t6040: test branch -vv

43

43 -I think this is a good idea, but it probably needs a re-roll.

44 -Cf. $gmane/176254, 176255, 166256

44 +Not urgent; the topic came up a bit too late in the cycle.

45

46 -* jk/generation-numbers (2011-07-14) 7 commits

47 - - limit "contains" traversals based on commit generation

48 - - check commit generation cache validity against grafts

49 - - pretty: support %G to show the generation number of a commit

50 - - commit: add commit_generation function

51 - - add metadata-cache infrastructure

52 - - decorate: allow storing values instead of pointers

53 - - Merge branch 'jk/tag-contains-ab' (early part) into HEAD

46 +* mm/rebase-i-exec-edit (2011-08-26) 2 commits

47 + (merged to 'next' on 2011-09-02 at e75b1b9)

48 + + rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree

49 + + rebase -i: clean error message for --continue after failed exec

50

55 -The initial "tag --contains" de-pessimization without need for generation

56 -numbers is already in; backburnered.

51 +Not urgent; the topic came up a bit too late in the cycle.

52

58 -* sr/transport-helper-fix-rfc (2011-07-19) 2 commits

59 - - t5800: point out that deleting branches does not work

60 - - t5800: document inability to push new branch with old content

53 +* jk/default-attr (2011-08-26) 1 commit

54 + - attr: map builtin userdiff drivers to well-known extensions

55

62 -* po/cygwin-backslash (2011-08-05) 2 commits

63 - - On Cygwin support both UNIX and DOS style path-names

64 - - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep

56 +Not urgent; I fixed up the test breakage just for fun.

57

66 -I think a further refactoring (no, not my suggestion) was offered?

58 +* hv/submodule-merge-search (2011-08-26) 4 commits

59 + - submodule: Search for merges only at end of recursive merge

60 + - allow multiple calls to submodule merge search for the same path

61 + - submodule: Demonstrate known breakage during recursive merge

62 + - push: Don't push a repository with unpushed submodules

63 + (this branch uses fg/submodule-auto-push.)

64

68 ---------------------------------------------------

69 -[Cooking]

65 +Not urgent; the topic came up a bit too late in the cycle.

66 +The bottom one needs to be replaced with a properly written commit log message.

67

71 -* jc/merge-reword (2011-05-25) 1 commit

72 - (merged to 'next' on 2011-08-24 at aa5cf7b)

73 - + merge: reword the final message

68 +* mm/mediawiki-as-a-remote (2011-09-01) 2 commits

69 + - git-remote-mediawiki: allow push to set MediaWiki metadata

70 + - Add a remote helper to interact with mediawiki (fetch & push)

71

75 -Will merge to "master".

72 +Fun.

73 +Not urgent; the topic came up a bit too late in the cycle.

74

77 -* nk/branch-v-abbrev (2011-07-01) 1 commit

78 - (merged to 'next' on 2011-08-24 at e9152cf)

79 - + branch -v: honor core.abbrev

75 +* nd/maint-autofix-tag-in-head (2011-08-26) 3 commits

76 + - Accept tags in HEAD or MERGE_HEAD

77 + - merge: remove global variable head[]

78 + - merge: keep stash[] a local variable

79 +

80 +Probably needs a re-roll to aim a bit higher.

81 +Not urgent; will not be in 1.7.7.

82 +

83 +* bc/unstash-clean-crufts (2011-08-27) 4 commits

84 + (merged to 'next' on 2011-09-02 at 7bfd66f)

85 + + git-stash: remove untracked/ignored directories when stashed

86 + + t/t3905: add missing '&&' linkage

87 + + git-stash.sh: fix typo in error message

88 + + t/t3905: use the name 'actual' for test output, swap arguments to test_cmp

89 +

90 +Not urgent; the topic came up a bit too late in the cycle.

91 +

92 +* cb/maint-ls-files-error-report (2011-08-28) 1 commit

93 + (merged to 'next' on 2011-08-30 at b606e19)

94 + + t3005: do not assume a particular order of stdout and stderr of git-ls-files

95

96 Will merge to "master".

97

83 -* jk/pager-with-external-command (2011-08-19) 1 commit

84 - (merged to 'next' on 2011-08-24 at 083f5da)

85 - + support pager.* for external commands

86 - (this branch is used by jk/pager-with-alias and jk/pager-with-alias; uses jk/color-and-pager.)

98 +* da/make-auto-header-dependencies (2011-08-30) 1 commit

99 + (merged to 'next' on 2011-09-02 at e04a4af)

100 + + Makefile: Improve compiler header dependency check

101 + (this branch uses fk/make-auto-header-dependencies.)

102

88 -Up to this part (but not "alias") the topic looked unconditionally a good

89 -thing to do.

103 +Not urgent; will not be in 1.7.7.

104

91 -Will aim to merge to "master" by -rc1.

105 +* gb/am-hg-patch (2011-08-29) 1 commit

106 + (merged to 'next' on 2011-09-02 at 3edfe4c)

107 + + am: preliminary support for hg patches

108

93 -* fk/use-kwset-pickaxe-grep-f (2011-08-20) 5 commits

94 - (merged to 'next' on 2011-08-23 at 93ba509)

95 - + Use kwset in grep

96 - + Use kwset in pickaxe

97 - + Adapt the kwset code to Git

98 - + Add string search routines from GNU grep

99 - + Add obstack.[ch] from EGLIBC 2.10

109 +Not urgent; the topic came up a bit too late in the cycle.

110

101 -Will aim to merge to "master" by -rc1.

111 +* jc/diff-index-unpack (2011-08-29) 3 commits

112 + (merged to 'next' on 2011-09-02 at 4206bd9)

113 + + diff-index: pass pathspec down to unpack-trees machinery

114 + + unpack-trees: allow pruning with pathspec

115 + + traverse_trees(): allow pruning with pathspec

116

103 -* jc/maint-autofix-tag-in-head (2011-08-19) 1 commit

104 - (merged to 'next' on 2011-08-23 at 18cee02)

105 - + commit: reduce use of redundant global variables

117 +Will cook for a while.

118 +

119 +* jn/remote-helpers-doc (2011-09-01) 3 commits

120 + - (short) documentation for the testgit remote helper

121 + - Documentation/git-remote-helpers: explain how import works with multiple refs

122 + - Documentation/remote-helpers: explain capabilities first

123 +

124 +Not urgent.

125 +

126 +* nm/grep-object-sha1-lock (2011-08-30) 1 commit

127 + (merged to 'next' on 2011-09-02 at 336f57d)

128 + + grep: Fix race condition in delta_base_cache

129 +

130 +Not urgent; the topic came up a bit too late in the cycle.

131 +

132 +* tr/mergetool-valgrind (2011-08-30) 1 commit

133 + (merged to 'next' on 2011-09-02 at f5f2c61)

134 + + Symlink mergetools scriptlets into valgrind wrappers

135 +

136 +Not urgent; the topic came up a bit too late in the cycle.

137 +

138 +* fg/submodule-auto-push (2011-08-20) 1 commit

139 + (merged to 'next' on 2011-08-24 at 398e764)

140 + + push: teach --recurse-submodules the on-demand option

141 + (this branch is used by hv/submodule-merge-search.)

142 +

143 +What the topic aims to achieve may make sense, but the implementation

144 +looked somewhat suboptimal.

145 +

146 +* jc/fetch-verify (2011-09-01) 4 commits

147 + - NEEDSWORK: rev-list --verify-objects: run fsck_objects() on all objects listed

148 + - fetch: verify we have everything we need before updating our ref

149 + - rev-list --verify-object

150 + - list-objects: pass callback data to show_objects()

151 + (this branch uses jc/traverse-commit-list.)

152 +

153 +Make "git fetch" verify what it received a bit more carefully before

154 +updating the refs in the receiving end.

155 +

156 +Not urgent; the topic came up a bit too late in the cycle.

157 +

158 +* rc/histogram-diff (2011-08-31) 1 commit

159 + (merged to 'next' on 2011-09-02 at be4d245)

160 + + xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()

161

162 Will merge to "master".

163

164 +--------------------------------------------------

165 +[Graduated to "master"]

166 +

167 +* ac/describe-dirty-refresh (2011-08-11) 1 commit

168 + (merged to 'next' on 2011-08-23 at b873611)

169 + + describe: Refresh the index when run with --dirty

170 +

171 +* bc/bisect-test-use-shell-path (2011-08-30) 1 commit

172 + (merged to 'next' on 2011-08-30 at c090151)

173 + + t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh

174 +

175 +* bg/t5540-osx-grep (2011-08-28) 1 commit

176 + (merged to 'next' on 2011-08-30 at 894af05)

177 + + t5540-http-test: shorten grep pattern

178 +

179 * bw/doc-repo-layout (2011-08-23) 2 commits

180 (merged to 'next' on 2011-08-24 at 605c730)

181 + Mark http-fetch without -a as deprecated

182 + Documentation: Grammar correction, wording fixes and cleanup

183

114 -Will merge to "master".

115 -

184 * ci/forbid-unwanted-current-branch-update (2011-08-22) 2 commits

185 (merged to 'next' on 2011-08-24 at 1e93b67)

186 + Show interpreted branch name in error messages

187 + Prevent force-updating of the current branch

188

121 -Will aim to merge to "master" by -rc1.

189 +* da/difftool-mergtool-refactor (2011-08-19) 4 commits

190 + (merged to 'next' on 2011-08-23 at a1cc3be)

191 + + mergetools/meld: Use '--output' when available

192 + + mergetool--lib: Refactor tools into separate files

193 + + mergetool--lib: Make style consistent with git

194 + + difftool--helper: Make style consistent with git

195

196 * di/fast-import-blob-tweak (2011-08-22) 2 commits

197 (merged to 'next' on 2011-08-24 at 52eef2a)

198 + fast-import: treat cat-blob as a delta base hint for next blob

199 + fast-import: count and report # of calls to diff_delta in stats

200

128 -Will aim to merge to "master" by -rc1.

129 -

130 -* di/fast-import-tagging (2011-08-23) 2 commits

131 - (merged to 'next' on 2011-08-24 at 67e0937)

132 - + fast-import: allow to tag newly created objects

133 - + fast-import: add tests for tagging blobs

134 -

135 -Will aim to merge to "master" by -rc1.

136 -

201 * di/fast-import-deltified-tree (2011-08-14) 2 commits

202 (merged to 'next' on 2011-08-23 at ee30265)

203 + fast-import: prevent producing bad delta

204 + fast-import: add a test for tree delta base corruption

205

142 -Will aim to merge to "master" by -rc1.

206 +* di/fast-import-doc (2011-08-17) 1 commit

207 + (merged to 'next' on 2011-08-23 at dab4088)

208 + + doc/fast-import: document feature import-marks-if-exists

209

210 * di/fast-import-ident (2011-08-11) 5 commits

211 (merged to 'next' on 2011-08-23 at 9b86391)

@@ -149,55 +215,128 @@ Will aim to merge to "master" by -rc1.

215 + fast-import: don't fail on omitted committer name

216 + fast-import: add input format tests

217

152 -Will aim to merge to "master" by -rc1.

153 -

154 -* di/fast-import-doc (2011-08-17) 1 commit

155 - (merged to 'next' on 2011-08-23 at dab4088)

156 - + doc/fast-import: document feature import-marks-if-exists

218 +* di/fast-import-tagging (2011-08-23) 2 commits

219 + (merged to 'next' on 2011-08-24 at 67e0937)

220 + + fast-import: allow to tag newly created objects

221 + + fast-import: add tests for tagging blobs

222

158 -Will merge to "master".

223 +* di/parse-options-split (2011-08-11) 2 commits

224 + (merged to 'next' on 2011-08-23 at 6cd667f)

225 + + Reduce parse-options.o dependencies

226 + + parse-options: export opterr, optbug

227

160 -* jc/combine-diff-callback (2011-08-20) 1 commit

161 - (merged to 'next' on 2011-08-24 at 9f9b42d)

162 - + combine-diff: support format_callback

163 - (this branch is used by fg/submodule-ff-check-before-push.)

228 +* en/merge-recursive-2 (2011-08-14) 57 commits

229 + (merged to 'next' on 2011-08-23 at ba6ad0d)

230 + + merge-recursive: Don't re-sort a list whose order we depend upon

231 + + merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest

232 + + t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify

233 + + merge-recursive: Avoid unnecessary file rewrites

234 + + t6022: Additional tests checking for unnecessary updates of files

235 + + merge-recursive: Fix spurious 'refusing to lose untracked file...' messages

236 + + t6022: Add testcase for spurious "refusing to lose untracked" messages

237 + + t3030: fix accidental success in symlink rename

238 + + merge-recursive: Fix working copy handling for rename/rename/add/add

239 + + merge-recursive: add handling for rename/rename/add-dest/add-dest

240 + + merge-recursive: Have conflict_rename_delete reuse modify/delete code

241 + + merge-recursive: Make modify/delete handling code reusable

242 + + merge-recursive: Consider modifications in rename/rename(2to1) conflicts

243 + + merge-recursive: Create function for merging with branchname:file markers

244 + + merge-recursive: Record more data needed for merging with dual renames

245 + + merge-recursive: Defer rename/rename(2to1) handling until process_entry

246 + + merge-recursive: Small cleanups for conflict_rename_rename_1to2

247 + + merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base

248 + + merge-recursive: Introduce a merge_file convenience function

249 + + merge-recursive: Fix modify/delete resolution in the recursive case

250 + + merge-recursive: When we detect we can skip an update, actually skip it

251 + + merge-recursive: Provide more info in conflict markers with file renames

252 + + merge-recursive: Cleanup and consolidation of rename_conflict_info

253 + + merge-recursive: Consolidate process_entry() and process_df_entry()

254 + + merge-recursive: Improve handling of rename target vs. directory addition

255 + + merge-recursive: Add comments about handling rename/add-source cases

256 + + merge-recursive: Make dead code for rename/rename(2to1) conflicts undead

257 + + merge-recursive: Fix deletion of untracked file in rename/delete conflicts

258 + + merge-recursive: Split update_stages_and_entry; only update stages at end

259 + + merge-recursive: Allow make_room_for_path() to remove D/F entries

260 + + string-list: Add API to remove an item from an unsorted list

261 + + merge-recursive: Split was_tracked() out of would_lose_untracked()

262 + + merge-recursive: Save D/F conflict filenames instead of unlinking them

263 + + merge-recursive: Fix code checking for D/F conflicts still being present

264 + + merge-recursive: Fix sorting order and directory change assumptions

265 + + merge-recursive: Fix recursive case with D/F conflict via add/add conflict

266 + + merge-recursive: Avoid working directory changes during recursive case

267 + + merge-recursive: Remember to free generated unique path names

268 + + merge-recursive: Consolidate different update_stages functions

269 + + merge-recursive: Mark some diff_filespec struct arguments const

270 + + merge-recursive: Correct a comment

271 + + merge-recursive: Make BUG message more legible by adding a newline

272 + + t6022: Add testcase for merging a renamed file with a simple change

273 + + t6022: New tests checking for unnecessary updates of files

274 + + t6022: Remove unnecessary untracked files to make test cleaner

275 + + t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify

276 + + t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify

277 + + t6036: tests for criss-cross merges with various directory/file conflicts

278 + + t6036: criss-cross with weird content can fool git into clean merge

279 + + t6036: Add differently resolved modify/delete conflict in criss-cross test

280 + + t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts

281 + + t6042: Ensure rename/rename conflicts leave index and workdir in sane state

282 + + t6042: Add tests for content issues with modify/rename/directory conflicts

283 + + t6042: Add a testcase where undetected rename causes silent file deletion

284 + + t6042: Add a pair of cases where undetected renames cause issues

285 + + t6042: Add failing testcase for rename/modify/add-source conflict

286 + + t6042: Add a testcase where git deletes an untracked file

287

165 -Will merge to "master".

288 +I've taken advantage of the end-of-summer lull and reproduced all 16000+

289 +two-head merges in the Linux kernel repository with and without this

290 +series to make sure they get the identical results (either cleanly merged,

291 +or getting conflicted the same way).

292

167 -* jc/maint-clone-alternates (2011-08-23) 2 commits

168 - (merged to 'next' on 2011-08-23 at 7280deb)

169 - + clone: clone from a repository with relative alternates

170 - + clone: allow more than one --reference

293 +* fg/submodule-ff-check-before-push (2011-08-20) 2 commits

294 + (merged to 'next' on 2011-08-24 at 398e764)

295 + + push: Don't push a repository with unpushed submodules

296 + (this branch is used by hv/submodule-merge-search.)

297

172 -Will aim to merge to "master" by -rc1.

298 +This is only the "check" part, which was sensible. The "auto-push" patch

299 +has been moved to its own topic.

300

174 -* nd/maint-clone-gitdir (2011-08-22) 2 commits

175 - (merged to 'next' on 2011-08-24 at cbf052b)

176 - + clone: allow to clone from .git file

177 - + read_gitfile_gently(): rename misnamed function to read_gitfile()

301 +* fk/use-kwset-pickaxe-grep-f (2011-08-28) 6 commits

302 + (merged to 'next' on 2011-08-28 at 3be2039)

303 + + obstack: Fix portability issues

304 + (merged to 'next' on 2011-08-23 at 93ba509)

305 + + Use kwset in grep

306 + + Use kwset in pickaxe

307 + + Adapt the kwset code to Git

308 + + Add string search routines from GNU grep

309 + + Add obstack.[ch] from EGLIBC 2.10

310

179 -Will aim to merge to "master" by -rc1.

311 +* gb/maint-am-patch-format-error-message (2011-08-29) 1 commit

312 + (merged to 'next' on 2011-08-30 at ed01a1d)

313 + + am: format is in $patch_format, not parse_patch

314

181 -* jc/traverse-commit-list (2011-08-22) 3 commits

182 - (merged to 'next' on 2011-08-24 at df50dd7)

183 - + revision.c: update show_object_with_name() without using malloc()

184 - + revision.c: add show_object_with_name() helper function

185 - + rev-list: fix finish_object() call

315 +* gb/maint-am-stgit-author-to-from-fix (2011-08-29) 1 commit

316 + (merged to 'next' on 2011-08-30 at 0740010)

317 + + am: fix stgit patch mangling

318

187 -Not urgent; will not be in 1.7.7.

319 +* jc/clean-exclude-doc (2011-08-28) 1 commit

320 + (merged to 'next' on 2011-08-30 at 79dd173)

321 + + Documentation: clarify "git clean -e <pattern>"

322

189 -* rc/diff-cleanup-records (2011-08-17) 2 commits

190 - (merged to 'next' on 2011-08-23 at b8414f5)

191 - + Merge branch 'rc/histogram-diff' into HEAD

192 - + xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()

323 +* jc/combine-diff-callback (2011-08-20) 1 commit

324 + (merged to 'next' on 2011-08-24 at 9f9b42d)

325 + + combine-diff: support format_callback

326 + (this branch is used by fg/submodule-ff-check-before-push and hv/submodule-merge-search.)

327

194 -Will aim to merge to "master" by -rc1.

328 +* jc/maint-autofix-tag-in-head (2011-08-19) 1 commit

329 + (merged to 'next' on 2011-08-23 at 18cee02)

330 + + commit: reduce use of redundant global variables

331

196 -* fk/make-auto-header-dependencies (2011-08-18) 1 commit

197 - (merged to 'next' on 2011-08-24 at 3da2c25)

198 - + Makefile: Use computed header dependencies if the compiler supports it

332 +* jc/maint-clone-alternates (2011-08-23) 2 commits

333 + (merged to 'next' on 2011-08-23 at 7280deb)

334 + + clone: clone from a repository with relative alternates

335 + + clone: allow more than one --reference

336

200 -Not urgent; will not be in 1.7.7.

337 +* jc/merge-reword (2011-05-25) 1 commit

338 + (merged to 'next' on 2011-08-24 at aa5cf7b)

339 + + merge: reword the final message

340

341 * jk/color-and-pager (2011-08-19) 10 commits

342 (merged to 'next' on 2011-08-23 at cbb9495)

@@ -213,15 +352,53 @@ Not urgent; will not be in 1.7.7.

352 + t7006: modernize calls to unset

353 (this branch is used by jk/pager-with-alias and jk/pager-with-external-command.)

354

216 -Will aim to merge to "master" by -rc1.

355 +* jk/pager-with-external-command (2011-08-19) 1 commit

356 + (merged to 'next' on 2011-08-24 at 083f5da)

357 + + support pager.* for external commands

358 + (this branch is used by jk/pager-with-alias and jk/pager-with-alias; uses jk/color-and-pager.)

359 +

360 +* jn/plug-empty-tree-leak (2011-08-16) 2 commits

361 + (merged to 'next' on 2011-08-23 at aee2184)

362 + + merge-recursive: take advantage of hardcoded empty tree

363 + + revert: plug memory leak in "cherry-pick root commit" codepath

364

218 -* jk/pager-with-alias (2011-08-19) 1 commit

219 - - support pager.* for aliases

220 - (this branch uses jk/color-and-pager, jk/pager-with-external-command and jk/pager-with-external-command.)

365 +* js/i18n-scripts (2011-08-08) 5 commits

366 + (merged to 'next' on 2011-08-23 at a1b5529)

367 + + submodule: take advantage of gettextln and eval_gettextln.

368 + + stash: take advantage of eval_gettextln

369 + + pull: take advantage of eval_gettextln

370 + + git-am: take advantage of gettextln and eval_gettextln.

371 + + gettext: add gettextln, eval_gettextln to encode common idiom

372 +

373 +* js/i18n-scripts-2 (2011-08-30) 1 commit

374 + (merged to 'next' on 2011-08-30 at 5a144a2)

375 + + bisect: take advantage of gettextln, eval_gettextln.

376 +

377 +* mg/branch-set-upstream-previous (2011-08-19) 1 commit

378 + (merged to 'next' on 2011-08-23 at acef0b6)

379 + + branch.c: use the parsed branch name

380

222 -Perhaps will drop.

381 +* mg/maint-notes-C-doc (2011-08-25) 1 commit

382 + (merged to 'next' on 2011-08-30 at 6f3281a)

383 + + git-notes.txt: clarify -C vs. copy and -F

384

224 -* nd/decorate-grafts (2011-08-19) 5 commits

385 +* mh/attr (2011-08-14) 7 commits

386 + (merged to 'next' on 2011-08-23 at 22faa6e)

387 + + Unroll the loop over passes

388 + + Change while loop into for loop

389 + + Determine the start of the states outside of the pass loop

390 + + Change parse_attr() to take a pointer to struct attr_state

391 + + Increment num_attr in parse_attr_line(), not parse_attr()

392 + + Document struct match_attr

393 + + Add a file comment

394 +

395 +* ms/daemon-timeout-is-in-seconds (2011-08-28) 1 commit

396 + (merged to 'next' on 2011-08-30 at 2462eb0)

397 + + git-daemon.txt: specify --timeout in seconds

398 +

399 +* nd/decorate-grafts (2011-08-25) 6 commits

400 + (merged to 'next' on 2011-08-25 at 44967e7)

401 + + log: Do not decorate replacements with --no-replace-objects

402 (merged to 'next' on 2011-08-23 at 475d27e)

403 + log: decorate "replaced" on to replaced commits

404 + log: decorate grafted commits with "grafted"

@@ -229,7 +406,39 @@ Perhaps will drop.

406 + Add for_each_commit_graft() to iterate all grafts

407 + decoration: do not mis-decorate refs with same prefix

408

232 -Will aim to merge to "master" by -rc1.

409 +* nd/maint-clone-gitdir (2011-08-22) 2 commits

410 + (merged to 'next' on 2011-08-24 at cbf052b)

411 + + clone: allow to clone from .git file

412 + + read_gitfile_gently(): rename misnamed function to read_gitfile()

413 +

414 +* nk/branch-v-abbrev (2011-07-01) 1 commit

415 + (merged to 'next' on 2011-08-24 at e9152cf)

416 + + branch -v: honor core.abbrev

417 + (this branch is used by mg/branch-list.)

418 +

419 +* rc/diff-cleanup-records (2011-08-17) 2 commits

420 + (merged to 'next' on 2011-08-23 at b8414f5)

421 + + Merge branch 'rc/histogram-diff' into HEAD

422 + + xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()

423 +

424 +* tr/maint-format-patch-empty-output (2011-08-29) 4 commits

425 + (merged to 'next' on 2011-08-30 at 078c522)

426 + + Document negated forms of format-patch --to --cc --add-headers

427 + + t4014: "no-add-headers" is actually called "no-add-header"

428 + + t4014: invoke format-patch with --stdout where intended

429 + + t4014: check for empty files from git format-patch --stdout

430 +

431 +* tr/maint-ident-to-git-memmove (2011-08-29) 1 commit

432 + (merged to 'next' on 2011-08-30 at 9395a9b)

433 + + Use memmove in ident_to_git

434 +

435 +* tr/maint-strbuf-grow-nul-termination (2011-08-29) 1 commit

436 + (merged to 'next' on 2011-08-30 at dc87192)

437 + + strbuf_grow(): maintain nul-termination even for new buffer

438 +

439 +* tr/maint-t3903-misquoted-command (2011-08-30) 1 commit

440 + (merged to 'next' on 2011-08-30 at f533857)

441 + + t3903: fix misquoted rev-parse invocation

442

443 * va/p4-branch-import (2011-08-22) 4 commits

444 (merged to 'next' on 2011-08-24 at f67f8af)

@@ -239,7 +448,9 @@ Will aim to merge to "master" by -rc1.

448 + git-p4: Correct branch base depot path detection

449 (this branch uses va/p4-rename-copy.)

450

242 -Will merge to "master".

451 +* va/p4-branch-import-test-update (2011-08-29) 1 commit

452 + (merged to 'next' on 2011-08-30 at 5c54fb3)

453 + + git-p4: simple branch tests edits

454

455 * va/p4-rename-copy (2011-08-22) 5 commits

456 (merged to 'next' on 2011-08-24 at f1faa94)

@@ -250,41 +461,81 @@ Will merge to "master".

461 + git-p4: Allow setting rename/copy detection threshold

462 (this branch is used by va/p4-branch-import.)

463

253 -Will merge to "master".

464 +--------------------------------------------------

465 +[Stalled]

466

255 -* da/difftool-mergtool-refactor (2011-08-19) 4 commits

256 - (merged to 'next' on 2011-08-23 at a1cc3be)

257 - + mergetools/meld: Use '--output' when available

258 - + mergetool--lib: Refactor tools into separate files

259 - + mergetool--lib: Make style consistent with git

260 - + difftool--helper: Make style consistent with git

467 +* jk/add-i-hunk-filter (2011-07-27) 5 commits

468 + (merged to 'next' on 2011-08-11 at 8ff9a56)

469 + + add--interactive: add option to autosplit hunks

470 + + add--interactive: allow negatation of hunk filters

471 + + add--interactive: allow hunk filtering on command line

472 + + add--interactive: factor out regex error handling

473 + + add--interactive: refactor patch mode argument processing

474

262 -Will merge to "master".

475 +Needs documentation updates, tests, and integration with the higher level

476 +callers, e.g. "git add -p".

477

264 -* mg/branch-set-upstream-previous (2011-08-19) 1 commit

265 - (merged to 'next' on 2011-08-23 at acef0b6)

266 - + branch.c: use the parsed branch name

478 +* jh/receive-count-limit (2011-05-23) 10 commits

479 + - receive-pack: Allow server to refuse pushes with too many objects

480 + - pack-objects: Estimate pack size; abort early if pack size limit is exceeded

481 + - send-pack/receive-pack: Allow server to refuse pushing too large packs

482 + - pack-objects: Allow --max-pack-size to be used together with --stdout

483 + - send-pack/receive-pack: Allow server to refuse pushes with too many commits

484 + - pack-objects: Teach new option --max-commit-count, limiting #commits in pack

485 + - receive-pack: Prepare for addition of the new 'limit-*' family of capabilities

486 + - Tighten rules for matching server capabilities in server_supports()

487 + - send-pack: Attempt to retrieve remote status even if pack-objects fails

488 + - Update technical docs to reflect side-band-64k capability in receive-pack

489

268 -Will merge to "master".

490 +Would need another round to separate per-pack and per-session limits.

491

270 -* di/parse-options-split (2011-08-11) 2 commits

271 - (merged to 'next' on 2011-08-23 at 6cd667f)

272 - + Reduce parse-options.o dependencies

273 - + parse-options: export opterr, optbug

492 +* jm/mergetool-pathspec (2011-06-22) 2 commits

493 + - mergetool: Don't assume paths are unmerged

494 + - mergetool: Add tests for filename with whitespace

495

275 -Will merge to "master".

496 +I think this is a good idea, but it probably needs a re-roll.

497 +Cf. $gmane/176254, 176255, 166256

498

277 -* mh/attr (2011-08-14) 7 commits

278 - (merged to 'next' on 2011-08-23 at 22faa6e)

279 - + Unroll the loop over passes

280 - + Change while loop into for loop

281 - + Determine the start of the states outside of the pass loop

282 - + Change parse_attr() to take a pointer to struct attr_state

283 - + Increment num_attr in parse_attr_line(), not parse_attr()

284 - + Document struct match_attr

285 - + Add a file comment

499 +* jk/generation-numbers (2011-07-14) 7 commits

500 + - limit "contains" traversals based on commit generation

501 + - check commit generation cache validity against grafts

502 + - pretty: support %G to show the generation number of a commit

503 + - commit: add commit_generation function

504 + - add metadata-cache infrastructure

505 + - decorate: allow storing values instead of pointers

506 + - Merge branch 'jk/tag-contains-ab' (early part) into HEAD

507

287 -Will aim to merge to "master" by -rc1.

508 +The initial "tag --contains" de-pessimization without need for generation

509 +numbers is already in; backburnered.

510 +

511 +* sr/transport-helper-fix-rfc (2011-07-19) 2 commits

512 + - t5800: point out that deleting branches does not work

513 + - t5800: document inability to push new branch with old content

514 +

515 +* po/cygwin-backslash (2011-08-05) 2 commits

516 + - On Cygwin support both UNIX and DOS style path-names

517 + - git-compat-util: add generic find_last_dir_sep that respects is_dir_sep

518 +

519 +I think a further refactoring (no, not my suggestion) was offered?

520 +

521 +--------------------------------------------------

522 +[Cooking]

523 +

524 +* jc/traverse-commit-list (2011-08-22) 3 commits

525 + (merged to 'next' on 2011-08-24 at df50dd7)

526 + + revision.c: update show_object_with_name() without using malloc()

527 + + revision.c: add show_object_with_name() helper function

528 + + rev-list: fix finish_object() call

529 + (this branch is used by jc/fetch-verify.)

530 +

531 +Not urgent; will not be in 1.7.7.

532 +

533 +* fk/make-auto-header-dependencies (2011-08-18) 1 commit

534 + (merged to 'next' on 2011-08-24 at 3da2c25)

535 + + Makefile: Use computed header dependencies if the compiler supports it

536 + (this branch is used by da/make-auto-header-dependencies.)

537 +

538 +Not urgent; will not be in 1.7.7.

539

540 * mh/iterate-refs (2011-08-14) 6 commits

541 - Retain caches of submodule refs

@@ -301,89 +552,6 @@ have been different, though.

552

553 Not urgent; will not be in 1.7.7.

554

304 -* jn/plug-empty-tree-leak (2011-08-16) 2 commits

305 - (merged to 'next' on 2011-08-23 at aee2184)

306 - + merge-recursive: take advantage of hardcoded empty tree

307 - + revert: plug memory leak in "cherry-pick root commit" codepath

308 -

309 -Will merge to "master".

310 -

311 -* ac/describe-dirty-refresh (2011-08-11) 1 commit

312 - (merged to 'next' on 2011-08-23 at b873611)

313 - + describe: Refresh the index when run with --dirty

314 -

315 -Will merge to "master".

316 -

317 -* en/merge-recursive-2 (2011-08-14) 57 commits

318 - (merged to 'next' on 2011-08-23 at ba6ad0d)

319 - + merge-recursive: Don't re-sort a list whose order we depend upon

320 - + merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest

321 - + t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify

322 - + merge-recursive: Avoid unnecessary file rewrites

323 - + t6022: Additional tests checking for unnecessary updates of files

324 - + merge-recursive: Fix spurious 'refusing to lose untracked file...' messages

325 - + t6022: Add testcase for spurious "refusing to lose untracked" messages

326 - + t3030: fix accidental success in symlink rename

327 - + merge-recursive: Fix working copy handling for rename/rename/add/add

328 - + merge-recursive: add handling for rename/rename/add-dest/add-dest

329 - + merge-recursive: Have conflict_rename_delete reuse modify/delete code

330 - + merge-recursive: Make modify/delete handling code reusable

331 - + merge-recursive: Consider modifications in rename/rename(2to1) conflicts

332 - + merge-recursive: Create function for merging with branchname:file markers

333 - + merge-recursive: Record more data needed for merging with dual renames

334 - + merge-recursive: Defer rename/rename(2to1) handling until process_entry

335 - + merge-recursive: Small cleanups for conflict_rename_rename_1to2

336 - + merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base

337 - + merge-recursive: Introduce a merge_file convenience function

338 - + merge-recursive: Fix modify/delete resolution in the recursive case

339 - + merge-recursive: When we detect we can skip an update, actually skip it

340 - + merge-recursive: Provide more info in conflict markers with file renames

341 - + merge-recursive: Cleanup and consolidation of rename_conflict_info

342 - + merge-recursive: Consolidate process_entry() and process_df_entry()

343 - + merge-recursive: Improve handling of rename target vs. directory addition

344 - + merge-recursive: Add comments about handling rename/add-source cases

345 - + merge-recursive: Make dead code for rename/rename(2to1) conflicts undead

346 - + merge-recursive: Fix deletion of untracked file in rename/delete conflicts

347 - + merge-recursive: Split update_stages_and_entry; only update stages at end

348 - + merge-recursive: Allow make_room_for_path() to remove D/F entries

349 - + string-list: Add API to remove an item from an unsorted list

350 - + merge-recursive: Split was_tracked() out of would_lose_untracked()

351 - + merge-recursive: Save D/F conflict filenames instead of unlinking them

352 - + merge-recursive: Fix code checking for D/F conflicts still being present

353 - + merge-recursive: Fix sorting order and directory change assumptions

354 - + merge-recursive: Fix recursive case with D/F conflict via add/add conflict

355 - + merge-recursive: Avoid working directory changes during recursive case

356 - + merge-recursive: Remember to free generated unique path names

357 - + merge-recursive: Consolidate different update_stages functions

358 - + merge-recursive: Mark some diff_filespec struct arguments const

359 - + merge-recursive: Correct a comment

360 - + merge-recursive: Make BUG message more legible by adding a newline

361 - + t6022: Add testcase for merging a renamed file with a simple change

362 - + t6022: New tests checking for unnecessary updates of files

363 - + t6022: Remove unnecessary untracked files to make test cleaner

364 - + t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify

365 - + t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify

366 - + t6036: tests for criss-cross merges with various directory/file conflicts

367 - + t6036: criss-cross with weird content can fool git into clean merge

368 - + t6036: Add differently resolved modify/delete conflict in criss-cross test

369 - + t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts

370 - + t6042: Ensure rename/rename conflicts leave index and workdir in sane state

371 - + t6042: Add tests for content issues with modify/rename/directory conflicts

372 - + t6042: Add a testcase where undetected rename causes silent file deletion

373 - + t6042: Add a pair of cases where undetected renames cause issues

374 - + t6042: Add failing testcase for rename/modify/add-source conflict

375 - + t6042: Add a testcase where git deletes an untracked file

376 -

377 -Will aim to merge to "master" by -rc1.

378 -

379 -* fg/submodule-ff-check-before-push (2011-08-20) 2 commits

380 - (merged to 'next' on 2011-08-24 at 398e764)

381 - + push: teach --recurse-submodules the on-demand option

382 - + push: Don't push a repository with unpushed submodules

383 - (this branch uses jc/combine-diff-callback.)

384 -

385 -Will aim to merge to "master" by -rc1.

386 -

555 * hv/submodule-update-none (2011-08-11) 2 commits

556 (merged to 'next' on 2011-08-24 at 5302fc1)

557 + add update 'none' flag to disable update of submodule by default

@@ -406,16 +574,6 @@ particular workload. Will keep it in 'next' at least for one cycle.

574

575 Not urgent; will not be in 1.7.7.

576

409 -* js/i18n-scripts (2011-08-08) 5 commits

410 - (merged to 'next' on 2011-08-23 at a1b5529)

411 - + submodule: take advantage of gettextln and eval_gettextln.

412 - + stash: take advantage of eval_gettextln

413 - + pull: take advantage of eval_gettextln

414 - + git-am: take advantage of gettextln and eval_gettextln.

415 - + gettext: add gettextln, eval_gettextln to encode common idiom

416 -

417 -Will merge to "master".

418 -

577 * fg/submodule-git-file-git-dir (2011-08-22) 2 commits

578 (merged to 'next' on 2011-08-23 at 762194e)

579 + Move git-dir for submodules

@@ -473,3 +631,9 @@ Not urgent; will not be in 1.7.7.

631

632 Will keep it in 'next' at least for one cycle.

633 Not urgent; will not be in 1.7.7.

634 +

635 +--------------------------------------------------

636 +[Discarded]

637 +

638 +* jk/pager-with-alias (2011-08-19) 1 commit

639 + . support pager.* for aliases

What's cooking (2011/09 #01)