9c62365559 · matheusbsbs/matheus-bagliano

@@ -1,9 +1,9 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Sep 2010, #07; Wed, 29)

3 -X-master-at: 9855b08d35edf8a8a441f24ff7b00e220a29f261

4 -X-next-at: 92b87a9bab1a84261d2381e813e58577967bdc79

2 +Subject: What's cooking in git.git (Oct 2010, #01; Wed, 13)

3 +X-master-at: 38a18873b21f6f2eebedc65aff2249fd6ec2168c

4 +X-next-at: 53ea256ab9071d54b4f09772408e442ad43bc73a

5

6 -What's cooking in git.git (Sep 2010, #07; Wed, 29)

6 +What's cooking in git.git (Oct 2010, #01; Wed, 13)

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

8

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

@@ -11,206 +11,212 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones

11 marked with '.' do not appear in any of the integration branches, but I am

12 still holding onto them.

13

14 -With fixes to a few brown paper bag regressions to "git stash", 1.7.3.1 is

15 -out. The first batch of topics that have been cooking have graduated on

16 -the 'master' front.

17 -

14 --------------------------------------------------

15 [Graduated to "master"]

16

21 -* ab/send-email-catfile (2010-09-14) 1 commit

22 - (merged to 'next' on 2010-09-22 at 5c53513)

23 - + send-email: use catfile() to concatenate files

24 -

25 -* bc/fortran-userdiff (2010-09-10) 1 commit

26 - (merged to 'next' on 2010-09-22 at f0c8ddb)

27 - + userdiff.c: add builtin fortran regex patterns

28 -

29 -* gb/shell-ext (2010-08-27) 6 commits

30 - (merged to 'next' on 2010-09-22 at e529b2a)

31 - + shell: Display errors from improperly-formatted command lines

32 - + Merge branch 'gb/split-cmdline-errmsg' into gb/shell-ext

33 - + shell: Rewrite documentation and improve error message

34 - + Add sample commands for git-shell

35 - + Add interactive mode to git-shell for user-friendliness

36 - + Allow creation of arbitrary git-shell commands

37 -

38 -* jc/grep-header-all-match-fix (2010-09-12) 2 commits

39 - (merged to 'next' on 2010-09-22 at c78a8aa)

40 - + log --author: take union of multiple "author" requests

41 - + grep: move logic to compile header pattern into a separate helper

42 - (this branch is used by jc/grep-header-all-match-fix-debug.)

43 -

44 -We might want to give a more comprehensive revamp to the "filter by

45 -grepping the commit log message" feature some day, somehow allowing the

46 -full "git grep" boolean expression. But until then, this should suffice.

47 -

48 -* jc/no-branch-name-with-dash-at-front (2010-09-14) 1 commit

49 - (merged to 'next' on 2010-09-22 at 5918d77)

50 - + disallow branch names that start with a hyphen

51 -

52 -This came up at $WORK.

53 -

54 -* jc/pickaxe-grep (2010-08-31) 4 commits

55 - (merged to 'next' on 2010-09-22 at 2a33735)

56 - + diff/log -G<pattern>: tests

57 - + git log/diff: add -G<regexp> that greps in the patch text

58 - + diff: pass the entire diff-options to diffcore_pickaxe()

59 - + gitdiffcore doc: update pickaxe description

60 -

61 -This is a re-roll of "grepping inside the log -p output" which is a

62 -feature that is often asked for when people hear about -S option.

63 -

64 -* jk/read-tree-empty (2010-09-10) 1 commit

65 - (merged to 'next' on 2010-09-22 at a6a00bd)

66 - + read-tree: deprecate syntax without tree-ish args

67 -

68 -* jn/gitweb-test-lib (2010-09-12) 2 commits

69 - (merged to 'next' on 2010-09-22 at 8a471ba)

70 - + t/gitweb-lib.sh: Use tabs for indent consistently

71 - + t/gitweb-lib.sh: Use GIT_BUILD_DIR

72 -

73 -* po/etc-gitattributes (2010-09-01) 1 commit

74 - (merged to 'next' on 2010-09-22 at dc64419)

75 - + Add global and system-wide gitattributes

76 -

77 -* rr/fmt-merge-msg (2010-09-08) 5 commits

78 - (merged to 'next' on 2010-09-22 at 958ca95)

79 - + t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length

