5fd1e54461 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Sep 2010, #05; Wed, 15)

3 -X-master-at: 7e100effc6c3a8acbb4bf305638c7b324a63236d

4 -X-next-at: bf93f8322c5e01b030ee9a1d3dee19e4d4dbd2d7

2 +Subject: What's cooking in git.git (Sep 2010, #06; Sat, 18)

3 +X-master-at: 1125297ca1744be09f9e392aab0dd2c70d838583

4 +X-next-at: df51bf2791c619324c7c5f7ea2d42a200dab62f0

5

6 -What's cooking in git.git (Sep 2010, #05; Wed, 15)

6 +What's cooking in git.git (Sep 2010, #06; Sat, 18)

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

8

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

@@ -11,90 +11,13 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones

11 marked with '.' do not appear in any of the integration branches, but I am

12 still holding onto them.

13

14 -The tip of 'master' is now at 1.7.3-rc2; I am hoping that we can do the

15 -real 1.7.3 release perhaps this weekend. Please give it a final round of

16 -beating so that we can find and fix the last minute regressions.

17 -

18 -Thanks.

19 -

14 --------------------------------------------------

15 [Graduated to "master"]

16

23 -* ch/filter-branch-deprecate-remap-to-ancestor (2010-08-27) 1 commit

24 - (merged to 'next' on 2010-09-10 at f91d974)

25 - + filter-branch: retire --remap-to-ancestor

26 -

27 -* ch/maint-cannot-create-bundle-error (2010-08-27) 1 commit

28 - (merged to 'next' on 2010-09-10 at ba139f1)

29 - + bundle: detect if bundle file cannot be created

30 -

31 -* dr/maint-ls-tree-prefix-recursion-fix (2010-09-11) 1 commit

32 - (merged to 'next' on 2010-09-12 at c9d05a6)

33 - + ls-tree $di $dir: do not mistakenly recurse into directories

34 -

35 -* jl/fix-test (2010-09-07) 7 commits

36 - (merged to 'next' on 2010-09-10 at 849b1bb)

37 - + t1020: Get rid of 'cd "$HERE"' at the start of each test

38 - + t2016 (checkout -p): add missing &&

39 - + t1302 (core.repositoryversion): style tweaks

40 - + t2105 (gitfile): add missing &&

41 - + t1450 (fsck): remove dangling objects

42 - + tests: subshell indentation stylefix

43 - + Merge branch 'jl/maint-fix-test'

44 - (this branch uses jl/maint-fix-test.)

45 -

46 -* jl/maint-fix-test (2010-09-06) 1 commit

47 - + Several tests: cd inside subshell instead of around

48 - (this branch is used by jl/fix-test.)

49 -

50 -* ks/recursive-rename-add-identical (2010-09-01) 1 commit

51 - (merged to 'next' on 2010-09-03 at 1a5082f)

52 - + RE: [PATCH] Avoid rename/add conflict when contents are identical

53 -

54 -* os/fix-rebase-diff-no-prefix (2010-09-09) 1 commit

55 - (merged to 'next' on 2010-09-10 at f1acd10)

56 - + Add --src/dst-prefix to git-formt-patch in git-rebase.sh

57 -

58 ---------------------------------------------------

59 -[New Topics]

60 -

61 -* ab/send-email-catfile (2010-09-14) 1 commit

62 - - send-email: use catfile() to concatenate files

63 -

64 -Sane; should be safe to be among the first batch after 1.7.3 release.

65 -

17 * bg/fix-t7003 (2010-09-10) 1 commit

18 (merged to 'next' on 2010-09-13 at 9d7756e)

19 + t7003: Use test_commit instead of custom function

20

70 -Sane; should be safe to be among the first batch after 1.7.3 release.

71 -

72 -* jc/grep-header-all-match-fix (2010-09-12) 2 commits

73 - - log --author: take union of multiple "author" requests

74 - - grep: move logic to compile header pattern into a separate helper

75 - (this branch is used by jc/grep-header-all-match-fix-debug.)

76 -

77 -We might want to give a more comprehensive revamp to the "filter by

78 -grepping the commit log message" feature some day, somehow allowing the

