de2be69c24 · matheusbsbs/matheus-bagliano

@@ -1,4 +1,4 @@

1 -What's cooking in git.git (Jul 2008, issue #01; Tue, 01)

1 +What's cooking in git.git (Jul 2008, issue #02; Sun, 06)

2 --------------------------------------------------------

3

4 Here are the topics that have been cooking. Commits prefixed

@@ -16,7 +16,7 @@ already bug-free --- that is what cooking them in 'next' is for) and ar=

16 e

17 good set of feature enhancements. Bigger changes will be:

18

19 - * MinGW will be in.

19 + * Port for MinGW.

20

21 * With the default Makefile settings, most of the programs will be

22 installed outside your $PATH, except for "git", "gitk", "git-gui" an=

@@ -45,17 +45,143 @@ n

45 ----------------------------------------------------------------

46 [New Topics]

47

48 +* js/maint-daemon-syslog (Thu Jul 3 16:27:24 2008 +0100) 1 commit

49 + - [PARKED improvement suggested not rolled in] git daemon: avoid

50 + calling syslog() from a signal handler

51 +

52 +This will eventually appear in 'maint'; currently parked on 'pu', thoug=

53 +h.

54 +

55 +* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits

56 + - branch -r -v: do not spit out garbage

57 + + stat_tracking_info(): clear object flags used during counting

58 + + git-branch -v: show the remote tracking statistics

59 + + git-status: show the remote tracking statistics

60 + + Refactor "tracking statistics" code used by "git checkout"

61 +

62 +Makes the "your branch is ahead of the tracked one by N commits" logic =

63 +and

64 +messages available to other commands; status and branch are updated.

65 +

66 +* sg/stash-k-i (Fri Jun 27 16:37:15 2008 +0200) 1 commit

67 + - stash: introduce 'stash save --keep-index' option

68 +

69 +One weakness of our "partial commit" workflow support used to be that t=

70 +he

71 +user can incrementally build what is to be committed in the index but t=

72 +hat

73 +state cannot be tested as a whole in the working tree. This allows you=

74 + to

75 +temporarily stash the remaining changes in the working tree so that the

76 +index state before running "stash save --keep-index" can be seen in the

77 +working tree to be tested and then committed. A recommended workflow t=

78 +o

79 +use after that commit is made needs to be documented (and support needs=

80 + to

81 +be added if necessary).

82 +

83 +* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits

84 + + git-add--interactive: manual hunk editing mode

85 + + git-add--interactive: remove hunk coalescing

86 + + git-add--interactive: replace hunk recounting with apply --recount

87 +

88 +Adds 'e/dit' action to interactive add command.

89 +

90 +* am/stash-branch (Thu Jul 3 11:46:05 2008 +0530) 1 commit

91 + + Implement "git stash branch <newbranch> <stash>"

92 +

93 +Creates a new branch out of the stashed state, after returning from the

94 +interrupt that forced you to create the stash in the first place.

95 +

96 +* jc/grafts (Wed Jul 2 17:14:12 2008 -0700) 1 commit

97 + - Ignore graft during object transfer [broken wrt shallow clones]

98 +

99 +Cloning or fetching from a repository from grafts did not send objects

100 +that are hidden by grafts, but the commits in the resulting repository =

101 +do

102 +need these to pass fsck. This fixes object transfer to ignore grafts.

103 +

104 +Another fix is needed to git-prune so that it ignores grafts but treats

105 +commits that are mentioned in grafts as reachable.

106 +

107 +* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit

108 + - Allow per-command pager config

109 +

110 +----------------------------------------------------------------

111 +[Will merge to master soon]

112 +

113 * js/import-zip (Mon Jun 30 19:50:44 2008 +0100) 1 commit

114 + Add another fast-import example, this time for .zip files

115

51 -* js/apply-root (Tue Jul 1 00:44:47 2008 +0100) 1 commit

116 +* js/apply-root (Wed Jul 2 15:28:22 2008 -0700) 2 commits

117 + + apply --root: thinkofix.

118 + Teach "git apply" to prepend a prefix with "--root=3D<root>"

119

120 * db/no-git-config (Mon Jun 30 03:37:47 2008 -0400) 1 commit

121 + Only use GIT_CONFIG in "git config", not other programs

