af0218904f · matheusbsbs/matheus-bagliano

@@ -1,8 +1,8 @@

1 -Subject: What's cooking in git.git (Oct 2008, #04; Sat, 18)

2 -X-master-at: 3041b98a9d40e5eb1aae9698c7e15c85ff37f344

3 -X-next-at: 8f0e41f379d486dd27766d84d994eb1da5b8319d

1 +Subject: What's cooking in git.git (Oct 2008, #05; Wed, 22)

2 +X-master-at: 759ad19e772a79a2a5ae6b7377d57eb21d29e6a0

3 +X-next-at: 6ea41095c3a924d4f7d4e9d3f61fb472507612c8

4

5 -What's cooking in git.git (Oct 2008, #04; Sat, 18)

5 +What's cooking in git.git (Oct 2008, #05; Wed, 22)

6 --------------------------------------------------

7

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

@@ -15,8 +15,34 @@ meant to be merged to the maintenance series have "maint-" in their names.

15 ----------------------------------------------------------------

16 [New Topics]

17

18 -* jc/gitweb-fix-cloud-tag (Tue Oct 14 21:27:12 2008 -0700) 1 commit

19 - + Fix reading of cloud tags

18 +* cj/maint-gitpm-fix-maybe-self (Sat Oct 18 20:25:12 2008 +0200) 1 commit

19 + + Git.pm: do not break inheritance

20 +

21 +Looked Ok; will be in 'master' soon.

22 +

23 +* gb/gitweb-pathinfo (Tue Oct 21 21:34:54 2008 +0200) 5 commits

24 + - gitweb: generate parent..current URLs

25 + - gitweb: parse parent..current syntax from PATH_INFO

26 + - gitweb: use_pathinfo filenames start with /

27 + - gitweb: generate project/action/hash URLs

28 + - gitweb: parse project/action/hash_base:filename PATH_INFO

29 +

30 +Seventh iteration; hopefully the usual gitweb gangs will give quick

31 +comments and ack to push this out to 'next' soon.

32 +

33 +* ag/blame-encoding (Wed Oct 22 00:55:57 2008 +0400) 1 commit

34 + + builtin-blame: Reencode commit messages according to git-log

35 + rules.

36 +

37 +Looked Ok; will be in 'master' soon.

38 +

39 +* mv/parseopt-checkout-index (Sat Oct 18 03:17:23 2008 +0200) 1 commit

40 + + parse-opt: migrate builtin-checkout-index.

41 +

42 +Looked Ok; will be in 'master' soon.

43 +

44 +----------------------------------------------------------------

45 +[Graduated to "master"]

46

47 * rs/alloc-ref (Sat Oct 18 10:44:18 2008 +0200) 3 commits

48 + make alloc_ref_from_str() the new alloc_ref()

@@ -24,85 +50,30 @@ meant to be merged to the maintenance series have "maint-" in their names.

50 + add alloc_ref_with_prefix()

51

52 * jc/maint-reset-remove-unmerged-new (Wed Oct 15 16:00:06 2008 -0700) 1 commit

27 - - reset --hard/read-tree --reset -u: remove unmerged new paths

53 + + reset --hard/read-tree --reset -u: remove unmerged new paths

54 +

55 +Teaches "reset --hard" to remove new paths in conflict.

56

57 * jk/fix-ls-files-other (Fri Oct 17 13:03:52 2008 -0700) 2 commits

58 + Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other

59 + refactor handling of "other" files in ls-files and status

60

61 * jc/maint-co-track (Fri Oct 17 15:44:39 2008 -0700) 4 commits

34 - - Fix checkout not to clobber the branch when using symlinked HEAD

62 + + Fix checkout not to clobber the branch when using symlinked HEAD

63 upon detaching

36 - - Enhance hold_lock_file_for_{update,append}() API

37 - - demonstrate breakage of detached checkout with symbolic link HEAD

38 - - Fix "checkout --track -b newbranch" on detached HEAD

64 + + Enhance hold_lock_file_for_{update,append}() API

65 + + demonstrate breakage of detached checkout with symbolic link HEAD

66 + + Fix "checkout --track -b newbranch" on detached HEAD

67

68 * jk/maint-ls-files-other (Thu Oct 16 11:07:26 2008 -0400) 1 commit

69 + refactor handling of "other" files in ls-files and status

70

43 -* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit

44 - + merge: remove deprecated summary and diffstat options and config

45 - variables

46 -

47 -* np/index-pack (Fri Oct 17 15:57:58 2008 -0400) 2 commits

48 - + index-pack: smarter memory usage during delta resolution

49 - + index-pack: rationalize delta resolution code

50 -

51 -----------------------------------------------------------------

52 -[Graduated to "master"]

53 -

71 * pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits

72 + tutorial: update output of git commit

73 + reformat informational commit message

74 + git commit: Reformat output somewhat

75 + builtin-commit.c: show on which branch a commit was added

76

60 -----------------------------------------------------------------

61 -[Needs review]

62 -

63 -* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits

64 - - grep: skip files outside sparse checkout area

65 - - checkout_entry(): CE_NO_CHECKOUT on checked out entries.

66 - - Prevent diff machinery from examining worktree outside sparse

67 - checkout

68 - - ls-files: Add tests for --sparse and friends

69 - - update-index: add --checkout/--no-checkout to update

70 - CE_NO_CHECKOUT bit

71 - - update-index: refactor mark_valid() in preparation for new options

72 - - ls-files: add options to support sparse checkout

73 - - Introduce CE_NO_CHECKOUT bit

74 - - Extend index to save more flags

75 -

76 -----------------------------------------------------------------

77 -[Dropped]

78 -

79 -* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit

80 - . t7400: Add short "git submodule add" testsuite

81 -

82 -Was waiting for a reroll.

