29e0eb3a06 · matheusbsbs/matheus-bagliano

@@ -1,6 +1,6 @@

1 -Subject: What's cooking in git.git (Jul 2008, issue #06; Tue, 15)

1 +Subject: What's cooking in git.git (Jul 2008, issue #07; Thu, 17)

2

3 -What's cooking in git.git (Jul 2008, issue #06; Tue, 15)

3 +What's cooking in git.git (Jul 2008, issue #07; Thu, 17)

4 --------------------------------------------------------

5

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

@@ -10,15 +10,77 @@ in 'next'.

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

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

12

13 -It so happens that the topics clearly separated between the ones that are

14 -obviously ready for 1.6.0 and the others that aren't yet as of tonight.

15 -It seems that it is a good time to draw that line and tag -rc0 tomorrow,

16 -after merging the remaining topics in 'next'.

13 +Right now 'next' is very thin. After today's new topics, perhaps except

14 +for the submodule stuff by Pasky, are merged to 'master', we will have the

15 +1.6.0-rc0, and from there the usual pre-release freeze begins.

16 +

17 +Due to increased activity level from people including GSoC students, I

18 +expect 'next' to stay somewhat more active than previous rounds during the

19 +1.6.0-rc cycle. The request for people who usually follow 'next' is the

20 +same as usual, though. After -rc1 is tagged, please run 'master' for your

21 +daily git use instead, in order to make sure 'master' does what it claims

22 +to do without regression.

23 +

24 +Tentative schedule, my wishful thinking:

25 +

26 + - 1.6.0-rc0 (Jul 20)

27 + - 1.6.0-rc1 (Jul 23)

28 + - 1.6.0-rc2 (Jul 30)

29 + - 1.6.0-rc3 (Aug 6)

30 + - 1.6.0 (Aug 10)

31

32 ----------------------------------------------------------------

33 [New Topics]

34

21 -I could apply these directly to master, but I am just playing it safe.

35 +* jc/rerere-auto-more (Wed Jul 16 20:25:18 2008 -0700) 1 commit

36 + - rerere.autoupdate: change the message when autoupdate is in effect

37 +

38 +This one is for Ingo.

39 +

40 +This changes the message rerere issues after reusing previous conflict

41 +resolution from "Resolved" to "Staged" when autoupdate option is in

42 +effect.

43 +

44 +It is envisioned that in practice, some auto resolutions are trickier and

45 +iffier than others, and we would want to add a feature to mark individual

46 +resolutions as "this is ok to autoupdate" or "do not autoupdate the result

47 +using this resolution even when rerere.autoupdate is in effect" in the

48 +future. When that happens, these messages will make the distinction

49 +clearer.

50 +

51 +* ap/trackinfo (Wed Jul 16 15:19:27 2008 -0400) 1 commit

52 + - Reword "your branch has diverged..." lines to reduce line length

53 +

54 +You saw the exchange on the list. Queued is my "make it shorter and make

55 +sure variable parts are closer to left edge of the screen" version but

56 +better alternatives are welcome. I suspect not many people would care too

57 +much about details, as long as the message fits and does not waste screen

58 +real estate.

59 +

60 +* ns/am-abort (Wed Jul 16 19:39:10 2008 +0900) 1 commit

61 + - git am --abort

62 +

63 +This one is for Ted; builds on top of the recent "am and rebase leaves

64 +ORIG_HEAD just like reset, merge and pull does" rather nicely.

65 +

66 +* pb/submodule (Wed Jul 16 21:11:40 2008 +0200) 7 commits

67 + - t7403: Submodule git mv, git rm testsuite

68 + - git rm: Support for removing submodules

69 + - git mv: Support moving submodules

70 + - submodule.*: Introduce simple C interface for submodule lookup by

71 + path

72 + - git submodule add: Fix naming clash handling

73 + - t7400: Add short "git submodule add" testsuite

74 + - git-mv: Remove dead code branch

75 +

76 +Long overdue usability improvement series for submodule. Very much

77 +welcomed. It would be nice to have some submodule improvements in 1.6.0.

78 +Realistically speaking, however, I predict that it would take us a few

79 +more rounds to hit 'next' with this, and it will not be in 'master' when

80 +1.6.0 ships.

81 +

82 +----------------------------------------------------------------

83 +[Graduated to "master"]

84

85 * sp/maint-index-pack (Tue Jul 15 04:45:34 2008 +0000) 4 commits

86 + index-pack: Honor core.deltaBaseCacheLimit when resolving deltas

@@ -44,9 +106,6 @@ quite straightforward and obvious code change.

106 + add context pointer to read_tree_recursive()

107 + archive: remove args member from struct archiver

108

47 -----------------------------------------------------------------

48 -[Will merge to master soon]

49 -

109 * sb/dashless (Sun Jul 13 15:36:15 2008 +0200) 3 commits

110 + Make usage strings dash-less

111 + t/: Use "test_must_fail git" instead of "! git"

@@ -65,85 +124,8 @@ quite straightforward and obvious code change.

124 + Add some useful functions for strbuf manipulation.

125 + Make some strbuf_*() struct strbuf arguments const.

126

68 -----------------------------------------------------------------

69 -[Graduated to "master"]

70 -

71 -* sp/maint-bash-completion-optim (Mon Jul 14 00:22:03 2008 +0000) 1 commit

72 - + bash completion: Append space after file names have been completed

73 -

74 -Early parts were already merged to 'master' and need to be merged down to

75 -maint as well, as this is about a "performance bug" that has been with us