122

123 +* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits

124 + + Make default expiration period of reflog used for stash infinite

125 + + Per-ref reflog expiry configuration

126 +

127 +As 1.6.0 will be a good time to make backward incompatible changes, the

128 +tip commit makes the default expiry period of stash 'never', unless you

129 +configure them to expire explicitly using gc.refs/stash.* variables.

130 +Needs consensus, but I am guessing that enough people would want stash

131 +that does not expire.

132 +

133 +* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits

134 + + Eliminate an unnecessary chdir("..")

135 + + Add support for GIT_CEILING_DIRECTORIES

136 + + Fold test-absolute-path into test-path-utils

137 + + Implement normalize_absolute_path

138 +

139 +This still feels "because we can", not "because we need to", but it cam=

140 +e

141 +from somebody who had the need to, and I do not think it hurts people

142 +without the environment variable set.

143 +

144 +* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits

145 + + rerere.autoupdate

146 + + t4200: fix rerere test

147 + + rerere: remove dubious "tail_optimization"

148 + + git-rerere: detect unparsable conflicts

149 + + rerere: rerere_created_at() and has_resolution() abstraction

150 +

151 +A new configuration will allow paths that have been resolved cleanly by

152 +rerere to be updated in the index automatically.

153 +

154 +To me, this is "because we can", but was something requested by Ingo, s=

155 +o

156 +presumably some people may feel it useful in their workflow.

157 +

158 ----------------------------------------------------------------

58 -[Will merge to master soon]

159 +[Actively Cooking]

160 +

161 +* mv/merge-in-c (Tue Jul 1 04:37:50 2008 +0200) 15 commits

162 + - [REJECT -- over-abuse of path-list] Build in merge

163 + + Fix t7601-merge-pull-config.sh on AIX

164 + + git-commit-tree: make it usable from other builtins

165 + + Add new test case to ensure git-merge prepends the custom merge

166 + message

167 + + Add new test case to ensure git-merge reduces octopus parents when

168 + possible

169 + + Introduce reduce_heads()

170 + + Introduce get_merge_bases_many()

171 + + Add new test to ensure git-merge handles more than 25 refs.

172 + + Introduce get_octopus_merge_bases() in commit.c

173 + + git-fmt-merge-msg: make it usable from other builtins

174 + + Move read_cache_unmerged() to read-cache.c

175 + + Add new test to ensure git-merge handles pull.twohead and

176 + pull.octopus

177 + + Move parse-options's skip_prefix() to git-compat-util.h

178 + + Move commit_list_count() to commit.c

179 + + Move split_cmdline() to alias.c

180 +

181 +The last one is still not quite there, I am afraid.

182 +

183 +----------------------------------------------------------------

184 +[Graduated to "master"]

185

186 * j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits

187 + compat/pread.c: Add a forward declaration to fix a warning

@@ -105,204 +231,6 @@ n

231 + Compile some programs only conditionally.

232 + Add compat/regex.[ch] and compat/fnmatch.[ch].

233

108 -No explanation necessary ;-)

109 -

110 -----------------------------------------------------------------

111 -[Actively Cooking]

112 -

113 -* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits

114 - - Make default expiration period of reflog used for stash infinite

115 - - Per-ref reflog expiry configuration

116 -

117 -As 1.6.0 will be a good time to make backward incompatible changes, the

118 -tip commit makes the default expiry period of stash 'never', unless you

119 -configure them to expire explicitly using gc.refs/stash.* variables.

120 -Needs consensus, but I am guessing that enough people would want stash

121 -that does not expire.

122 -

123 -We may want to change the commit topology used to represent a stash, as

124 -proposed in $gmane/85055 by Nana earlier.

125 -

126 -* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 4 commits

127 - - Make "subtree" part more orthogonal to the rest of merge-

128 - recursive.

129 - + Teach git-merge to pass -X<option> to the backend strategy module

130 - + git-merge-recursive-{ours,theirs}

131 - + git-merge-file --ours, --theirs

132 -

133 -Punting a merge by discarding your own work in conflicting parts but st=

134 -ill

135 -salvaging the parts that are cleanly automerged. It is likely that thi=

136 -s

137 -will result in nonsense mishmash, but somehow often people want this, s=

138 -o