80 - + t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length

81 - + merge: Make 'merge.log' an integer or boolean option

82 - + merge: Make '--log' an integer option for number of shortlog entries

83 - + fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len

84 -

85 -* rr/format-patch-count-without-merges (2010-08-28) 2 commits

86 - (merged to 'next' on 2010-09-22 at 4ae3edc)

87 - + format-patch: Don't go over merge commits

88 - + t4014-format-patch: Call test_tick before committing

89 -

90 -* tr/send-email-refuse-sending-unedited-cover-letter (2009-06-08) 1 commit

91 - (merged to 'next' on 2010-09-22 at e306400)

92 - + send-email: Refuse to send cover-letter template subject

93 -

94 ---------------------------------------------------

95 -[New Topics]

96 -

97 -* mg/reset-doc (2010-09-15) 6 commits

98 - (merged to 'next' on 2010-09-22 at 2a10b71)

99 - + git-reset.txt: make modes description more consistent

100 - + git-reset.txt: point to git-checkout

101 - + git-reset.txt: use "working tree" consistently

102 - + git-reset.txt: reset --soft is not a no-op

103 - + git-reset.txt: reset does not change files in target

104 - + git-reset.txt: clarify branch vs. branch head

105 -

106 -Will merge to 'master' shortly.

107 -

17 * ab/makefile-track-cc (2010-09-12) 1 commit

18 (merged to 'next' on 2010-09-27 at 51daee0)

19 + Makefile: add CC to TRACK_CFLAGS

20

112 -Will merge to 'master' shortly.

113 -

114 -* ab/require-perl-5.8 (2010-09-24) 2 commits

115 - (merged to 'next' on 2010-09-27 at 1fcdd3c)

116 - + perl: use "use warnings" instead of -w

117 - + perl: bump the required Perl version to 5.8 from 5.6.[21]

118 -

21 * bc/fix-cherry-pick-root (2010-09-27) 1 commit

22 (merged to 'next' on 2010-09-27 at e27f4c9)

23 + builtin/revert.c: don't dereference a NULL pointer

24

123 -Will merge to 'master' shortly.

124 -

25 * cw/gitweb-hilite-config (2010-09-21) 1 commit

26 (merged to 'next' on 2010-09-27 at dd234ba)

27 + Enable highlight executable path as a configuration option

28

129 -Will merge to 'master' shortly.

130 -

131 -* en/and-cascade-tests (2010-09-26) 12 commits

132 - - Add missing &&'s throughout the testsuite

133 - - t7601 (merge-pull-config): add missing &&

134 - - t7001 (mv): add missing &&

135 - - t6016 (rev-list-graph-simplify-history): add missing &&

136 - - t4026 (color): remove unneeded and unchained command

137 - - t4019 (diff-wserror): add lots of missing &&

138 - - t3600 (rm): add lots of missing &&

139 - - t4202 (log): Replace '<git-command> || :' with test_might_fail

140 - - t4002 (diff-basic): use test_might_fail for commands that might fail

141 - - t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&

142 - - t4017 (diff-retval): replace manual exit code check with test_expect_code

143 - - t3020 (ls-files-error-unmatch): remove stray '1' from end of file

144 -

145 -I've rejected a few patches in the series; will merge this to 'next'

146 -perhaps after a reroll or two.

147 -

148 -* jk/no-textconv-symlink (2010-09-21) 1 commit

149 - - diff: don't use pathname-based diff drivers for symlinks

150 - (this branch is used by ks/no-textconv-symlink.)

151 -

152 -* ks/no-textconv-symlink (2010-09-29) 3 commits

153 - - blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''

154 - - blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks

155 - - blame,cat-file: Prepare --textconv tests for correctly-failing conversion program

156 - (this branch uses jk/no-textconv-symlink.)

157 -

29 * jk/repack-reuse-object (2010-09-27) 2 commits

30 (merged to 'next' on 2010-09-27 at 5719f72)

31 + Documentation: pack.compression: explain how to recompress

32 + repack: add -F flag to let user choose between --no-reuse-delta/object

33

163 -Will merge to 'master' shortly.

164 -

165 -* jp/send-email-to-cmd (2010-09-24) 1 commit

166 - - git-send-email.perl: Add --to-cmd

167 -

168 -Should be Ok for 'next'.

169 -

