2dcc987892 · matheusbsbs/matheus-bagliano

@@ -1,203 +1,95 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Aug 2011, #05; Fri, 19)

3 -X-master-at: cee426811c981c62c4b236ebdcb47d1c2945cf56

4 -X-next-at: b5fcad02a1cc9cc1c2b8ebaef4ad67d0f9101c98

2 +Subject: What's cooking in git.git (Aug 2011, #06; Tue, 23)

3 +X-master-at: 8d9185bc12650a9839dff45a8754f05618cdb3f5

4 +X-next-at: b87361146165b920a11ae9bb995856575d51be9a

5

6 -What's cooking in git.git (Aug 2011, #05; Fri, 19)

6 +What's cooking in git.git (Aug 2011, #06; Tue, 23)

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 -There are a few 'fixup!' commits queued in topics still in 'pu', so that

13 -authors have a choice to just say "that fix looks good, squash it in!"

14 -instead of going through an extra round.

12 +I was very tempted to cut 1.7.7-rc0 today, but we have quite a few topics

13 +that deserve to be in the upcoming release and are still in 'next'. I'll

14 +probably merge most if not all of what are in 'next' as of today sometime

15 +later this week, tag a 1.7.7-rc0 release and declare feature freeze for

16 +this cycle.

17

18 --------------------------------------------------

17 -[New Topics]

19 +[Graduated to "master"]

20

19 -* jc/traverse-commit-list (2011-08-17) 3 commits

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

21 - - revision.c: add show_object_with_name() helper function

22 - - rev-list: fix finish_object() call

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

22 + (merged to 'next' on 2011-08-15 at 69f41cf)

23 + + ls-files: fix pathspec display on error

24

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

25 - - Merge branch 'rc/histogram-diff' into HEAD

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

25 +* jn/maint-test-return (2011-08-11) 3 commits

26 + (merged to 'next' on 2011-08-15 at 5a42301)

27 + + t3900: do not reference numbered arguments from the test script

28 + + test: cope better with use of return for errors

29 + + test: simplify return value of test_run_

30

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

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

31 +* rt/zlib-smaller-window (2011-08-11) 2 commits

32 + (merged to 'next' on 2011-08-15 at e05b26b)

33 + + test: consolidate definition of $LF

34 + + Tolerate zlib deflation with window size < 32Kb

35

31 -* jk/color-and-pager (2011-08-18) 10 commits

32 - - want_color: automatically fallback to color.ui

33 - - diff: don't load color config in plumbing

34 - - config: refactor get_colorbool function

35 - - color: delay auto-color decision until point of use

36 - - git_config_colorbool: refactor stdout_is_tty handling

37 - - diff: refactor COLOR_DIFF from a flag into an int

38 - - setup_pager: set GIT_PAGER_IN_USE

39 - - t7006: use test_config helpers

40 - - test-lib: add helper functions for config

41 - - t7006: modernize calls to unset

42 - (this branch is used by jk/pager-with-alias.)

36 +--------------------------------------------------

37 +[New Topics]

38

44 -Looked reasonable.

45 -Will merge to "next".

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

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

41 + + Use kwset in grep

42 + + Use kwset in pickaxe

43 + + Adapt the kwset code to Git

44 + + Add string search routines from GNU grep

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

46

47 -* jk/pager-with-alias (2011-08-18) 2 commits

48 - - support pager.* for aliases

49 - - support pager.* for external commands

50 - (this branch uses jk/color-and-pager.)

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

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

49 + + commit: reduce use of redundant global variables

50

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

53 - - log: decorate "replaced" on to replaced commits

54 - - log: decorate grafted commits with "grafted"

55 - - Move write_shallow_commits to fetch-pack.c

56 - - Add for_each_commit_graft() to iterate all grafts

57 - - decoration: do not mis-decorate refs with same prefix

51 +* bw/doc-repo-layout (2011-08-22) 2 commits

52 + - Mark http-fetch without -a as deprecated

