f37cba2fa0 · matheusbsbs/matheus-bagliano

@@ -1,20 +1,15 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jan 2012, #08; Tue, 31)

3 -X-master-at: 2a2aa8e5561d4cfc00c8e021b1231958f6d4d2fa

4 -X-next-at: a0195c8c59b10d7dd4bf7ef9fcfd8e43f04a6777

2 +Subject: What's cooking in git.git (Feb 2012, #01; Fri, 3)

3 +X-master-at: f3fb07509c2e0b21b12a598fcd0a19a92fc38a9d

4 +X-next-at: e26aed0c97a6c884b5f569830384355d6afb16f1

5

6 -What's cooking in git.git (Jan 2012, #08; Tue, 31)

6 +What's cooking in git.git (Feb 2012, #01; Fri, 3)

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

8

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

10 only in 'pu' (proposed updates) while commits prefixed with '+' are in

11 'next'.

12

13 -As promised in the recent couple of issues of "What's cooking", the first

14 -batch of topics that have been cooking in 'next' are now in 'master'. The

15 -tip of 'next' hasn't been rewound yet, but it soon will after the second

16 -batch of topics graduate.

17 -

13 Here are the repositories that have my integration branches:

14

15 With maint, master, next, pu, todo:

@@ -43,132 +38,100 @@ The preformatted documentation in HTML and man format are found in:

38 --------------------------------------------------

39 [New Topics]

40

46 -* fc/zsh-completion (2012-01-30) 4 commits

47 - - (squash to previous?) completion: remove unused code

48 - - completion: simplify __git_remotes

49 - - (squash) completion-style

50 - - completion: be nicer with zsh

41 +* nd/diffstat-gramnum (2012-02-03) 1 commit

42 + - Use correct grammar in diffstat summary line

43

52 -Somehow only 2 out of 4-part series seem to have reached the list, missing

53 -the other 2.

44 +The commands in the "git diff" family and "git apply --stat" that count

45 +the number of files changed and the number of lines inserted/deleted have

46 +been updated to match the output from "diffstat". This also opens the

47 +door to i18n this line.

48

55 -* jc/maint-request-pull-for-tag (2012-01-31) 1 commit

56 - - request-pull: explicitly ask tags/$name to be pulled

49 +Will merge to 'next'.

50 +

51 +* jx/i18n-more-marking (2012-02-01) 2 commits

52 + - i18n: format_tracking_info "Your branch is behind" message

53 + - i18n: git-commit whence_s "merge/cherry-pick" message

54

58 -Usability improvement.

55 Will merge to 'next'.

56

61 -* nd/find-pack-entry-recent-cache-invalidation (2012-01-31) 1 commit

62 - - find_pack_entry(): do not keep packed_git pointer locally

57 +* jk/grep-binary-attribute (2012-02-02) 9 commits

58 + - grep: pre-load userdiff drivers when threaded

59 + - grep: load file data after checking binary-ness

60 + - grep: respect diff attributes for binary-ness

61 + - grep: cache userdiff_driver in grep_source

62 + - grep: drop grep_buffer's "name" parameter

63 + - convert git-grep to use grep_source interface

64 + - grep: refactor the concept of "grep source" into an object

65 + - grep: move sha1-reading mutex into low-level code

66 + - grep: make locking flag global

67 +

68 +Fixes a longstanding bug that there was no way to tell "git grep" that a

69 +path may look like text but it is not, which "git diff" can do using the

70 +attributes system. Now "git grep" honors the same "binary" (or "-diff")

71 +attribute.

72

64 -Review comments sent.

73 +Will merge to 'next'.

74

66 -* nd/pack-objects-parseopt (2012-01-31) 1 commit

67 - - pack-objects: convert to use parse_options()

75 +* jc/parse-date-raw (2012-02-03) 2 commits

76 + - parse_date(): '@' prefix forces git-timestamp

77 + - parse_date(): allow ancient git-timestamp

78

69 -Review comments sent.

79 +"rebase" and "commit --amend" failed to work on commits with ancient

80 +timestamps near year 1970.

81

71 -* tr/merge-edit-guidance (2012-01-31) 1 commit