139 -here they are. The interface to the backends is updated so that you ca=

140 -n

141 -say "git merge -Xours -Xsubtree=3Dfoo/bar/baz -s recursive other" now.

142 -

143 -* mv/merge-in-c (Tue Jul 1 04:37:50 2008 +0200) 14 commits

144 - - Build in merge

145 - - git-commit-tree: make it usable from other builtins

146 - - Add new test case to ensure git-merge prepends the custom merge

147 - message

148 - - Add new test case to ensure git-merge reduces octopus parents when

149 - possible

150 - - Introduce reduce_heads()

151 - - Introduce get_merge_bases_many()

152 - - Add new test to ensure git-merge handles more than 25 refs.

153 - - Introduce get_octopus_merge_bases() in commit.c

154 - - git-fmt-merge-msg: make it usable from other builtins

155 - - Move read_cache_unmerged() to read-cache.c

156 - - Add new test to ensure git-merge handles pull.twohead and

157 - pull.octopus

158 - - Move parse-options's skip_prefix() to git-compat-util.h

159 - - Move commit_list_count() to commit.c

160 - - Move split_cmdline() to alias.c

161 -

162 -I think this is getting there. Will be in 'next' soon.

163 -

164 -* dr/ceiling (Mon May 19 23:49:34 2008 -0700) 4 commits

165 - + Eliminate an unnecessary chdir("..")

166 - + Add support for GIT_CEILING_DIRECTORIES

167 - + Fold test-absolute-path into test-path-utils

168 - + Implement normalize_absolute_path

169 -

170 -* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits

171 - + rerere.autoupdate

172 - + t4200: fix rerere test

173 - + rerere: remove dubious "tail_optimization"

174 - + git-rerere: detect unparsable conflicts

175 - + rerere: rerere_created_at() and has_resolution() abstraction

176 -

177 -A new configuration will allow paths that have been resolved cleanly by

178 -rerere to be updated in the index automatically.

179 -

180 -* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits

181 - - Migrate git-blame to parse-option partially.

182 - - parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.

183 - - parse-opt: fake short strings for callers to believe in.

184 - - parse-opt: do not print errors on unknown options, return -2

185 - intead.

186 - - parse-opt: create parse_options_step.

187 - - parse-opt: Export a non NORETURN usage dumper.

188 - - parse-opt: have parse_options_{start,end}.

189 -

190 -I recall Pierre said something about cleaning up the last one when he

191 -finds time, but other than that vague recollection, I lost track of thi=

192 -s

193 -series. I am tempted to fork a few topics off of the pen=C3=BAltimo on=

194 -e to

195 -convert a few more commands as examples and merge the result to 'next'.

196 -

197 -----------------------------------------------------------------

198 -[Graduated to "master"]

199 -

200 -* ph/mergetool (Mon Jun 16 17:33:41 2008 -0600) 1 commit

201 - + Remove the use of '--' in merge program invocation

202 -

203 -I got tired of waiting for success reports from people who use various

204 -backends. We will hear breakages if this breaks things anyway, and if =

205 -it

206 -does, it is a fairly simple single patch to revert.

207 -

208 -* nd/dashless (Tue Jun 24 19:58:11 2008 -0700) 2 commits

209 - + Keep some git-* programs in $(bindir)

210 - + Move all dashed-form commands to libexecdir

211 -

212 -We'll leave server-side programs in $(bindir) so that ssh clients can a=

213 -sk

214 -for "git-program" and find them on the $PATH. Next major release after

215 -1.6.0 would most likely remove the hardlinks to built-in commands, but =

216 -not

217 -yet.

218 -

219 -* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits

220 - + Prepare execv_git_cmd() for removal of builtins from the

221 - filesystem

222 - + git-shell: accept "git foo" form

223 -

224 -The botched "client asks 'git foo'" is not included. It will be long

225 -after everybody runs 1.6.0.

226 -

227 -* jk/maint-fetch-ref-hier (Fri Jun 27 00:01:41 2008 -0400) 2 commits

228 - + fetch: give a hint to the user when local refs fail to update

229 - + fetch: report local storage errors in status table

230 -

231 -When the remote used to have "foo" branch but now has "foo/bar", fetch

232 -refuses to delete the existing remote tracking branch "foo" to create a

