a347bca37f · matheusbsbs/matheus-bagliano

@@ -1,7 +1,7 @@

1 -Subject: What's cooking in git.git (Jul 2008, issue #09; Sun, 20)

1 +Subject: What's cooking in git.git (Jul 2008, #11; Thu, 31)

2

3 -What's cooking in git.git (Jul 2008, issue #09; Sun, 20)

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

3 +What's cooking in git.git (Jul 2008, #11; Thu, 31)

4 +--------------------------------------------------

5

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

7 with '-' are only in 'pu' while commits prefixed with '+' are

@@ -19,160 +19,75 @@ to do without regression.

19

20 Tentative schedule, my wishful thinking:

21

22 - - 1.6.0-rc0 (Jul 20)

23 - - 1.6.0-rc1 (Jul 23)

24 - - 1.6.0-rc2 (Jul 30)

25 - - 1.6.0-rc3 (Aug 6)

26 - - 1.6.0 (Aug 10)

22 + - 1.6.0-rc2 (Aug 3)

23 + - 1.6.0-rc3 (Aug 10)

24

25 ----------------------------------------------------------------

26 [New Topics]

27

31 -* pb/sane-mv (Mon Jul 21 02:25:56 2008 +0200) 2 commits

32 - - git-mv: Keep moved index entries inact

33 - - git-mv: Remove dead code branch

28 +* rs/archive-parse-options (Fri Jul 25 12:41:26 2008 +0200) 1 commit

29 + + archive: allow --exec and --remote without equal sign

30

35 -Running "git mv A B" when you have local changes to A automatically staged

36 -it while moving it to B, which was a longstanding nonsense. This attempts

37 -to fix it. Pasky has other plans to build on a more solidified foundation

38 -to enhance the command to work with submodules better on top of this.

31 +None of the following is for 1.6.0.

32

40 -----------------------------------------------------------------

41 -[Graduated to "master"]

42 -

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

44 - + git am --abort

45 -

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

47 -ORIG_HEAD just like reset, merge and pull does" rather nicely.

48 -

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

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

51 -

52 -This one is for Ingo.

33 +* mv/merge-custom (Thu Jul 31 00:38:07 2008 +0200) 5 commits

34 + + builtin-help: always load_command_list() in cmd_help()

35 + + Add a second testcase for handling invalid strategies in git-merge

36 + + Add a new test for using a custom merge strategy

37 + + builtin-merge: allow using a custom strategy

38 + + builtin-help: make some internal functions available to other

39 + builtins

40

54 -This changes the message rerere issues after reusing previous conflict

55 -resolution from "Resolved" to "Staged" when autoupdate option is in

56 -effect.

41 +* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits

42 + - git-merge-octopus: use (merge-base A (merge B C D E...)) for

43 + stepwise merge

44 + + merge-base-many: add trivial tests based on the documentation

45 + + documentation: merge-base: explain "git merge-base" with more than

46 + 2 args

47 + + merge-base: teach "git merge-base" to drive underlying

48 + merge_bases_many()

49

58 -It is envisioned that in practice, some auto resolutions are trickier and

59 -iffier than others, and we would want to add a feature to mark individual

60 -resolutions as "this is ok to autoupdate" or "do not autoupdate the result

61 -using this resolution even when rerere.autoupdate is in effect" in the

62 -future. When that happens, these messages will make the distinction

63 -clearer.

50 +* jc/simplify-merges (Thu Jul 31 01:17:41 2008 -0700) 1 commit

51 + . revision traversal: show full history with merge simplification

52

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

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

67 -

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

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

70 - + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next

71 - + builtin-merge.c: use parse_options_step() "incremental parsing"

72 - machinery

73 - + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next

74 -

75 -* jc/merge-theirs (Fri Jul 18 02:43:00 2008 -0700) 6 commits

76 - - Document that merge strategies can now take their own options

77 - + Make "subtree" part more orthogonal to the rest of merge-

78 - recursive.

79 - + Teach git-pull to pass -X<option> to git-merge

80 - + Teach git-merge to pass -X<option> to the backend strategy module

81 - + git-merge-recursive-{ours,theirs}

82 - + git-merge-file --ours, --theirs

83 -

84 -It appears nobody wants "theirs" nor "ours", so I'll soon apply a

85 -wholesale revert for these series to 'next', and then these will be

86 -dropped when we rewind 'next' after 1.6.0 final.

87 -

88 -Please make sure next time somebody asks "ours/theirs" merge on the list

89 -and #git s/he is quickly told that it was unanimously rejected so that

90 -people do not have to waste time rehashing the topic ever again.

