aaa1af067f · matheusbsbs/matheus-bagliano

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

1 -Subject: What's cooking in git.git (Oct 2008, #03; Tue, 14)

2 -X-master-at: 67faaaba8338cf59c212ce5239eeb223a77acdf0

3 -X-next-at: f1ba443bf7f7fae740f81058fca0bcff3613d999

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

2 +X-master-at: 3041b98a9d40e5eb1aae9698c7e15c85ff37f344

3 +X-next-at: 8f0e41f379d486dd27766d84d994eb1da5b8319d

4

5 -What's cooking in git.git (Oct 2008, #03; Tue, 14)

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

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

7

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

@@ -12,19 +12,53 @@ in 'next'.

12 The topics list the commits in reverse chronological order. The topics

13 meant to be merged to the maintenance series have "maint-" in their names.

14

15 -This round I haven't added anything new yet. Just getting my development

16 -repository back into shape and in sync with what I received from Shawn.

17 -

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

16 [New Topics]

17

21 -* js/maint-fetch-update-head (Mon Oct 13 11:36:52 2008 +0200) 1 commit

22 - - Fix fetch/pull when run without --update-head-ok

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

19 + + Fix reading of cloud tags

20 +

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

22 + + make alloc_ref_from_str() the new alloc_ref()

23 + + use alloc_ref_from_str() everywhere

24 + + add alloc_ref_with_prefix()

25 +

26 +* 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

28 +

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

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

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

32 +

33 +* 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

35 + 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

39 +

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

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

42 +

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

24 -This looked sane to me.

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 +

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

55 + + tutorial: update output of git commit

56 + + reformat informational commit message

57 + + git commit: Reformat output somewhat

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

59

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

27 -[Stuck Topics]

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

@@ -39,18 +73,22 @@ This looked sane to me.

73 - Introduce CE_NO_CHECKOUT bit

74 - Extend index to save more flags

75

42 -Recently updated with a repost. Shawn says he's been too swamped at

43 -day-job to actively review the series. There has been some discussion on

44 -list about it so its not stalled, but it needs more eyeballs.

45 -

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

47 -[Stalled -- Needs Action to Proceed (or to be dropped)]

77 +[Dropped]

78

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

50 - - t7400: Add short "git submodule add" testsuite

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

81

52 -Still waiting for a reroll. Should be dropped next week if we don't

53 -get one during this coming week.

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

@@ -60,41 +98,21 @@ get one during this coming week.

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

99

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

63 -

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

65 - - git-am: Pass the --directory option through to git-apply

66 -

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

68 -conflicts.

101 +Waiting for a reroll.

102

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

104 [Will be merged to 'master' soon]

105

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

74 - + tutorial: update output of git commit

75 - + reformat informational commit message

76 - + git commit: Reformat output somewhat

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

78 -

79 -Shawn thinks this topic is settled for now, and I see that the new output

80 -format does not bother me very much, so please expect this to be merged

81 -soon.

82 -

83 -----------------------------------------------------------------

84 -[Actively Cooking]

85 -

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

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

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

89 -

90 -Shawn says that an update came in recently, but they are not here yet.

91 -I'd need to dig it up, but I haven't had time.

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

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

108 + unborn branch

109 + + Fix fetch/pull when run without --update-head-ok

110

93 -* ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit

111 +* ns/rebase-noverify (Tue Oct 14 08:17:16 2008 +0900) 2 commits

112 + + rebase: Document --no-verify option to bypass pre-rebase hook

113 + rebase --no-verify

114

96 -This adds --no-verify to git rebase, to avoid the pre-rebase hook. Lacks

97 -documentation but otherwise looks sound.

115 +This adds --no-verify to git rebase, to avoid the pre-rebase hook.

116

117 * mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit

118 + builtin-commit: use reduce_heads() only when appropriate

@@ -104,68 +122,28 @@ Fixes "git merge --no-ff --no-commit".

122 * ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit

123 + rebase: Support preserving merges in non-interactive mode

124

107 -* sh/rebase-i-p (Wed Oct 8 01:41:57 2008 -0500) 7 commits

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

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