53 + - Documentation: Grammar correction, wording fixes and cleanup

54

59 -Looked reasonable.

60 -Will merge to "next".

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

56 + - Show interpreted branch name in error messages

57 + - Prevent force-updating of the current branch

58

62 -* va/p4-branch-import (2011-08-19) 4 commits

63 - - git-p4: Add simple test case for branch import

64 - - git-p4: Allow branch definition with git config

65 - - git-p4: Allow filtering Perforce branches by user

66 - - git-p4: Correct branch base depot path detection

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

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

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

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

62

69 -* va/p4-rename-copy (2011-08-18) 4 commits

70 - - git-p4: Add test case for copy detection.

71 - - git-p4: Add test case for rename detection.

72 - - git-p4: Add description of rename/copy detection options.

73 - - git-p4: Allow setting rename/copy detection threshold.

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

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

64 + - combine-diff: support format_callback

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

66

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

77 - - mergetools/meld: Use '--output' when available

78 - - mergetool--lib: Refactor tools into separate files

79 - - mergetool--lib: Make style consistent with git

80 - - difftool--helper: Make style consistent with git

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

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

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

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

71

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

83 - - branch.c: use the parsed branch name

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

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

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

75

85 ---------------------------------------------------

86 -[Graduated to "master"]

87 -

88 -* cb/maint-exec-error-report (2011-08-01) 2 commits

89 - (merged to 'next' on 2011-08-05 at 2764424)

90 - + notice error exit from pager

91 - + error_routine: use parent's stderr if exec fails

92 -

93 -* cb/maint-quiet-push (2011-08-08) 2 commits

94 - (merged to 'next' on 2011-08-08 at 917d73b)

95 - + receive-pack: do not overstep command line argument array

96 - (merged to 'next' on 2011-08-01 at 87df938)

97 - + propagate --quiet to send-pack/receive-pack

98 -

99 -* db/am-skip-blank-at-the-beginning (2011-08-11) 1 commit

100 - (merged to 'next' on 2011-08-11 at 3637843)

101 - + am: ignore leading whitespace before patch

102 -

103 -* jc/maint-combined-diff-work-tree (2011-08-04) 1 commit

104 - (merged to 'next' on 2011-08-05 at 976a4d4)

105 - + diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"

106 -

107 -* jc/maint-smart-http-race-upload-pack (2011-08-08) 1 commit

108 - (merged to 'next' on 2011-08-11 at 3f24b64)

109 - + helping smart-http/stateless-rpc fetch race

110 -

111 -* js/bisect-no-checkout (2011-08-09) 11 commits

112 - (merged to 'next' on 2011-08-11 at 6c94a45)

113 - + bisect: add support for bisecting bare repositories

114 - + bisect: further style nitpicks

115 - + bisect: replace "; then" with "\n<tab>*then"

116 - + bisect: cleanup whitespace errors in git-bisect.sh.

117 - + bisect: add documentation for --no-checkout option.

118 - + bisect: add tests for the --no-checkout option.

119 - + bisect: introduce --no-checkout support into porcelain.

120 - + bisect: introduce support for --no-checkout option.

121 - + bisect: add tests to document expected behaviour in presence of broken trees.

122 - + bisect: use && to connect statements that are deferred with eval.

123 - + bisect: move argument parsing before state modification.

124 -

125 -* js/ref-namespaces (2011-07-21) 5 commits

126 - (merged to 'next' on 2011-07-25 at 5b7dcfe)

127 - + ref namespaces: tests

128 - + ref namespaces: documentation

129 - + ref namespaces: Support remote repositories via upload-pack and receive-pack

130 - + ref namespaces: infrastructure

131 - + Fix prefix handling in ref iteration functions

132 -

133 -* js/sh-style (2011-08-05) 2 commits

134 - (merged to 'next' on 2011-08-11 at 4a4c22c)

135 - + filter-branch.sh: de-dent usage string

136 - + misc-sh: fix up whitespace in some other .sh files.