233 -new remote tracking branch "foo/bar", but the error message was

234 -confusing.

235 -

236 -Need to backmerge to 'maint' after a while.

237 -

238 -* jc/maint-reset (Wed Jun 25 18:16:36 2008 -0700) 1 commit

239 - + Allow "git-reset path" when unambiguous

240 -

241 -We used to require "git-reset -- path" even when there is no ambiguity

242 -(i.e. path cannot be mistaken as a valid tree-ish and it is a filename =

243 -in

244 -the work tree).

245 -

246 -Need to backmerge to 'maint' after a while.

247 -

248 -* js/maint-clone-insteadof (Fri Jun 27 13:55:23 2008 +0100) 2 commits

249 - + clone: respect the settings in $HOME/.gitconfig and /etc/gitconfig

250 - + clone: respect url.insteadOf setting in global configs

251 -

252 -"git clone" did not honor "url.InsteadOf" in $HOME/.gitconfig. I think

253 -Daniel's "Let's get rid of internal use of GIT_CONFIG" makes sense (eve=

254 -n

255 -though it feels very scary), and it would make the solution much simple=

256 -r,

257 -but these two are independently good fix for now. I'll queue GIT_CONFI=

258 -G

259 -one in 'next' and when it graduates the unsetenv() solution in these wi=

260 -ll

261 -become no-op.

262 -

263 -* tr/send-email-ssl (Thu Jun 26 23:03:21 2008 +0200) 2 commits

264 - + git-send-email: prevent undefined variable warnings if no

265 - encryption is set

266 - + git-send-email: add support for TLS via Net::SMTP::SSL

267 -

268 -* kb/send-email-fifo (Wed Jun 25 15:44:40 2008 -0700) 1 commit

269 - + git-send-email: Accept fifos as well as files

270 -

271 -Two minor send-email feature enhancements.

272 -

273 -* jc/checkdiff (Sun Jun 29 16:49:06 2008 -0400) 7 commits

274 - + Fix t4017-diff-retval for white-space from wc

275 - + Update sample pre-commit hook to use "diff --check"

276 - + diff --check: detect leftover conflict markers

277 - + Teach "diff --check" about new blank lines at end

278 - + checkdiff: pass diff_options to the callback

279 - + check_and_emit_line(): rename and refactor

280 - + diff --check: explain why we do not care whether old side is

281 - binary

282 -

283 -Allows us to replace the sample pre-commit hook that was not aware of t=

284 -he

285 -line termination convention per path nor newer whitespace breakage rule=

286 -s.

287 -

288 -* np/pack-default (Wed Jun 25 00:25:53 2008 -0400) 2 commits

289 - + pack.indexversion config option now defaults to 2

290 - + repack.usedeltabaseoffset config option now defaults to "true"

291 -

292 -Updates the default value for pack.indexversion to 2 and use delta-base

293 -offset encoding of the packfiles by default.

294 -

295 -* js/apply-recount (Fri Jun 27 18:43:09 2008 +0100) 1 commit

296 - + Allow git-apply to recount the lines in a hunk (AKA recountdiff)

297 -

298 -A good ingredient for implementing "apply --edit".

299 -

300 -* dz/apply-again (Fri Jun 27 14:39:12 2008 -0400) 1 commit

301 - + git-apply: handle a patch that touches the same path more than

302 - once better

303 -

304 -Allows us to feed a patch that touches the same path more than once.

305 -

234 ----------------------------------------------------------------

235 [On Hold]

236

@@ -313,7 +241,9 @@ Allows us to feed a patch that touches the same path more than once.

241 This was previously in "will be in master soon" category, but it turns =

242 out

243 that the synonyms to the ones this one deletes are fairly new invention

316 -that happend in 1.5.6 timeframe, and we cannot do this just yet.

244 +that happend in 1.5.6 timeframe, and we cannot do this just yet. Perha=

245 +ps

246 +in 1.7.0.

247

248 * jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits

249 + Revert "Make clients ask for "git program" over ssh and local

@@ -334,6 +264,23 @@ hit due to tcl/tk's limitation, so I am holding this back for now.

264 ----------------------------------------------------------------

265 [Stalled/Needs more work]

266

267 +* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits

268 + - Migrate git-blame to parse-option partially.