110 - UPSTREAM

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

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

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

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

115 - OLDHEAD

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

125 +* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit

126 + + Do not rename read-only files during a push

127

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

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

120 -

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

122 - . rebase--interactive: fix parent rewriting for dropped commits

123 -

124 -Tentatively dropped from everwhere, waiting for a reroll together with

125 -sh/rebase-i-p.

126 -

127 -* pb/rename-rowin32 (Sun Oct 12 21:01:23 2008 -0700) 2 commits

128 - - (squash): index-pack: do not unconditionally make packfile read-

129 - only

130 - - Do not rename read-only files during a push

131 -

132 -Supposedly fixes pack file renames on Windows. The (squash) patch is my

133 -attempt to fix its breakage.

128 +Fixes pack file renames on Windows.

129

130 * sp/describe-lwtag (Mon Oct 13 07:39:46 2008 -0700) 1 commit

136 - - describe: Make --tags and --all match lightweight tags more often

131 + + describe: Make --tags and --all match lightweight tags more often

132

133 When the user gives --tags, the request is asking to treat lightweight and

134 annotated tags at equal weight, and if lightweight ones are closer, they

135 should be used.

136

142 -* gb/formatpatch-autonbr (Sun Oct 12 22:18:02 2008 -0700) 2 commits

143 - - (squash) adjust test vector for new behaviour of format-patch

144 - - format-patch: autonumber by default

137 +* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit

138 + + format-patch: autonumber by default

139

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

147 - - diff: add filter for converting binary to text

148 - - diff: introduce diff.<driver>.binary

149 - - diff: unify external diff and funcname parsing code

150 - - t4012: use test_cmp instead of cmp

151 -

152 -A general cleanup on how diff drivers are implemented. Its still

153 -missing documentation updates and tests but doesn't break anything

154 -current as far as I can tell. It needs more review before it can

155 -be slated for 'next'.

156 -

157 -* dp/checkattr (Tue Oct 7 04:16:52 2008 +0400) 2 commits

140 +* dp/checkattr (Wed Oct 15 09:11:52 2008 +0200) 3 commits

141 + + git-check-attr(1): use 'verse' for multi-line synopsis sections

142 + check-attr: Add --stdin option

143 + check-attr: add an internal check_attr() function

144

145 Batch attr lookup via --stdin, for gitk and git-gui.

146

163 -* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit

164 - + Implement git clone -v

165 -

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

167 -its a pretty trivial change.

168 -

147 * gb/refactor-pathinfo (Fri Oct 10 20:42:26 2008 +0200) 1 commit

148 + gitweb: refactor input parameters parse/validation

149

@@ -174,9 +152,50 @@ Future gitweb patches to add more arguments into the PATH_INFO

152 depend upon this initial cleanup work.

153

154 * ml/cygwin-filemode (Mon Oct 13 00:33:31 2008 -0400) 1 commit

177 - - compat/cygwin.c - Use cygwin's stat if core.filemode == true

155 + + compat/cygwin.c - Use cygwin's stat if core.filemode == true

156

179 -Is ready for 'next'.

157 +* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit

158 + + Implement git clone -v

159 +

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

161 +its a pretty trivial change.

162 +

163 +----------------------------------------------------------------

164 +[Actively Cooking]

165 +

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

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

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

169 +

170 +Expecting an update.

171 +

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

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

174 +

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 +

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

191 + + diff: add filter for converting binary to text

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

193 + + diff: unify external diff and funcname parsing code

194 + + t4012: use test_cmp instead of cmp

195 +

196 +A general cleanup on how diff drivers are implemented. Its still

197 +missing documentation updates and tests but doesn't break anything

198 +current as far as I can tell.

199

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

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

@@ -193,15 +212,6 @@ Waiting for some sort of response from Pasky.

212 I started making this incremental but the progress is not

213 so great.

214

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

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

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

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

200 - lines

201 - . stripspace: use parse_options()

202 - . Add "git am -s" test

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

204 -

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

216 - "git push": tellme-more protocol extension

217

What's cooking (2008/10 #04)