137 -

138 -* ma/am-exclude (2011-08-09) 2 commits

139 - (merged to 'next' on 2011-08-11 at cf0ba4d)

140 - + am: Document new --exclude=<path> option

141 - (merged to 'next' on 2011-08-05 at 658e57c)

142 - + am: pass exclude down to apply

143 -

144 -* mh/check-attr-listing (2011-08-04) 23 commits

145 - (merged to 'next' on 2011-08-11 at f73ad50)

146 - + Rename git_checkattr() to git_check_attr()

147 - + git-check-attr: Fix command-line handling to match docs

148 - + git-check-attr: Drive two tests using the same raw data

149 - + git-check-attr: Add an --all option to show all attributes

150 - + git-check-attr: Error out if no pathnames are specified

151 - + git-check-attr: Process command-line args more systematically

152 - + git-check-attr: Handle each error separately

153 - + git-check-attr: Extract a function error_with_usage()

154 - + git-check-attr: Introduce a new variable

155 - + git-check-attr: Extract a function output_attr()

156 - + Allow querying all attributes on a file

157 - + Remove redundant check

158 - + Remove redundant call to bootstrap_attr_stack()

159 - + Extract a function collect_all_attrs()

160 - + Teach prepare_attr_stack() to figure out dirlen itself

161 - + git-check-attr: Use git_attr_name()

162 - + Provide access to the name attribute of git_attr

163 - + git-check-attr: Add tests of command-line parsing

164 - + git-check-attr: Add missing "&&"

165 - + Disallow the empty string as an attribute name

166 - + Remove anachronism from comment

167 - + doc: Correct git_attr() calls in example code

168 - + doc: Add a link from gitattributes(5) to git-check-attr(1)

169 - (this branch is used by mh/check-attr-relative.)

170 -

171 -* mh/check-attr-relative (2011-08-04) 6 commits

172 - (merged to 'next' on 2011-08-11 at f94550c)

173 - + test-path-utils: Add subcommand "prefix_path"

174 - + test-path-utils: Add subcommand "absolute_path"

175 - + git-check-attr: Normalize paths

176 - + git-check-attr: Demonstrate problems with relative paths

177 - + git-check-attr: Demonstrate problems with unnormalized paths

178 - + git-check-attr: test that no output is written to stderr

179 - (this branch uses mh/check-attr-listing.)

180 -

181 -* rc/histogram-diff (2011-08-08) 12 commits

182 - (merged to 'next' on 2011-08-11 at 684dfd1)

183 - + xdiff/xhistogram: drop need for additional variable

184 - + xdiff/xhistogram: rely on xdl_trim_ends()

185 - + xdiff/xhistogram: rework handling of recursed results

186 - + xdiff: do away with xdl_mmfile_next()

187 - (merged to 'next' on 2011-08-03 at f9e2328)

188 - + Make test number unique

189 - (merged to 'next' on 2011-07-25 at 3351028)

190 - + xdiff/xprepare: use a smaller sample size for histogram diff

191 - + xdiff/xprepare: skip classification

192 - + teach --histogram to diff

193 - + t4033-diff-patience: factor out tests

194 - + xdiff/xpatience: factor out fall-back-diff function

195 - + xdiff/xprepare: refactor abort cleanups

196 - + xdiff/xprepare: use memset()

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

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

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

79

80 --------------------------------------------------

81 [Stalled]

82

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

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

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

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

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

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

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

90 +

91 +Needs documentation updates.

92 +

93 * jc/merge-reword (2011-05-25) 2 commits

94 - merge: mark the final "Merge made by..." message for l10n

95 - merge: reword the final message

@@ -255,44 +147,103 @@ I think a further refactoring (no, not my suggestion) was offered?

147 --------------------------------------------------

148 [Cooking]

149

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

259 - - doc/fast-import: document feature import-marks-if-exists

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

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

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

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

154

261 -Comments from fast-import folks?

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

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

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

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