72 - (merged to 'next' on 2012-01-31 at bb678f7)

73 - + merge: add instructions to the commit message when editing

82 +Waiting for comments.

83 +

84 +* jk/git-dir-lookup (2012-02-02) 1 commit

85 + - standardize and improve lookup rules for external local repos

86 +

87 +Will merge to 'next'.

88 +

89 +* jk/prompt-fallback-to-tty (2012-02-03) 2 commits

90 + - prompt: fall back to terminal if askpass fails

91 + - prompt: clean up strbuf usage

92 +

93 +The code to ask for password did not fall back to the terminal input when

94 +GIT_ASKPASS is set but does not work (e.g. lack of X with GUI askpass

95 +helper).

96 +

97 +* jk/tests-write-script (2012-02-03) 2 commits

98 + - t0300: use write_script helper

99 + - tests: add write_script helper function

100 +

101 +Will merge to 'next'.

102

75 -Will merge to 'master' in the second batch.

103 +* jn/gitweb-search-utf-8 (2012-02-03) 1 commit

104 + - gitweb: Allow UTF-8 encoded CGI query parameters and path_info

105 +

106 +Search box in "gitweb" did not accept non-ASCII characters correctly.

107 +Will merge to 'next'.

108 +

109 +* jn/rpm-spec (2012-02-03) 1 commit

110 + - git.spec: Workaround localized messages not put in any RPM

111 +

112 +Fix breakage in v1.7.9 Makefile; rpmbuild notices an unpackaged but

113 +installed *.mo file and fails.

114 +

115 +Will merge to 'next'.

116

117 --------------------------------------------------

118 [Graduated to "master"]

119

80 -* ar/i18n-no-gettext (2012-01-27) 4 commits

81 - (merged to 'next' on 2012-01-27 at 0ecf258)

82 - + i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT

83 - (merged to 'next' on 2012-01-23 at 694a94e)

84 - + i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n

85 - + add a Makefile switch to avoid gettext translation in shell scripts

86 - + git-sh-i18n: restructure the logic to compute gettext.sh scheme

87 -

88 -* da/maint-mergetool-twoway (2012-01-23) 1 commit

89 - (merged to 'next' on 2012-01-23 at f927323)

90 - + mergetool: Provide an empty file when needed

91 -

92 -Caters to GUI merge backends that cannot merge two files without

93 -a base by giving them an empty file as a "pretend" common ancestor.

94 -

95 -* jc/advise-i18n (2011-12-22) 1 commit

96 - (merged to 'next' on 2012-01-23 at 6447013)

97 - + i18n of multi-line advice messages

98 -

99 -Allow localization of advice messages that tend to be longer and

100 -multi-line formatted. For now this is deliberately limited to advise()

101 -interface and not vreportf() in general as touching the latter has

102 -interactions with error() that has plumbing callers whose prefix "error: "

103 -should never be translated.

104 -

105 -* jl/submodule-re-add (2012-01-24) 1 commit

106 - (merged to 'next' on 2012-01-26 at 482553e)

107 - + submodule add: fix breakage when re-adding a deep submodule

108 -

109 -"git submodule add" forgot to recompute the name to be stored in .gitmodules

110 -when the module was once added to the superproject and already initialized.

111 -

112 -* ks/sort-wildcard-in-makefile (2012-01-22) 1 commit

113 - (merged to 'next' on 2012-01-23 at e2e0c1d)

114 - + t/Makefile: Use $(sort ...) explicitly where needed

115 -

116 -t/Makefile is adjusted to prevent newer versions of GNU make from running

117 -tests in seemingly random order.

118 -

119 -* ld/git-p4-branches-and-labels (2012-01-20) 5 commits

120 - (merged to 'next' on 2012-01-23 at 9020ec4)

121 - + git-p4: label import fails with multiple labels at the same changelist

122 - + git-p4: add test for p4 labels

123 - + git-p4: importing labels should cope with missing owner

124 - + git-p4: cope with labels with empty descriptions

125 - + git-p4: handle p4 branches and labels containing shell chars

126 - (this branch is used by va/git-p4-branch.)