170 -* kb/merge-recursive-rename-threshold (2010-09-27) 2 commits

171 - - diff: add synonyms for -M, -C, -B

172 - - merge-recursive: option to specify rename threshold

173 - (this branch uses jf/merge-ignore-ws.)

174 -

175 -Should be Ok for 'next'.

176 -

177 -* mg/fix-build-remote-helpers (2010-09-17) 1 commit

178 - - remote-helpers: build in platform independent directory

179 -

180 -Should be Ok for 'next'.

181 -

182 -* nd/struct-pathspec (2010-09-20) 5 commits

183 - - ce_path_match: drop prefix matching in favor of match_pathspec

184 - - Convert ce_path_match() to use struct pathspec

185 - - tree_entry_interesting: turn to match_pathspec if wildcard is present

186 - - pathspec: add tree_recursive_diff parameter

187 - - pathspec: mark wildcard pathspecs from the beginning

188 - (this branch uses en/object-list-with-pathspec.)

189 -

190 -* en/object-list-with-pathspec (2010-09-20) 8 commits

191 - - Add testcases showing how pathspecs are handled with rev-list --objects

192 - - Make rev-list --objects work together with pathspecs

193 - - Move tree_entry_interesting() to tree-walk.c and export it

194 - - tree_entry_interesting(): remove dependency on struct diff_options

195 - - Convert struct diff_options to use struct pathspec

196 - - pathspec: cache string length when initialize pathspec

197 - - diff-no-index: use diff_tree_setup_paths()

198 - - Add struct pathspec

199 - (this branch is used by nd/struct-pathspec.)

200 -

201 -* sb/send-email-use-to-from-input (2010-09-29) 1 commit

202 - - send-email: Use To: headers in patch files

203 -

204 -Should be Ok for 'next'.

205 -

206 -* tc/smart-http-post-redirect (2010-09-25) 1 commit

207 - - smart-http: Don't change POST to GET when following redirect

34 +* mg/reset-doc (2010-09-15) 6 commits

35 + (merged to 'next' on 2010-09-22 at 2a10b71)

36 + + git-reset.txt: make modes description more consistent

37 + + git-reset.txt: point to git-checkout

38 + + git-reset.txt: use "working tree" consistently

39 + + git-reset.txt: reset --soft is not a no-op

40 + + git-reset.txt: reset does not change files in target

41 + + git-reset.txt: clarify branch vs. branch head

42

43 * uk/fix-author-ident-sed-script (2010-09-23) 1 commit

44 (merged to 'next' on 2010-09-27 at 5ad7d90)

45 + get_author_ident_from_commit(): remove useless quoting

46

213 -Will merge to 'master' shortly.

47 +--------------------------------------------------

48 +[New Topics]

49 +

50 +* ab/send-email-perl (2010-09-30) 16 commits

51 + (merged to 'next' on 2010-09-30 at cf8e58e)

52 + + send-email: extract_valid_address use qr// regexes

53 + + send-email: is_rfc2047_quoted use qr// regexes

54 + + send-email: use Perl idioms in while loop

55 + + send-email: make_message_id use "require" instead of "use"

56 + + send-email: send_message die on $!, not $?

57 + + send-email: use (?:) instead of () if no match variables are needed

58 + + send-email: sanitize_address use qq["foo"], not "\"foo\""

59 + + send-email: sanitize_address use $foo, not "$foo"

60 + + send-email: use \E***\Q instead of \*\*\*

61 + + send-email: cleanup_compose_files doesn't need a prototype

62 + + send-email: unique_email_list doesn't need a prototype

63 + + send-email: file_declares_8bit_cte doesn't need a prototype

64 + + send-email: get_patch_subject doesn't need a prototype

65 + + send-email: use lexical filehandles during sending

66 + + send-email: use lexical filehandles for $compose

67 + + send-email: use lexical filehandle for opendir

68 +

69 +* cb/diff-fname-optim (2010-09-26) 3 commits

70 + - diff: avoid repeated scanning while looking for funcname

71 + - do not search functions for patch ID

72 + - add rebase patch id tests

73 +

74 +* en/merge-recursive (2010-09-20) 38 commits

75 + - merge-recursive: Remove redundant path clearing for D/F conflicts

76 + - merge-recursive: Make room for directories in D/F conflicts

