5fdc5e9934 · matheusbsbs/matheus-bagliano

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

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

2 -X-master-at: 759ad19e772a79a2a5ae6b7377d57eb21d29e6a0

3 -X-next-at: 6ea41095c3a924d4f7d4e9d3f61fb472507612c8

1 +Subject: What's cooking in git.git (Nov 2008, #01; Sun, 02)

2 +X-master-at: 6a509a6f7f38906996ac791449d5bcc2f32eef23

3 +X-next-at: d8fa4e31e3b8200edfff5aad88f249208cc0c5ae

4 +cc: "David M. Syzdek" <david.syzdek@acsalaska.net>, pasky@suse.cz

5

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

6 +What's cooking in git.git (Nov 2008, #01; Sun, 02)

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

8

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

@@ -15,20 +16,83 @@ meant to be merged to the maintenance series have "maint-" in their names.

16 ----------------------------------------------------------------

17 [New Topics]

18

19 +* mv/maint-branch-m-symref (Sat Nov 1 00:25:44 2008 +0100) 5 commits

20 + + update-ref --no-deref -d: handle the case when the pointed ref is

21 + packed

22 + + git branch -m: forbid renaming of a symref

23 + + Fix git update-ref --no-deref -d.

24 + + rename_ref(): handle the case when the reflog of a ref does not

25 + exist

26 + + Fix git branch -m for symrefs.

27 +

28 +* rs/blame (Sat Oct 25 15:31:36 2008 +0200) 5 commits

29 + - blame: use xdi_diff_hunks(), get rid of struct patch

30 + - add xdi_diff_hunks() for callers that only need hunk lengths

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

32 + - Always initialize xpparam_t to 0

33 + - blame: inline get_patch()

34 +

35 +* ds/uintmax-config (Sun Oct 26 03:52:47 2008 -0800) 2 commits

36 + - Add Makefile check for FreeBSD 4.9-SECURITY

37 + - Build: add NO_UINTMAX_T to support ancient systems

38 +

39 +I amended the topmost one to widen the applicability of this new feature

40 +to all FreeBSD 4.*, not limited to 4.9-SECURITY; testing before this hits

41 +'next' is appreciated.

42 +

43 +* ds/autoconf (Sun Nov 2 01:04:46 2008 -0700) 2 commits

44 + - DONTMERGE: fixup with a convenience macro

45 + - autoconf: Add link tests to each AC_CHECK_FUNC() test

46 +

47 +The topmost one is my attempt to simplify the new way of checking; the

48 +resulting configure.ac produces the identical configure script with or

49 +without it, so I think it is Ok, but testing before this hits 'next' is

50 +appreciated. If all goes well, I think the two should be squashed into

51 +one patch.

52 +

53 +* jk/diff-convfilter-test-fix (Fri Oct 31 01:09:13 2008 -0400) 4 commits

54 + + Avoid using non-portable `echo -n` in tests.

55 + + add userdiff textconv tests

56 + + document the diff driver textconv feature

57 + + diff: add missing static declaration

58 +

59 +* ar/maint-mksnpath (Mon Oct 27 11:22:09 2008 +0100) 7 commits

60 + + Use git_pathdup instead of xstrdup(git_path(...))

61 + + git_pathdup: returns xstrdup-ed copy of the formatted path

62 + + Fix potentially dangerous use of git_path in ref.c

63 + + Add git_snpath: a .git path formatting routine with output buffer

64 + + Fix potentially dangerous uses of mkpath and git_path

65 + + Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c

66 + + Add mksnpath which allows you to specify the output buffer

67 +

68 +* ar/mksnpath (Thu Oct 30 18:08:58 2008 -0700) 10 commits

69 + + Merge branch 'ar/maint-mksnpath' into ar/mksnpath

70 + + Use git_pathdup instead of xstrdup(git_path(...))

71 + + git_pathdup: returns xstrdup-ed copy of the formatted path

72 + + Fix potentially dangerous use of git_path in ref.c

73 + + Add git_snpath: a .git path formatting routine with output buffer

74 + + Fix potentially dangerous uses of mkpath and git_path

