e06500e4ed · matheusbsbs/matheus-bagliano

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

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

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

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

3

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

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

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

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

10

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

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

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

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

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

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

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

14 +

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

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

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

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

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

20 +to do without regression.

21 +

22 +Tentative schedule, my wishful thinking:

23 +

24 + - 1.6.0-rc0 (Jul 20)

25 + - 1.6.0-rc1 (Jul 23)

26 + - 1.6.0-rc2 (Jul 30)

27 + - 1.6.0-rc3 (Aug 6)

28 + - 1.6.0 (Aug 10)

29

30 ----------------------------------------------------------------

31 [New Topics]

32

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

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

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

35 +

36 +This one is for Ingo.

37 +

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

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

40 +effect.

41 +

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

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

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

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

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

47 +clearer.

48 +

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

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

51 +

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

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

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

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

56 +real estate.

57 +

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

59 + - git am --abort

60 +

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

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

63 +

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

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

66 + - git rm: Support for removing submodules

67 + - git mv: Support moving submodules

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

69 + path

70 + - git submodule add: Fix naming clash handling

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

72 + - git-mv: Remove dead code branch

73 +

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

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

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

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

78 +1.6.0 ships.

79 +

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

81 +[Graduated to "master"]

82

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

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

@@ -42,9 +104,6 @@ quite straightforward and obvious code change.

104 + add context pointer to read_tree_recursive()

105 + archive: remove args member from struct archiver

106

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

46 -[Will merge to master soon]

47 -

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

108 + Make usage strings dash-less

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

@@ -63,85 +122,8 @@ quite straightforward and obvious code change.

122 + Add some useful functions for strbuf manipulation.

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

124

66 -----------------------------------------------------------------

67 -[Graduated to "master"]

68 -

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

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

71 -

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

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

74 -almost forever.

75 -

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

77 - + Fix quadratic performance in rewrite_one.

78 -

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

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

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

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

83 - of file as printable

84 -

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

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

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

88 -

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

90 - + rerere: Separate libgit and builtin functions

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

92 -

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

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

95 - .mailmap

96 -

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

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

99 - shell API

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

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

102 - system_path()

103 -

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

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

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

107 - ORIG_HEAD

108 -

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

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

111 - + branch --contains: default to HEAD

112 - + parse-options: add PARSE_OPT_LASTARG_DEFAULT flag

113 -

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

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

116 -

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

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

119 - line

120 -

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

122 - + reduce_heads(): protect from duplicate input

123 - + reduce_heads(): thinkofix

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

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

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

127 - + Build in merge

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

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

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

131 - message

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

133 - possible

134 - + Introduce reduce_heads()

135 - + Introduce get_merge_bases_many()

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

137 - + Introduce get_octopus_merge_bases() in commit.c

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

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

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

141 - pull.octopus

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

143 - + Move commit_list_count() to commit.c

144 - + Move split_cmdline() to alias.c

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

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

127

128 ----------------------------------------------------------------

129 [On Hold]

@@ -154,10 +136,10 @@ almost forever.

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

137 a git tree

138

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

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

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

160 -top of this series.

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

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

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

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

143

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

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

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

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

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

197

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

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

200 +

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

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

203 . Add new Git::Repo API

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

209 . Add git-sequencer prototype documentation

210 . Add git-sequencer shell prototype

211

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

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

214 +understandable. Summer is slower ;-)

215 +

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

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

218

@@ -239,6 +228,6 @@ commits that are mentioned in grafts as reachable.

228 format

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

230

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

243 -may not help applications like gitweb.

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

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

233