77 + - handle_delete_modify(): Check whether D/F conflicts are still present

78 + - merge_content(): Check whether D/F conflicts are still present

79 + - conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts

80 + - conflict_rename_delete(): Check whether D/F conflicts are still present

81 + - merge-recursive: Delay modify/delete conflicts if D/F conflict present

82 + - merge-recursive: Delay content merging for renames

83 + - merge-recursive: Delay handling of rename/delete conflicts

84 + - merge-recursive: Move handling of double rename of one file to other file

85 + - merge-recursive: Move handling of double rename of one file to two

86 + - merge-recursive: Avoid doubly merging rename/add conflict contents

87 + - merge-recursive: Update merge_content() call signature

88 + - merge-recursive: Update conflict_rename_rename_1to2() call signature

89 + - merge-recursive: Structure process_df_entry() to handle more cases

90 + - merge-recursive: Have process_entry() skip D/F or rename entries

91 + - merge-recursive: New function to assist resolving renames in-core only

92 + - merge-recursive: New data structures for deferring of D/F conflicts

93 + - merge-recursive: Move process_entry's content merging into a function

94 + - merge-recursive: Move delete/modify handling into dedicated function

95 + - merge-recursive: Move rename/delete handling into dedicated function

96 + - merge-recursive: Nuke rename/directory conflict detection

97 + - merge-recursive: Rename conflict_rename_rename*() for clarity

98 + - merge-recursive: Small code clarification -- variable name and comments

99 + - t6036: Add testcase for undetected conflict

100 + - t6036: Add a second testcase similar to the first but with content changes

101 + - t6036: Test index and worktree state, not just that merge fails

102 + - t6020: Add a testcase for modify/delete + directory/file conflict

103 + - t6020: Modernize style a bit

104 + - t6022: Add tests for rename/rename combined with D/F conflicts

105 + - t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)

106 + - t6022: Add tests with both rename source & dest involved in D/F conflicts

107 + - t6022: Add tests for reversing order of merges when D/F conflicts present

108 + - t6022: Add test combinations of {content conflict?, D/F conflict remains?}

109 + - t6032: Add a test checking for excessive output from merge

110 + - merge-recursive: Restructure showing how to chain more process_* functions

111 + - t3030: Add a testcase for resolvable rename/add conflict with symlinks

112 + - Merge branch 'en/rename-d-f' into en/merge-recursive

113 + (this branch uses en/rename-d-f.)

114 +

115 +* il/remote-fd-ext (2010-10-12) 3 commits

116 + - git-remote-ext

117 + - git-remote-fd

118 + - Add bidirectional_transfer_loop()

119 +

120 +* jn/gitweb-test (2010-09-26) 4 commits

121 + - gitweb/Makefile: Include gitweb/config.mak

122 + - gitweb/Makefile: Add 'test' and 'test-installed' targets

123 + - t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED

124 + - gitweb: Move call to evaluate_git_version after evaluate_gitweb_config

125 +

126 +* ak/apply-non-git-epoch (2010-09-29) 1 commit

127 + - apply: Recognize epoch timestamps with : in the timezone

128 +

129 +* ak/submodule-sync (2010-10-08) 1 commit

130 + - submodule sync: Update "submodule.<name>.url" for empty directories

131 +

132 +* cb/leading-path-removal (2010-10-09) 5 commits

133 + - do not overwrite files in leading path

134 + - lstat_cache: optionally return match_len

135 + - add function check_ok_to_remove()

136 + - t7607: add leading-path tests

137 + - t7607: use test-lib functions and check MERGE_HEAD

138 +

139 +* jh/notes-merge (2010-10-09) 21 commits

140 + - Provide 'git notes get-ref' to easily retrieve current notes ref

141 + - git notes merge: Add testcases for merging notes trees at different fanouts

142 + - git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"

143 + - git notes merge: --commit should fail if underlying notes ref has moved

144 + - git notes merge: List conflicting notes in notes merge commit message

145 + - git notes merge: Manual conflict resolution, part 2/2

146 + - git notes merge: Manual conflict resolution, part 1/2

147 + - Documentation: Preliminary docs on 'git notes merge'

148 + - git notes merge: Add automatic conflict resolvers (ours, theirs, union)

149 + - git notes merge: Handle real, non-conflicting notes merges

150 + - builtin/notes.c: Refactor creation of notes commits.