75 + + Merge branch 'ar/maint-mksnpath' into HEAD

76 + + Fix potentially dangerous uses of mkpath and git_path

77 + + Fix mkpath abuse in dwim_ref and dwim_log of sha1_name.c

78 + + Add mksnpath which allows you to specify the output buffer

79 +

80 +----------------------------------------------------------------

81 +[Will be merged to 'master' soon]

82 +

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

84 + Git.pm: do not break inheritance

85

86 Looked Ok; will be in 'master' soon.

87

88 * 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

89 + + gitweb: generate parent..current URLs

90 + + gitweb: parse parent..current syntax from PATH_INFO

91 + + gitweb: use_pathinfo filenames start with /

92 + + gitweb: generate project/action/hash URLs

93 + + gitweb: parse project/action/hash_base:filename PATH_INFO

94

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

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

95 +Seventh iteration.

96

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

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

@@ -41,118 +105,39 @@ Looked Ok; will be in 'master' soon.

105

106 Looked Ok; will be in 'master' soon.

107

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()

49 - + use alloc_ref_from_str() everywhere

50 - + add alloc_ref_with_prefix()

51 -

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

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

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

63 - upon detaching

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 -

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 -

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

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

81 -

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

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

84 - + rebase --no-verify

85 -

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

87 -

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

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

90 -

91 -Fixes "git merge --no-ff --no-commit".

92 -

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

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

95 -

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

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

98 -

99 -Fixes pack file renames on Windows.

100 -

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

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

103 -

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

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

106 -should be used.

107 -

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

109 - + format-patch: autonumber by default

110 -

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

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

113 - + check-attr: Add --stdin option

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

115 -

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

117 -

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

119 - + gitweb: refactor input parameters parse/validation

120 -

121 -A major cleanup on the way gitweb parses its input arguments.

122 -Future gitweb patches to add more arguments into the PATH_INFO

123 -depend upon this initial cleanup work.

124 -

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

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

127 -

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

129 - + Implement git clone -v

130 -

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

132 -its a pretty trivial change.

133 -

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 -

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

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

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

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

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

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

113 + UPSTREAM

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

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

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

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

118 + OLDHEAD

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

120

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

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

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

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

123

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

146 - + diff: unify external diff and funcname parsing code

147 - + t4012: use test_cmp instead of cmp

124 +* np/index-pack (Thu Oct 23 15:05:59 2008 -0400) 5 commits

125 + + index-pack: don't leak leaf delta result

126 + + improve index-pack tests

127 + + fix multiple issues in index-pack

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

129 + + index-pack: rationalize delta resolution code

130

149 -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.

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

132 +killed. Thanks.

133

134 ----------------------------------------------------------------

135 [Stalled]

136

137 +* jk/diff-convfilter (Sun Oct 26 00:50:02 2008 -0400) 8 commits

138 + - enable textconv for diff in verbose status/commit

139 + - wt-status: load diff ui config

140 +

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

142 - grep: skip files outside sparse checkout area

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

@@ -168,16 +153,6 @@ current as far as I can tell.

153

154 Needs review.

155

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 -

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

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

158

@@ -186,46 +161,24 @@ Waiting for some sort of response from Pasky.

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

162 + Fix reading of cloud tags

163

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

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

165

166 ----------------------------------------------------------------

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

167 +[Dropped]

168

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

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

170 + . Use xdiff caching to improve git blame performance

171 + . Allow xdiff machinery to cache hash results for a file

172 + . Always initialize xpparam_t to 0

173 + . Bypass textual patch generation and parsing in git blame

174 + . Allow alternate "low-level" emit function from xdl_diff

175

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

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

176 +Réne started code restructuring, which is queued to 'pu'; this series is

177 +dropped.

178

179 ----------------------------------------------------------------

180 [On Hold]

181

222 -* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits

223 - - revision --simplify-merges: incremental simplification

224 - - revision --simplify-merges: prepare for incremental simplification

225 -

226 -I started making this incremental but the progress is not

227 -so great.

228 -

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

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

184

What's cooking (2008/11 #01)