53 +"log --full-history" is with too much clutter, "log" itself is too cleverer

54 +than some people, and here is the middle level of merge simplification.

55

56 ----------------------------------------------------------------

93 -[Stalled/Needs more work]

57 +[On Hold and/or Cooking]

58 +

59 +None of the following is for 1.6.0.

60

61 * rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits

96 - - Documentation: Improve documentation for git-imap-send(1)

97 - - imap-send.c: more style fixes

98 - - imap-send.c: style fixes

99 - - git-imap-send: Support SSL

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

62 + + Documentation: Improve documentation for git-imap-send(1)

63 + + imap-send.c: more style fixes

64 + + imap-send.c: style fixes

65 + + git-imap-send: Support SSL

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

67 a git tree

68

103 -I said: "Some people seem to prefer having this feature available also

104 -with gnutls. If such a patch materializes soon, that would be good, but

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

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

69 +Some people seem to prefer having this feature available also with gnutls.

70 +Such an enhancement can be done in-tree on top of this series if they are

71 +so inclined.

72

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

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

73 +* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits

74 + - bisect: only check merge bases when needed

75 + - bisect: test merge base if good rev is not an ancestor of bad rev

76

111 -The discussion suggested that the value of having the cache itself is

112 -iffy, but I should pick up the updated one and look at it.

77 +* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits

78 + + builtin-add.c: optimize -A option and "git add ."

79 + + builtin-add.c: restructure the code for maintainability

80

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

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

116 - . Add new Git::Repo API

117 - . gitweb: add test suite with Test::WWW::Mechanize::CGI

81 +* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits

82 + + spawn pager via run_command interface

83 + + run-command: add pre-exec callback

84

119 -* sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits

120 - . Migrate git-am to use git-sequencer

121 - . Add git-sequencer test suite (t3350)

122 - . Add git-sequencer prototype documentation

123 - . Add git-sequencer shell prototype

85 +This changes the parent-child relationship between the pager and the git

86 +process. We used to make pager the parent which meant that the exit

87 +status from git is lost from the caller.

88

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

126 -seems to be looking at these patches, which is somewhat depressing but

127 -understandable. Summer is slower ;-)

128 -

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

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

131 -

132 -Cloning or fetching from a repository from grafts did not send objects

133 -that are hidden by grafts, but the commits in the resulting repository do

134 -need these to pass fsck. This fixes object transfer to ignore grafts.

135 -

136 -Another fix is needed to git-prune so that it ignores grafts but treats

137 -commits that are mentioned in grafts as reachable.

138 -

139 -* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits

140 - - blame: show "previous" information in --porcelain/--incremental

141 - format

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

143 -

144 -This is for peeling the line from the blamed version to see what's behind

145 -it, which may or may not help applications like gitweb.

146 -

147 -----------------------------------------------------------------

148 -[Dropped]

149 -

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

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

152 - + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next

153 - + builtin-merge.c: use parse_options_step() "incremental parsing"

154 - machinery

155 - + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next

156 -

157 -* jc/merge-theirs (Fri Jul 18 02:43:00 2008 -0700) 6 commits

158 - - Document that merge strategies can now take their own options

159 - + Make "subtree" part more orthogonal to the rest of merge-

160 - recursive.

161 - + Teach git-pull to pass -X<option> to git-merge

162 - + Teach git-merge to pass -X<option> to the backend strategy module

163 - + git-merge-recursive-{ours,theirs}

164 - + git-merge-file --ours, --theirs

165 -

166 -It appears nobody wants "theirs" nor "ours", so I'll soon apply a

167 -wholesale revert for these series to 'next', and then these will be

168 -dropped when we rewind 'next' after 1.6.0 final.

169 -

170 -Please make sure next time somebody asks "ours/theirs" merge on the list

171 -and #git s/he is quickly told that it was unanimously rejected so that

172 -people do not have to waste time rehashing the topic ever again.

173 -

174 -----------------------------------------------------------------

175 -[On Hold]

89 +* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit

90 + + Enable threaded delta search on *BSD and Linux.

91

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

93 + merge: remove deprecated summary and diffstat options and config

@@ -192,9 +107,8 @@ This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0

107 timeframe.

108

109 * jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit

195 - - diff: enable "too large a rename" warning when -M/-C is explicitly

110 + . diff: enable "too large a rename" warning when -M/-C is explicitly

111 asked for

112

113 This would be the right thing to do for command line use, but gitk will be

114 hit due to tcl/tk's limitation, so I am holding this back for now.

200 -

What's cooking (2008/07 #10)