127 -

128 -* nd/clone-detached (2012-01-24) 12 commits

129 - (merged to 'next' on 2012-01-26 at 7b0cc8a)

130 - + clone: fix up delay cloning conditions

131 - (merged to 'next' on 2012-01-23 at bee31c6)

132 - + push: do not let configured foreign-vcs permanently clobbered

133 - (merged to 'next' on 2012-01-23 at 9cab64e)

134 - + clone: print advice on checking out detached HEAD

135 - + clone: allow --branch to take a tag

136 - + clone: refuse to clone if --branch points to bogus ref

137 - + clone: --branch=<branch> always means refs/heads/<branch>

138 - + clone: delay cloning until after remote HEAD checking

139 - + clone: factor out remote ref writing

140 - + clone: factor out HEAD update code

141 - + clone: factor out checkout code

142 - + clone: write detached HEAD in bare repositories

143 - + t5601: add missing && cascade

144 -

145 -"git clone" learned to detach the HEAD in the resulting repository when

146 -the source repository's HEAD does not point to a branch.

147 -

148 -* rr/sequencer (2012-01-11) 2 commits

149 - (merged to 'next' on 2012-01-23 at f349b56)

150 - + sequencer: factor code out of revert builtin

151 - + revert: prepare to move replay_action to header

152 -

153 -Moving large chunk of code out of cherry-pick/revert for later reuse,

154 -primarily to prepare for the next cycle.

155 -

156 -* tr/grep-l-with-decoration (2012-01-23) 1 commit

157 - (merged to 'next' on 2012-01-23 at 42b8795)

158 - + grep: fix -l/-L interaction with decoration lines

159 -

160 -Using "git grep -l/-L" together with options -W or --break may not make

161 -much sense as the output is to only count the number of hits and there is

162 -no place for file breaks, but the latter options made "-l/-L" to miscount

163 -the hits.

164 -

165 -* va/git-p4-branch (2012-01-26) 4 commits

166 - (merged to 'next' on 2012-01-26 at e67c52a)

167 - + t9801: do not overuse test_must_fail

168 - + git-p4: Change p4 command invocation

169 - + git-p4: Add test case for complex branch import

170 - + git-p4: Search for parent commit on branch creation

171 - (this branch uses ld/git-p4-branches-and-labels.)

120 +* jc/pull-signed-tag (2012-01-23) 1 commit

121 + (merged to 'next' on 2012-01-23 at 4257553)

122 + + merge: use editor by default in interactive sessions

123 +

124 +"git merge" in an interactive session learned to spawn the editor by

125 +default to let the user edit the auto-generated merge message, to

126 +encourage people to explain their merges better. Legacy scripts can

127 +export MERGE_AUTOEDIT=no to retain the historical behaviour.

128 +

129 +* tr/merge-edit-guidance (2012-01-31) 1 commit

130 + (merged to 'next' on 2012-01-31 at bb678f7)

131 + + merge: add instructions to the commit message when editing

132 +

133 +"git merge" adds advice text to the commit log template when running

134 +interactively.

135

136 --------------------------------------------------

137 [Stalled]

@@ -185,15 +148,12 @@ Waiting for a reroll.

148 * ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits

149 - fixup! 15eaaf4

150 - git-svn, perl/Git.pm: extend Git::prompt helper for querying users

188 - (merged to 'next' on 2012-01-05 at 954f125)

189 - + perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS

151 + - perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS

152

153 The bottom one has been replaced with a rewrite based on comments from

154 Ævar. The second one needs more work, both in perl/Git.pm and prompt.c, to

155 give precedence to tty over SSH_ASKPASS when terminal is available.

156

195 -Will defer till the next cycle.

196 -

157 * nd/commit-ignore-i-t-a (2012-01-16) 2 commits

158 - commit, write-tree: allow to ignore CE_INTENT_TO_ADD while writing trees

159 - cache-tree: update API to take abitrary flags

@@ -201,29 +161,67 @@ Will defer till the next cycle.

161 May want to consider this as fixing an earlier UI mistake, and not as a

162 feature that devides the userbase.

163

204 -Will defer till the next cycle.