76 -almost forever.

77 -

78 -* ag/rewrite_one (Sat Jul 12 22:00:57 2008 +0400) 1 commit

79 - + Fix quadratic performance in rewrite_one.

80 -

81 -* sp/win (Fri Jul 11 18:52:42 2008 +0200) 3 commits

82 - + We need to check for msys as well as Windows in add--interactive.

83 - + Convert CR/LF to LF in tag signatures

84 - + Fixed text file auto-detection: treat EOF character 032 at the end

85 - of file as printable

86 -

87 -* js/merge-rr (Sat Jul 12 15:56:19 2008 +0100) 2 commits

88 - + Move MERGE_RR from .git/rr-cache/ into .git/

89 - + builtin-rerere: more carefully find conflict markers

90 -

91 -* sb/rerere-lib (Wed Jul 9 14:58:57 2008 +0200) 2 commits

92 - + rerere: Separate libgit and builtin functions

93 - + builtin-rerere: more carefully find conflict markers

94 -

95 -* js/maint-pretty-mailmap (Sat Jul 12 00:28:18 2008 +0100) 1 commit

96 - + Add pretty format %aN which gives the author name, respecting

97 - .mailmap

98 -

99 -* js/more-win (Sun Jul 13 22:31:23 2008 +0200) 3 commits

100 - + help (Windows): Display HTML in default browser using Windows'

101 - shell API

102 - + help.c: Add support for htmldir relative to git_exec_path()

103 - + Move code interpreting path relative to exec-dir to new function

104 - system_path()

105 -

106 -* jc/rebase-orig-head (Tue Jul 8 00:12:22 2008 -0400) 2 commits

107 - + Documentation: mention ORIG_HEAD in am, merge, and rebase

108 - + Teach "am" and "rebase" to mark the original position with

109 - ORIG_HEAD

110 -

111 -* jc/branch-merged (Tue Jul 8 17:55:47 2008 -0700) 3 commits

112 - + branch --merged/--no-merged: allow specifying arbitrary commit

113 - + branch --contains: default to HEAD

114 - + parse-options: add PARSE_OPT_LASTARG_DEFAULT flag

115 -

116 -* om/rerere-careful (Mon Jul 7 14:42:48 2008 +0200) 1 commit

117 - + builtin-rerere: more carefully find conflict markers

118 -

119 -* ls/maint-mailinfo-patch-label (Thu Jul 10 23:41:33 2008 +0200) 1 commit

120 - + git-mailinfo: Fix getting the subject from the in-body [PATCH]

121 - line

122 -

123 -* mv/merge-in-c (Mon Jul 14 00:09:41 2008 -0700) 20 commits

124 - + reduce_heads(): protect from duplicate input

125 - + reduce_heads(): thinkofix

126 - + Add a new test for git-merge-resolve

127 - + t6021: add a new test for git-merge-resolve

128 - + Teach merge.log to "git-merge" again

129 - + Build in merge

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

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

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

133 - message

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

135 - possible

136 - + Introduce reduce_heads()

137 - + Introduce get_merge_bases_many()

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

139 - + Introduce get_octopus_merge_bases() in commit.c

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

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

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

143 - pull.octopus

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

145 - + Move commit_list_count() to commit.c

146 - + Move split_cmdline() to alias.c

127 +This actually had a tiny regression I did not discover until I merged it

128 +to 'master', where a fixup has already been applied.

129

130 ----------------------------------------------------------------

131 [On Hold]

@@ -156,10 +138,10 @@ almost forever.

138 - git-imap-send: Allow the program to be run from subdirectories of

139 a git tree

140

159 -Some people seem to prefer having this feature available also with gnutls.

160 -If such a patch materializes soon, that would be good, but otherwise I'll

161 -merge this as-is to 'next'. Such an enhancement can be done in-tree on

162 -top of this series.

141 +I said: "Some people seem to prefer having this feature available also

142 +with gnutls. If such a patch materializes soon, that would be good, but

143 +otherwise I'll merge this as-is to 'next'. Such an enhancement can be

144 +done in-tree on top of this series." Anybody?

145

146 * xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits

147 + Teach git-merge -X<option> again.

@@ -215,6 +197,9 @@ hit due to tcl/tk's limitation, so I am holding this back for now.

197 * gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit

198 . cherry: cache patch-ids to avoid repeating work

199

200 +The discussion suggested that the value of having the cache itself is

201 +iffy, but I should pick up the updated one and look at it.

202 +

203 * lw/gitweb (Fri Jul 11 03:11:48 2008 +0200) 3 commits

204 . gitweb: use new Git::Repo API, and add optional caching

205 . Add new Git::Repo API

@@ -226,6 +211,10 @@ hit due to tcl/tk's limitation, so I am holding this back for now.

211 . Add git-sequencer prototype documentation

212 . Add git-sequencer shell prototype

213

214 +I haven't looked at the updated series yet. I should, but nobody else

215 +seems to be looking at these patches, which is somewhat depressing but

216 +understandable. Summer is slower ;-)

217 +

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

219 - [BROKEN wrt shallow clones] Ignore graft during object transfer

220

@@ -241,6 +230,6 @@ commits that are mentioned in grafts as reachable.

230 format

231 - git-blame: refactor code to emit "porcelain format" output

232

244 -This is for peeling to see what's behind the blamed commit, which may or

245 -may not help applications like gitweb.

233 +This is for peeling the line from the blamed version to see what's behind

234 +it, which may or may not help applications like gitweb.

235

What's cooking (2008/07 #07)