159

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

264 - - fast-import: prevent producing bad delta

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

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

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

162

267 -Comments from fast-import folks?

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

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

165 + + want_color: automatically fallback to color.ui

166 + + diff: don't load color config in plumbing

167 + + config: refactor get_colorbool function

168 + + color: delay auto-color decision until point of use

169 + + git_config_colorbool: refactor stdout_is_tty handling

170 + + diff: refactor COLOR_DIFF from a flag into an int

171 + + setup_pager: set GIT_PAGER_IN_USE

172 + + t7006: use test_config helpers

173 + + test-lib: add helper functions for config

174 + + t7006: modernize calls to unset

175 + (this branch is used by jk/pager-with-alias.)

176

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

270 - - fsck: improve committer/author check

271 - - fsck: add a few committer name tests

272 - - fast-import: check committer name more strictly

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

274 - - fast-import: add input format tests

177 +* jk/pager-with-alias (2011-08-19) 2 commits

178 + - support pager.* for aliases

179 + - support pager.* for external commands

180 + (this branch uses jk/color-and-pager.)

181

276 -Comments from fast-import folks?

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

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

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

185 + + log: decorate grafted commits with "grafted"

186 + + Move write_shallow_commits to fetch-pack.c

187 + + Add for_each_commit_graft() to iterate all grafts

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

189 +

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

191 + - git-p4: Add simple test case for branch import

192 + - git-p4: Allow branch definition with git config

193 + - git-p4: Allow filtering Perforce branches by user

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

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

196

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

279 - - Reduce parse-options.o dependencies

280 - - parse-options: export opterr, optbug

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

198 + - git-p4: Process detectCopiesHarder with --bool

199 + - git-p4: Add test case for copy detection

200 + - git-p4: Add test case for rename detection

201 + - git-p4: Add description of rename/copy detection options

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

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

204

282 -Looked reasonable.

283 -Will merge to "next".

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

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

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

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

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

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

211 +

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

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

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

215 +

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

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

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

219 +

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

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

222 + + fast-import: prevent producing bad delta

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

224 +

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

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

227 + + fsck: improve committer/author check

228 + + fsck: add a few committer name tests

229 + + fast-import: check committer name more strictly

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

231 + + fast-import: add input format tests

232 +

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

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

235 + + Reduce parse-options.o dependencies

236 + + parse-options: export opterr, optbug

237

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

286 - - Unroll the loop over passes

287 - - Change while loop into for loop

288 - - Determine the start of the states outside of the pass loop

289 - - Change parse_attr() to take a pointer to struct attr_state

290 - - Increment num_attr in parse_attr_line(), not parse_attr()

291 - - Document struct match_attr

292 - - Add a file comment

293 -

294 -All looked reasonable.

295 -Will merge to "next".

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

240 + + Unroll the loop over passes

241 + + Change while loop into for loop

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

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

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

245 + + Document struct match_attr

246 + + Add a file comment

247

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

249 - Retain caches of submodule refs

@@ -303,84 +254,81 @@ Will merge to "next".

254 - Extract a function clear_cached_refs()

255

256 I did not see anything wrong per-se, but it was unclear what the benefit

306 -of these changes are. I probably need to read it once again.

257 +of these changes are.

258

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

309 - - merge-recursive: take advantage of hardcoded empty tree

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

311 -

312 -Both looked reasonable.

313 -Will merge to "next".

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

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

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

263

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

316 - - describe: Refresh the index when run with --dirty

317 -

318 -Will merge to "next", but needs Sign-off.

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

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

267

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

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

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

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

324 - - merge-recursive: Avoid unnecessary file rewrites

325 - - t6022: Additional tests checking for unnecessary updates of files

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

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

328 - - t3030: fix accidental success in symlink rename

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

330 - - merge-recursive: add handling for rename/rename/add-dest/add-dest

331 - - merge-recursive: Have conflict_rename_delete reuse modify/delete code