205 -

164 --------------------------------------------------

165 [Cooking]

166

209 -* bl/gitweb-project-filter (2012-01-31) 8 commits

210 - - gitweb: Make project search respect project_filter

211 - - gitweb: improve usability of projects search form

212 - - gitweb: place links to parent directories in page header

213 - - gitweb: show active project_filter in project_list page header

214 - - gitweb: limit links to alternate forms of project_list to active project_filter

215 - - gitweb: add project_filter to limit project list to a subdirectory

216 - - gitweb: prepare git_get_projects_list for use outside 'forks'.

217 - - gitweb: move hard coded .git suffix out of git_get_projects_list

167 +* fc/zsh-completion (2012-02-03) 3 commits

168 + - completion: simplify __gitcomp and __gitcomp_nl implementations

169 + - completion: use ls -1 instead of rolling a loop to do that ourselves

170 + - completion: work around zsh option propagation bug

171 +

172 +Fix git subcommand completion for zsh (in contrib/completion).

173 +

174 +Will merge to 'next'.

175 +

176 +* jc/maint-request-pull-for-tag (2012-01-31) 1 commit

177 + (merged to 'next' on 2012-02-01 at 7649f18)

178 + + request-pull: explicitly ask tags/$name to be pulled

179 +

180 +When asking for a tag to be pulled, "request-pull" shows the name of the

181 +tag prefixed with "tags/"

182 +

183 +* nd/find-pack-entry-recent-cache-invalidation (2012-02-01) 2 commits

184 + (merged to 'next' on 2012-02-01 at e26aed0)

185 + + find_pack_entry(): do not keep packed_git pointer locally

186 + + sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry()

187 +

188 +* nd/pack-objects-parseopt (2012-02-01) 3 commits

189 + - pack-objects: convert to use parse_options()

190 + - pack-objects: remove bogus comment

191 + - pack-objects: do not accept "--index-version=version,"

192 +

193 +Will merge to 'next'.

194 +

195 +"pack-objects" learned use parse-options, losing custom command line

196 +parsing code.

197 +

198 +* bl/gitweb-project-filter (2012-02-01) 8 commits

199 + (merged to 'next' on 2012-02-01 at 2c96ce7)

200 + + gitweb: Make project search respect project_filter

201 + + gitweb: improve usability of projects search form

202 + + gitweb: place links to parent directories in page header

203 + + gitweb: show active project_filter in project_list page header

204 + + gitweb: limit links to alternate forms of project_list to active project_filter

205 + + gitweb: add project_filter to limit project list to a subdirectory

206 + + gitweb: prepare git_get_projects_list for use outside 'forks'.

207 + + gitweb: move hard coded .git suffix out of git_get_projects_list

208

219 -Seems to break test 9502.

209 +"gitweb" allows intermediate entries in the directory hierarchy that leads

210 +to a projects to be clicked, which in turn shows the list of projects

211 +inside that directory.

212

213 * rt/completion-branch-edit-desc (2012-01-29) 1 commit

222 - (merged to 'next' on 2012-01-31 at a0195c8)

214 + (merged to 'next' on 2012-02-01 at 0627ebf)

215 + completion: --edit-description option for git-branch

216

225 -* jn/svn-fe (2012-01-27) 44 commits

226 - (merged to 'next' on 2012-01-29 at 001a395)

217 +Originally merged to 'next' on 2012-01-31.

218 +Will merge to 'master'.

219 +

220 +* jn/svn-fe (2012-02-02) 47 commits

221 + - vcs-svn: suppress a -Wtype-limits warning

222 + - vcs-svn: allow import of > 4GiB files

223 + - vcs-svn: rename check_overflow arguments for clarity

224 + (merged to 'next' on 2012-02-01 at 9288c95)

225 + vcs-svn/svndiff.c: squelch false "unused" warning from gcc

226 + Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into jn/svn-fe

227 + vcs-svn: reset first_commit_done in fast_export_init

@@ -269,10 +267,12 @@ Seems to break test 9502.

267 + vcs-svn: set up channel to read fast-import cat-blob response

268 + Merge commit 'v1.7.5' into svn-fe