151 + - git notes merge: Initial implementation handling trivial merges only

152 + - builtin/notes.c: Split notes ref DWIMmery into a separate function

153 + - notes.c: Use two newlines (instead of one) when concatenating notes

154 + - (trivial) t3303: Indent with tabs instead of spaces for consistency

155 + - notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond

156 + - notes.h/c: Clarify the handling of notes objects that are == null_sha1

157 + - notes.c: Reorder functions in preparation for next commit

158 + - notes.h: Make default_notes_ref() available in notes API

159 + - (trivial) notes.h: Minor documentation fixes to copy_notes()

160 + - notes.c: Hexify SHA1 in die() message from init_notes()

161 +

162 +Breaks build with arithmetic on (void *).

163 +

164 +* jk/maint-rev-list-nul (2010-10-07) 1 commit

165 + - rev-list: handle %x00 NUL in user format

166 +

167 +* jk/push-progress (2010-10-14) 2 commits

168 + - push: pass --progress down to git-pack-objects

169 + - t5523-push-upstream: test progress messages

170 +

171 +* jm/mailmap (2010-10-11) 1 commit

172 + - mailmap: fix use of freed memory

173 +

174 +The new test seems to make t4203 break intermittently.

175 +

176 +* jn/send-pack-error (2010-10-12) 1 commit

177 + - send-pack: avoid redundant "pack-objects died with strange error"

178 +

179 +* kb/completion-checkout (2010-10-12) 1 commit

180 + - completion: Support the DWIM mode for git checkout

181 +

182 +* pn/commit-autosquash (2010-10-07) 8 commits

183 + - add tests of commit --squash

184 + - commit: --squash option for use with rebase --autosquash

185 + - add tests of commit --fixup

186 + - commit: --fixup option for use with rebase --autosquash

187 + - pretty.c: teach format_commit_message() to reencode the output

188 + - pretty.c: helper methods for getting output encodings

189 + - commit.c: new function for looking up a comit by name

190 + - commit.c: prefer get_header() to manual searching

191 +

192 +* sg/bisect (2010-10-10) 3 commits

193 + - bisect: check for mandatory argument of 'bisect replay'

194 + - bisect: improve error msg of 'bisect reset' when original HEAD is deleted

195 + - bisect: improve error message of 'bisect log' while not bisecting

196 +

197 +* sg/completion (2010-10-11) 4 commits

198 + - bash: support pretty format aliases

199 + - bash: support more 'git notes' subcommands and their options

200 + - bash: not all 'git bisect' subcommands make sense when not bisecting

201 + - bash: offer refs for 'git bisect start'

202 +

203 +* sn/doc-opt-notation (2010-10-08) 6 commits

204 + (merged to 'next' on 2010-10-13 at 53ea256)

205 + + Fix {update,checkout}-index usage strings

206 + + Put a space between `<' and argument in pack-objects usage string

207 + + Remove stray quotes in --pretty and --format documentation

208 + + Use parentheses and `...' where appropriate

209 + + Fix odd markup in --diff-filter documentation

210 + + Use angles for placeholders consistently

211 +

212 +* yd/dir-rename (2010-10-10) 5 commits

213 + - diff --check: correct line numbers of new blank lines at EOF

214 + - Transfer special display of toplevel dir to display-time.

215 + - Only show bulkmoves in output.

216 + - Add testcases for the --detect-bulk-moves diffcore flag.

217 + - Introduce bulk-move detection in diffcore.

218 +

219 +This seems to break the build with decl-after-stmt.

220

221 --------------------------------------------------

222 [Stalled]

@@ -254,17 +260,6 @@ their reproduction recipe would belong to the test script for this topic.

260 It would hurt users to make the new feature on by default, especially the

261 ones with subdirectories that come and go.

262

257 -* jj/icase-directory (2010-08-16) 6 commits

258 - - Support case folding in git fast-import when core.ignorecase=true

259 - - Support case folding for git add when core.ignorecase=true

260 - - Add case insensitivity support when using git ls-files

261 - - Add case insensitivity support for directories when using git status

262 - - Case insensitivity support for .gitignore via core.ignorecase

263 - - Add string comparison functions that respect the ignore_case variable.

264 -

265 -Depends on GNU FNM_CASEFOLD. Presumably a bit of tweak in Makefile for