83 -

84 -* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit

85 - . git-am: Pass the --directory option through to git-apply

86 -

87 -I think this is still buggy and drops the option when am stops with

88 -conflicts.

89 -

90 -----------------------------------------------------------------

91 -[Stalled]

92 -

93 -* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits

94 - - Use xdiff caching to improve git blame performance

95 - - Allow xdiff machinery to cache hash results for a file

96 - - Always initialize xpparam_t to 0

97 - - Bypass textual patch generation and parsing in git blame

98 - - Allow alternate "low-level" emit function from xdl_diff

99 -

100 -Réne had good comments on how the callback should be structured.

101 -Waiting for a reroll.

102 -

103 -----------------------------------------------------------------

104 -[Will be merged to 'master' soon]

105 -

77 * js/maint-fetch-update-head (Tue Oct 14 15:32:20 2008 -0700) 2 commits

78 + pull: allow "git pull origin $something:$current_branch" into an

79 unborn branch

@@ -160,33 +131,15 @@ depend upon this initial cleanup work.

131 Does what it says it does. This may be ready for master soon,

132 its a pretty trivial change.

133

163 -----------------------------------------------------------------

164 -[Actively Cooking]

165 -

134 * tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits

135 + Documentation: Refer to git-rebase(1) to warn against rewriting

136 + Documentation: new upstream rebase recovery section in git-rebase

137

170 -Expecting an update.

138 +Also the workflow document itself is now in 'master'.

139

140 * sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit

141 + rebase--interactive: fix parent rewriting for dropped commits

142

175 -* sh/rebase-i-p (Wed Oct 15 02:44:40 2008 -0500) 8 commits

176 - - rebase-i-p: if todo was reordered use HEAD as the rewritten parent

177 - - rebase-i-p: do not include non-first-parent commits touching

178 - UPSTREAM

179 - - rebase-i-p: only list commits that require rewriting in todo

180 - - rebase-i-p: fix 'no squashing merges' tripping up non-merges

181 - - rebase-i-p: delay saving current-commit to REWRITTEN if squashing

182 - - rebase-i-p: use HEAD for updating the ref instead of mapping

183 - OLDHEAD

184 - - rebase-i-p: test to exclude commits from todo based on its parents

185 - + rebase--interactive: fix parent rewriting for dropped commits

186 -

187 -Changes the `rebase -i -p` behavior to behave like git sequencer's

188 -rewrite of `rebase -i` would behave.

189 -

143 * jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits

144 + diff: add filter for converting binary to text

145 + diff: introduce diff.<driver>.binary

@@ -197,11 +150,72 @@ A general cleanup on how diff drivers are implemented. Its still

150 missing documentation updates and tests but doesn't break anything

151 current as far as I can tell.

152

153 +----------------------------------------------------------------

154 +[Stalled]

155 +

156 +* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits

157 + - grep: skip files outside sparse checkout area

158 + - checkout_entry(): CE_NO_CHECKOUT on checked out entries.

159 + - Prevent diff machinery from examining worktree outside sparse

160 + checkout

161 + - ls-files: Add tests for --sparse and friends

162 + - update-index: add --checkout/--no-checkout to update

163 + CE_NO_CHECKOUT bit

164 + - update-index: refactor mark_valid() in preparation for new options

165 + - ls-files: add options to support sparse checkout

166 + - Introduce CE_NO_CHECKOUT bit

167 + - Extend index to save more flags

168 +

169 +Needs review.

170 +

171 +* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits

172 + - Use xdiff caching to improve git blame performance

173 + - Allow xdiff machinery to cache hash results for a file

174 + - Always initialize xpparam_t to 0

175 + - Bypass textual patch generation and parsing in git blame

176 + - Allow alternate "low-level" emit function from xdl_diff

177 +

178 +Réne had good comments on how the callback should be structured.

179 +Waiting for a reroll.

180 +

181 * jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit

182 - gitweb: Better processing format string in custom links in navbar

183

184 Waiting for some sort of response from Pasky.

185

186 +* jc/gitweb-fix-cloud-tag (Tue Oct 14 21:27:12 2008 -0700) 1 commit

187 + + Fix reading of cloud tags

188 +

189 +Request-for-review-and-ack sent; waiting for response.

190 +

191 +----------------------------------------------------------------

192 +[Actively Cooking]

193 +

194 +* np/index-pack (Wed Oct 22 20:59:22 2008 -0400) 4 commits

195 + - improve index-pack tests

196 + + fix multiple issues in index-pack

197 + + index-pack: smarter memory usage during delta resolution

198 + + index-pack: rationalize delta resolution code

199 +

200 +The buglets that caused people on 'next' some surprises are quickly

201 +killed. Thanks.

202 +

203 +* sh/rebase-i-p (Wed Oct 22 11:59:30 2008 -0700) 9 commits

204 + + git-rebase--interactive.sh: comparision with == is bashism

205 + + rebase-i-p: minimum fix to obvious issues

206 + + rebase-i-p: if todo was reordered use HEAD as the rewritten parent

207 + + rebase-i-p: do not include non-first-parent commits touching

208 + UPSTREAM

209 + + rebase-i-p: only list commits that require rewriting in todo

210 + + rebase-i-p: fix 'no squashing merges' tripping up non-merges

211 + + rebase-i-p: delay saving current-commit to REWRITTEN if squashing

212 + + rebase-i-p: use HEAD for updating the ref instead of mapping

213 + OLDHEAD

214 + + rebase-i-p: test to exclude commits from todo based on its parents

215 +

216 +Changes the `rebase -i -p` behavior to behave like git sequencer's

217 +rewrite of `rebase -i` would behave.

218 +

219 ----------------------------------------------------------------

220 [On Hold]

221

What's cooking (2008/10 #05)