269

270 +Originally merged to 'next' on 2012-01-29.

271 +

272 "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and support

273 incremental imports.

274

275 -Will merge to 'master' in the second batch.

275 +Will merge to 'next' through the tip and then to 'master' soon after.

276

277 * jc/split-blob (2012-01-24) 6 commits

278 - chunked-object: streaming checkout

@@ -301,63 +301,3 @@ logic in the original patch extremely stupid to entice others, especially

301 the "bup" fanboys, to come up with a better logic, thinking that giving

302 people an easy target to shoot for, they may be encouraged to help

303 out. The plan is not working :-(.

304 -

305 -* jc/pull-signed-tag (2012-01-23) 1 commit

306 - (merged to 'next' on 2012-01-23 at 4257553)

307 - + merge: use editor by default in interactive sessions

308 -

309 -"git merge" in an interactive session learned to spawn the editor by

310 -default to let the user edit the auto-generated merge message, to

311 -encourage people to explain their merges better. Legacy scripts can

312 -export MERGE_AUTOEDIT=no to retain the historical behaviour.

313 -

314 -Will merge to 'master' in the second batch and deal with any fallout in

315 -'master'.

316 -

317 ---------------------------------------------------

318 -[Discarded]

319 -

320 -* mh/ref-api-rest (2011-12-12) 35 commits

321 - . repack_without_ref(): call clear_packed_ref_cache()

322 - . read_packed_refs(): keep track of the directory being worked in

323 - . is_refname_available(): query only possibly-conflicting references

324 - . refs: read loose references lazily

325 - . read_loose_refs(): take a (ref_entry *) as argument

326 - . struct ref_dir: store a reference to the enclosing ref_cache

327 - . sort_ref_dir(): take (ref_entry *) instead of (ref_dir *)

328 - . do_for_each_ref_in_dir*(): take (ref_entry *) instead of (ref_dir *)

329 - . add_entry(): take (ref_entry *) instead of (ref_dir *)

330 - . search_ref_dir(): take (ref_entry *) instead of (ref_dir *)

331 - . find_containing_direntry(): use (ref_entry *) instead of (ref_dir *)

332 - . add_ref(): take (ref_entry *) instead of (ref_dir *)

333 - . read_packed_refs(): take (ref_entry *) instead of (ref_dir *)

334 - . find_ref(): take (ref_entry *) instead of (ref_dir *)

335 - . is_refname_available(): take (ref_entry *) instead of (ref_dir *)

336 - . get_loose_refs(): return (ref_entry *) instead of (ref_dir *)

337 - . get_packed_refs(): return (ref_entry *) instead of (ref_dir *)

338 - . refs: wrap top-level ref_dirs in ref_entries

339 - . get_ref_dir(): keep track of the current ref_dir

340 - . do_for_each_ref(): only iterate over the subtree that was requested

341 - . refs: sort ref_dirs lazily

342 - . sort_ref_dir(): do not sort if already sorted

343 - . refs: store references hierarchically

344 - . refs.c: rename ref_array -> ref_dir

345 - . struct ref_entry: nest the value part in a union

346 - . check_refname_component(): return 0 for zero-length components

347 - . free_ref_entry(): new function

348 - . refs.c: reorder definitions more logically

349 - . is_refname_available(): reimplement using do_for_each_ref_in_array()

350 - . names_conflict(): simplify implementation

351 - . names_conflict(): new function, extracted from is_refname_available()

352 - . repack_without_ref(): reimplement using do_for_each_ref_in_array()

353 - . do_for_each_ref_in_arrays(): new function

354 - . do_for_each_ref_in_array(): new function

355 - . do_for_each_ref(): correctly terminate while processesing extra_refs

356 -

357 -Will be re-rolled. Discarded without prejudice.

358 -

359 -* mm/zsh-completion-regression-fix (2012-01-17) 1 commit

360 - (merged to 'next' on 2012-01-23 at 7bc2e0a)

361 - + bash-completion: don't add quoted space for ZSH (fix regression)

362 -

363 -Superseded by a better fix already in 'master'.

What's cooking (2012/02 #01)