269 + + parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.

270 + + parse-opt: fake short strings for callers to believe in.

271 + + parse-opt: do not print errors on unknown options, return -2

272 + intead.

273 + + parse-opt: create parse_options_step.

274 + + parse-opt: Export a non NORETURN usage dumper.

275 + + parse-opt: have parse_options_{start,end}.

276 +

277 +I recall Pierre said something about cleaning up the last one when he

278 +finds time, but other than that vague recollection, I lost track of thi=

279 +s

280 +series. I am tempted to fork a few topics off of the pen=C3=BAltimo on=

281 +e to

282 +convert a few more commands as examples and merge the result to 'next'.

283 +

284 * jc/blame (Wed Jun 4 22:58:40 2008 -0700) 7 commits

285 - blame: show "previous" information in --porcelain/--incremental

286 format

@@ -357,59 +304,26 @@ commit, which we should be able to separate out into an independent top=

304 ic

305 from the rest.

306

360 -----------------------------------------------------------------

361 -[Dropped for now]

362 -

363 -* sj/merge (Sat May 3 16:55:47 2008 -0700) 6 commits

364 - . Introduce fast forward option only

365 - . Head reduction before selecting merge strategy

366 - . Restructure git-merge.sh

367 - . Introduce -ff=3D<fast forward option>

368 - . New merge tests

369 - . Documentation for joining more than two histories

370 -

371 -This will interfere with Miklos's rewrite of merge to C.

372 -

373 -* js/rebase-i-sequencer (Sun Apr 27 02:55:50 2008 -0400) 17 commits

374 - . Use perl instead of tac

375 - . Fix t3404 assumption that `wc -l` does not use whitespace.

376 - . rebase -i: Use : in expr command instead of match.

377 - . rebase -i: update the implementation of 'mark' command

378 - . Add option --preserve-tags

379 - . Teach rebase interactive the tag command

380 - . Add option --first-parent

381 - . Do rebase with preserve merges with advanced TODO list

382 - . Select all lines with fake-editor

383 - . Unify the length of $SHORT* and the commits in the TODO list

384 - . Teach rebase interactive the merge command

385 - . Move redo merge code in a function

386 - . Teach rebase interactive the reset command

387 - . Teach rebase interactive the mark command

388 - . Move cleanup code into it's own function

389 - . Don't append default merge message to -m message

390 - . fake-editor: output TODO list if unchanged

391 -

392 -* jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits

393 - . WIP: rethink replay merge

394 - . Start using replay-tree merge in cherry-pick

395 - . revert/cherry-pick: start refactoring call to merge_recursive

396 -

397 -This is meant to improve cherry-pick's behaviour when renames are

398 -involved, by not using merge-recursive (whose d/f conflict resolution i=

399 -s

400 -quite broken), but unfortunately has stalled for some time now.

307 +* jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits

308 + + Make "subtree" part more orthogonal to the rest of merge-

309 + recursive.

310 + + Teach git-pull to pass -X<option> to git-merge

311 + + Teach git-merge to pass -X<option> to the backend strategy module

312 + + git-merge-recursive-{ours,theirs}

313 + + git-merge-file --ours, --theirs

314

402 -* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits

403 - . git-am --forge: add Signed-off-by: line for the author

404 - . git-am: clean-up Signed-off-by: lines

405 - . stripspace: add --log-clean option to clean up signed-off-by:

406 - lines

407 - . stripspace: use parse_options()

408 - . Add "git am -s" test

409 - . git-am: refactor code to add signed-off-by line for the committer

315 +Punting a merge by discarding your own work in conflicting parts but st=

316 +ill

317 +salvaging the parts that are cleanly automerged. It is likely that thi=

318 +s

319 +will result in nonsense mishmash, but somehow often people want this, s=

320 +o

321 +here they are. The interface to the backends is updated so that you ca=

322 +n

323 +say "git merge -Xours -Xsubtree=3Dfoo/bar/baz -s recursive other" now.

324

411 -Just my toy at this moment.

325 +The -X<option> part may change, Dscho mentions that a single-letter -X

326 +that take stuck option is against syntax rules, and I think he's right.

327

413 -* jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit

414 - . "git push": tellme-more protocol extension

328 +This is more "because we can", not "because we need to".

329