332 - - merge-recursive: Make modify/delete handling code reusable

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

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

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

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

337 - - merge-recursive: Small cleanups for conflict_rename_rename_1to2

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

339 - - merge-recursive: Introduce a merge_file convenience function

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

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

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

343 - - merge-recursive: Cleanup and consolidation of rename_conflict_info

344 - - merge-recursive: Consolidate process_entry() and process_df_entry()

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

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

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

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

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

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

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

352 - - merge-recursive: Split was_tracked() out of would_lose_untracked()

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

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

355 - - merge-recursive: Fix sorting order and directory change assumptions

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

357 - - merge-recursive: Avoid working directory changes during recursive case

358 - - merge-recursive: Remember to free generated unique path names

359 - - merge-recursive: Consolidate different update_stages functions

360 - - merge-recursive: Mark some diff_filespec struct arguments const

361 - - merge-recursive: Correct a comment

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

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

364 - - t6022: New tests checking for unnecessary updates of files

365 - - t6022: Remove unnecessary untracked files to make test cleaner

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

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

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

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

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

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

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

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

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

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

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

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

378 -

379 -Rerolled.

380 -Will merge to "next".

381 -

382 -* fg/submodule-ff-check-before-push (2011-08-09) 1 commit

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

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

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

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

273 + + merge-recursive: Avoid unnecessary file rewrites

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

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

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

277 + + t3030: fix accidental success in symlink rename

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

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

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

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

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

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

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

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

286 + + merge-recursive: Small cleanups for conflict_rename_rename_1to2

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

308 + + merge-recursive: Consolidate different update_stages functions

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

310 + + merge-recursive: Correct a comment

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

327 +

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

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

330 - push: Don't push a repository with unpushed submodules

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

332

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

334 - add update 'none' flag to disable update of submodule by default

@@ -397,51 +345,17 @@ Will merge to "next".

345 - object.c: code movement for readability

346

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

400 - - submodule: take advantage of gettextln and eval_gettextln.

401 - - stash: take advantage of eval_gettextln

402 - - pull: take advantage of eval_gettextln

403 - - git-am: take advantage of gettextln and eval_gettextln.

404 - - gettext: add gettextln, eval_gettextln to encode common idiom

405 -

406 -Will merge to "next".

407 -

408 -* cb/maint-ls-files-error-report (2011-08-11) 1 commit

409 - (merged to 'next' on 2011-08-15 at 69f41cf)

410 - + ls-files: fix pathspec display on error

411 -

412 -Will merge to "master".

413 -

414 -* jn/maint-test-return (2011-08-11) 3 commits

415 - (merged to 'next' on 2011-08-15 at 5a42301)

416 - + t3900: do not reference numbered arguments from the test script

417 - + test: cope better with use of return for errors

418 - + test: simplify return value of test_run_

419 -

420 -Will merge to "master".

421 -

422 -* rt/zlib-smaller-window (2011-08-11) 2 commits

423 - (merged to 'next' on 2011-08-15 at e05b26b)

424 - + test: consolidate definition of $LF

425 - + Tolerate zlib deflation with window size < 32Kb

426 -

427 -Will merge to "master".

428 -

429 -* fg/submodule-git-file-git-dir (2011-08-16) 3 commits

430 - - fixup! Move git-dir for submodules

431 - - Move git-dir for submodules

432 - - rev-parse: add option --resolve-git-dir <path>

433 -

434 -Will merge to "next", after squashing the top one.

435 -

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

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

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

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

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

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

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

443 -

444 -Needs documentation updates.

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

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

350 + + stash: take advantage of eval_gettextln

351 + + pull: take advantage of eval_gettextln

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

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

354 +

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

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

357 + + Move git-dir for submodules

358 + + rev-parse: add option --resolve-git-dir <path>

359

360 * jk/http-auth-keyring (2011-08-03) 13 commits

361 (merged to 'next' on 2011-08-03 at b06e80e)

What's cooking (2011/08 #06)