266 -non-windows but non-GNU platforms is all it takes?

267 -

263 * jk/tag-contains (2010-07-05) 4 commits

264 - Why is "git tag --contains" so slow?

265 - default core.clockskew variable to one day

@@ -279,16 +274,95 @@ current usage context.

274 --------------------------------------------------

275 [Cooking]

276

282 -* as/daemon-multi-listen (2010-08-30) 2 commits

283 - - daemon: allow more than one host address given via --listen

284 - - daemon: add helper function named_sock_setup

277 +* jj/icase-directory (2010-10-03) 8 commits

278 + - Support case folding in git fast-import when core.ignorecase=true

279 + - Support case folding for git add when core.ignorecase=true

280 + - Add case insensitivity support when using git ls-files

281 + - Add case insensitivity support for directories when using git status

282 + - Case insensitivity support for .gitignore via core.ignorecase

283 + - Add string comparison functions that respect the ignore_case variable.

284 + - Makefile & configure: add a NO_FNMATCH_CASEFOLD flag

285 + - Makefile & configure: add a NO_FNMATCH flag

286

286 -Should be Ok for 'next'.

287 +* ab/require-perl-5.8 (2010-09-24) 2 commits

288 + (merged to 'next' on 2010-09-27 at 1fcdd3c)

289 + + perl: use "use warnings" instead of -w

290 + + perl: bump the required Perl version to 5.8 from 5.6.[21]

291

288 -* jc/grep-header-all-match-fix-debug (2010-09-13) 1 commit

289 - - grep debugging, just in case

292 +* en/and-cascade-tests (2010-10-03) 13 commits

293 + - Introduce sane_unset and use it to ensure proper && chaining

294 + - t7800 (difftool): add missing &&

295 + - t7601 (merge-pull-config): add missing &&

296 + - t7001 (mv): add missing &&

297 + - t6016 (rev-list-graph-simplify-history): add missing &&

298 + - t5602 (clone-remote-exec): add missing &&

299 + - t4026 (color): remove unneeded and unchained command

300 + - t4019 (diff-wserror): add lots of missing &&

301 + - t4202 (log): Replace '<git-command> || :' with test_might_fail

302 + - t4002 (diff-basic): use test_might_fail for commands that might fail

303 + - t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&

304 + - t4017 (diff-retval): replace manual exit code check with test_expect_code

305 + - test-lib: make test_expect_code a test command

306

291 -Not necessary; will drop shortly.

307 +Somewhat rerolled, but the largest one among the series was Nacked by a

308 +few people and needs to be rerolled again.

309 +

310 +* jk/no-textconv-symlink (2010-09-21) 1 commit

311 + - diff: don't use pathname-based diff drivers for symlinks

312 + (this branch is used by ks/no-textconv-symlink.)

313 +

314 +* ks/no-textconv-symlink (2010-09-29) 3 commits

315 + - blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''

316 + - blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks

317 + - blame,cat-file: Prepare --textconv tests for correctly-failing conversion program

318 + (this branch uses jk/no-textconv-symlink.)

319 +

320 +* jp/send-email-to-cmd (2010-09-24) 1 commit

321 + (merged to 'next' on 2010-09-30 at 4284ddb)

322 + + git-send-email.perl: Add --to-cmd

323 +

324 +* kb/merge-recursive-rename-threshold (2010-09-27) 2 commits

325 + (merged to 'next' on 2010-09-30 at 4f33817)

326 + + diff: add synonyms for -M, -C, -B

327 + + merge-recursive: option to specify rename threshold

328 + (this branch uses jf/merge-ignore-ws.)

329 +

330 +* mg/fix-build-remote-helpers (2010-09-17) 1 commit

331 + (merged to 'next' on 2010-09-30 at 0583d5f)

332 + + remote-helpers: build in platform independent directory

333 +

334 +* nd/struct-pathspec (2010-09-20) 5 commits

335 + - ce_path_match: drop prefix matching in favor of match_pathspec

336 + - Convert ce_path_match() to use struct pathspec

337 + - tree_entry_interesting: turn to match_pathspec if wildcard is present

338 + - pathspec: add tree_recursive_diff parameter

339 + - pathspec: mark wildcard pathspecs from the beginning

340 + (this branch uses en/object-list-with-pathspec.)

341 +