79 -full "git grep" boolean expression. But until then, this should suffice.

80 -

81 -* jc/grep-header-all-match-fix-debug (2010-09-13) 1 commit

82 - - grep debugging, just in case

83 - (this branch uses jc/grep-header-all-match-fix.)

84 -

85 -* jc/no-branch-name-with-dash-at-front (2010-09-14) 1 commit

86 - - disallow branch names that start with a hyphen

87 -

88 -This also came up at $WORK; should be safe to be among the first batch

89 -after 1.7.3 release.

90 -

91 -* dm/mergetool-vimdiff (2010-09-14) 2 commits

92 - - mergetool-lib: add a three-way diff view for vim/gvim

93 - - mergetool-lib: combine vimdiff and gvimdiff run blocks

94 -

95 -The bottom one should be without controversy. I don't use vimdiff, so

96 -cannot comment on the other one.

97 -

21 --------------------------------------------------

22 [Stalled]

23

@@ -162,6 +85,41 @@ current usage context.

85 --------------------------------------------------

86 [Cooking]

87

88 +* ab/send-email-catfile (2010-09-14) 1 commit

89 + (merged to 'next' on 2010-09-18 at 1b2e2a3)

90 + + send-email: use catfile() to concatenate files

91 +

92 +Sane; should be safe to be among the first batch after 1.7.3 release.

93 +

94 +* jc/grep-header-all-match-fix (2010-09-12) 2 commits

95 + (merged to 'next' on 2010-09-18 at 380305c)

96 + + log --author: take union of multiple "author" requests

97 + + grep: move logic to compile header pattern into a separate helper

98 + (this branch is used by jc/grep-header-all-match-fix-debug.)

99 +

100 +We might want to give a more comprehensive revamp to the "filter by

101 +grepping the commit log message" feature some day, somehow allowing the

102 +full "git grep" boolean expression. But until then, this should suffice.

103 +

104 +* jc/grep-header-all-match-fix-debug (2010-09-13) 1 commit

105 + - grep debugging, just in case

106 + (this branch uses jc/grep-header-all-match-fix.)

107 +

108 +* jc/no-branch-name-with-dash-at-front (2010-09-14) 1 commit

109 + (merged to 'next' on 2010-09-18 at ac22cbc)

110 + + disallow branch names that start with a hyphen

111 +

112 +This came up at $WORK; should be safe to be among the first batch after

113 +1.7.3 release.

114 +

115 +* dm/mergetool-vimdiff (2010-09-14) 2 commits

116 + (merged to 'next' on 2010-09-18 at df51bf2)

117 + + mergetool-lib: add a three-way diff view for vim/gvim

118 + + mergetool-lib: combine vimdiff and gvimdiff run blocks

119 +

120 +The bottom one should be without controversy. I don't use vimdiff, so

121 +cannot comment on the other one.

122 +

123 * by/line-log (2010-09-11) 18 commits

124 (merged to 'next' on 2010-09-12 at e29a029)

125 + log -L: do not free parents lists we might need again

@@ -188,6 +146,8 @@ How would one trace history of lines 440,450 in t/t7300-clean.sh starting

146 from the tip of 'pu'? "git log -p -L 440,450 pu -- t/t7300-clean.sh"

147 would be the most natural but it does not work (it wants "pu" to be a

148 path). "git log -p -L 440,450 t/t7300-clean.sh pu" doesn't work either.

149 +And "git log -p pu -L440,450 t/t7300-clean.sh" goes totally against our

150 +command line convention.

151

152 The command line parser of this series needs to be rethought (didn't I say

153 that many times? Perhaps I was ignored). Might want to kick this out of

@@ -208,7 +168,8 @@ Half-written but it is a good start. I may need to give some help in

168 describing more recent index extensions.

169

170 * tr/send-email-refuse-sending-unedited-cover-letter (2009-06-08) 1 commit

211 - - send-email: Refuse to send cover-letter template subject

171 + (merged to 'next' on 2010-09-18 at 0fedaef)

172 + + send-email: Refuse to send cover-letter template subject

173

174 Sane; should be safe to be among the first batch after 1.7.3 release.

175

What's cooking (2010/09 #06)