342 +* en/object-list-with-pathspec (2010-09-20) 8 commits

343 + - Add testcases showing how pathspecs are handled with rev-list --objects

344 + - Make rev-list --objects work together with pathspecs

345 + - Move tree_entry_interesting() to tree-walk.c and export it

346 + - tree_entry_interesting(): remove dependency on struct diff_options

347 + - Convert struct diff_options to use struct pathspec

348 + - pathspec: cache string length when initializing pathspec

349 + - diff-no-index: use diff_tree_setup_paths()

350 + - Add struct pathspec

351 + (this branch is used by nd/struct-pathspec.)

352 +

353 +* sb/send-email-use-to-from-input (2010-10-04) 2 commits

354 + (merged to 'next' on 2010-10-06 at 5e9cb61)

355 + + send-email: Don't leak To: headers between patches

356 + (merged to 'next' on 2010-09-30 at 513b6f1)

357 + + send-email: Use To: headers in patch files

358 +

359 +* tc/smart-http-post-redirect (2010-09-25) 1 commit

360 + - smart-http: Don't change POST to GET when following redirect

361 +

362 +* as/daemon-multi-listen (2010-08-30) 2 commits

363 + (merged to 'next' on 2010-09-30 at 8083bf4)

364 + + daemon: allow more than one host address given via --listen

365 + + daemon: add helper function named_sock_setup

366

367 * dm/mergetool-vimdiff (2010-09-27) 3 commits

368 (merged to 'next' on 2010-09-29 at c8e22ea)

@@ -300,9 +374,7 @@ Not necessary; will drop shortly.

374 * en/rename-d-f (2010-09-08) 2 commits

375 - merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir

376 - t3509: Add rename + D/F conflict testcase that recursive strategy fails

303 -

304 -I am not entirely convinced this is a regression free band-aid; need to

305 -look at this a few more times.

377 + (this branch is used by en/merge-recursive.)

378

379 * kf/post-receive-sample-hook (2010-09-10) 1 commit

380 (merged to 'next' on 2010-09-22 at db674a3)

@@ -317,7 +389,7 @@ somebody who cares enough might want to look into it.

389 (merged to 'next' on 2010-09-22 at d62d10e)

390 + completion: make compatible with zsh

391

320 -Comments from bash users regarding regressions?

392 +Reported as breaking people with "set -u".

393

394 * po/sendemail (2010-09-06) 3 commits

395 (merged to 'next' on 2010-09-22 at 1105f62)

@@ -325,7 +397,7 @@ Comments from bash users regarding regressions?

397 + Remove @smtp_host_parts variable as not used.

398 + Minor indentation fix.

399

328 -Comments from potential users?

400 +Will merge to 'master' shortly.

401

402 * jl/fetch-submodule-recursive (2010-09-19) 4 commits

403 - fetch: Get submodule paths from index and not from .gitmodules

@@ -333,7 +405,7 @@ Comments from potential users?

405 - Submodules: Add the new "fetch" config option for fetch and pull

406 - fetch/pull: Recursively fetch populated submodules

407

336 -Further work expected after 1.7.3 between Jens and Kevin.

408 +I haven't picked up the rerolled one yet.

409

410 * jf/merge-ignore-ws (2010-08-26) 4 commits

411 (merged to 'next' on 2010-09-22 at 5161fb8)

@@ -343,8 +415,7 @@ Further work expected after 1.7.3 between Jens and Kevin.

415 + merge-recursive: expose merge options for builtin merge

416 (this branch is used by kb/merge-recursive-rename-threshold.)

417

346 -Possibly one of the star features of the release after 1.7.3, whether it

347 -is called 1.7.4 or 1.8.0.

418 +Possibly one of the star features of the coming release.

419

420 * tr/merge-unborn-clobber (2010-08-22) 1 commit

421 - Exhibit merge bug that clobbers index&WT

@@ -356,7 +427,7 @@ is called 1.7.4 or 1.8.0.

427 + tree-walk: Correct bitrotted comment about tree_entry()

428 + Document pre-condition for tree_entry_interesting

429

359 -Need to look at this a few more times to convince myself that this is Ok.

430 +Will merge to 'master' shortly.

431

432 * ab/i18n (2010-09-12) 159 commits

433 - po/sv.po: add Swedish translation

What's cooking (2010/10 #01)