25fdd77904 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jan 2010, #07; Fri, 22)

3 -X-master-at: aba7dea83bfba411dee0271491d6199d2dca61d9

4 -X-next-at: 7703121a442f8cf559a50f3a47b313dd77b8e185

2 +Subject: What's cooking in git.git (Jan 2010, #08; Sun, 24)

3 +X-master-at: b2c2e4c22c6a4fe151f02380d247cf3d9a9d5d1e

4 +X-next-at: ab82714c66789f07812b3c1c723004a10b67a882

5

6 -What's cooking in git.git (Jan 2010, #07; Fri, 22)

6 +What's cooking in git.git (Jan 2010, #08; Sun, 24)

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

8

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

@@ -14,108 +14,6 @@ still holding onto them.

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

15 [Graduated to "master"]

16

17 -* jc/conflict-marker-size (2010-01-16) 8 commits

18 - (merged to 'next' on 2010-01-18 at f1f6023)

19 - + rerere: honor conflict-marker-size attribute

20 - + rerere: prepare for customizable conflict marker length

21 - + conflict-marker-size: new attribute

22 - + rerere: use ll_merge() instead of using xdl_merge()

23 - + merge-tree: use ll_merge() not xdl_merge()

24 - + xdl_merge(): allow passing down marker_size in xmparam_t

25 - + xdl_merge(): introduce xmparam_t for merge specific parameters

26 - + git_attr(): fix function signature

27 -

28 -* ag/maint-apply-too-large-p (2010-01-17) 1 commit

29 - (merged to 'next' on 2010-01-18 at 8bd106a)

30 - + builtin-apply.c: Skip filenames without enough components

31 -

32 -* ag/patch-header-verify (2010-01-18) 1 commit

33 - (merged to 'next' on 2010-01-18 at 2cd0ddc)

34 - + builtin-apply.c: fix the --- and +++ header filename consistency check

35 -

36 -* bw/cvsimport (2010-01-19) 3 commits

37 - (merged to 'next' on 2010-01-19 at 63f4c8d)

38 - + cvsimport: standarize system() calls to external git tools

39 - + cvsimport: standarize open() calls to external git tools

40 - + cvsimport: modernize callouts to git subcommands

41 -

42 -* jc/checkout-merge-base (2010-01-19) 1 commit

43 - (merged to 'next' on 2010-01-19 at 3665110)

44 - + Fix "checkout A..." synonym for "checkout A...HEAD" on Windows

45 -

46 -* jc/maint-refresh-index-is-optional-for-status (2010-01-19) 1 commit

47 - + status: don't require the repository to be writable

48 -

49 -* nd/status-partial-refresh (2010-01-17) 2 commits

50 - (merged to 'next' on 2010-01-19 at 64f0c0b)

51 - + rm: only refresh entries that we may touch

52 - (merged to 'next' on 2010-01-16 at f77bc8f)

53 - + status: only touch path we may need to check

54 -

55 -* ap/merge-backend-opts (2008-07-18) 7 commits

56 - (merged to 'next' on 2010-01-18 at cb1f6b7)

57 - + Document that merge strategies can now take their own options

58 - + Extend merge-subtree tests to test -Xsubtree=dir.

59 - + Make "subtree" part more orthogonal to the rest of merge-recursive.

60 - + pull: Fix parsing of -X<option>

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

62 - + git merge -X<option>

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

64 -

65 -* jc/maint-limit-note-output (2010-01-21) 2 commits

66 - (merged to 'next' on 2010-01-21 at bcb80b9)

67 - + Fix "log --oneline" not to show notes

68 - (merged to 'next' on 2010-01-20 at 526bfcc)

69 - + Fix "log" family not to be too agressive about showing notes

70 -

71 -* nd/ls-files-sparse-fix (2010-01-20) 1 commit

72 - (merged to 'next' on 2010-01-20 at 0f61dbc)

73 - + Fix memory corruption when .gitignore does not end by \n

74 -

75 -* il/branch-set-upstream (2010-01-18) 2 commits

76 - (merged to 'next' on 2010-01-18 at b9b0993)

77 - + branch: warn and refuse to set a branch as a tracking branch of itself.

78 - + Add branch --set-upstream

79 -

80 -* il/remote-updates (2010-01-18) 1 commit

81 - (merged to 'next' on 2010-01-18 at 5c3e805)

82 - + Add git remote set-url

83 -

84 -* il/rev-glob (2010-01-22) 3 commits

85 - (merged to 'next' on 2010-01-21 at 453a21c)

86 - + Documentation: improve description of --glob=pattern and friends

87 - (merged to 'next' on 2010-01-20 at 928ba0a)

88 - + rev-parse --branches/--tags/--remotes=pattern

89 - + rev-parse --glob

90 -

91 -This is a re-rolled "--namespace=" one.

92 -

93 -* jl/submodule-diff (2010-01-18) 4 commits

94 - (merged to 'next' on 2010-01-20 at 95cb513)

95 - + Performance optimization for detection of modified submodules

96 - (merged to 'next' on 2010-01-17 at 525075b)

97 - + git status: Show uncommitted submodule changes too when enabled

98 - (merged to 'next' on 2010-01-16 at 0a99e3c)

99 - + Teach diff that modified submodule directory is dirty

100 - + Show submodules as modified when they contain a dirty work tree

101 -

102 -* js/refer-upstream (2010-01-19) 3 commits

103 - (merged to 'next' on 2010-01-20 at 5a5547a)

104 - + Teach @{upstream} syntax to strbuf_branchanme()

105 - + t1506: more test for @{upstream} syntax

106 - + Introduce <branch>@{upstream} notation

107 -

108 -Updated to teach the new syntax to commands like "checkout" and "merge"

109 -that want to behave better when they know what were given was a branch

110 -name, not a random SHA-1.

111 -

112 -* jc/branch-d (2009-12-29) 1 commit

113 - (merged to 'next' on 2010-01-10 at 61a14b7)

114 - + branch -d: base the "already-merged" safety on the branch it merges with

115 -

116 ---------------------------------------------------

117 -[Will merge to 'master' after a bit more cooking in 'next']

118 -

17 * jc/fix-tree-walk (2009-09-14) 7 commits

18 (merged to 'next' on 2010-01-13 at 1c01b87)

19 + read-tree --debug-unpack

@@ -126,37 +24,59 @@ name, not a random SHA-1.

24 + more D/F conflict tests

25 + tests: move convenience regexp to match object names to test-lib.sh

26

129 -Resurrected from "Ejected" category. This is fix for a tricky codepath

130 -and testing and improving before it hits 'master' is greatly appreciated.

131 -(I have been using this in my private build for some time).

27 +This is fix for a tricky codepath; I've been using this personally during

28 +the whole cycle up to point, so hopefully it finally have nailed all the

29 +corner cases? Knock wood...

30 +

31 +--------------------------------------------------

32 +[New Topics]

33 +

34 +* cc/reset-keep (2010-01-19) 5 commits

35 + - reset: disallow using --keep when there are unmerged entries

36 + - reset: disallow "reset --keep" outside a work tree

37 + - Documentation: reset: describe new "--keep" option

38 + - reset: add test cases for "--keep" option

39 + - reset: add option "--keep" to "git reset"

40 +

41 +I do not think I'd ever use this, and I am not convinced I can sell this

42 +to users as a great new feature without confusing them unnecessarily, but

43 +perhaps queuing it to pu to give it wider visibility may help somebody

44 +coming up with a better way to defend the feature and introduce it to

45 +users without confusing them than Christan nor I managed to.

46 +

47 +* jc/ce-uptodate (2010-01-24) 1 commit

48 + - Make ce_uptodate() trustworthy again

49 +

50 +I think this and Jens Lehmann's follow-up patch to avoid calling

51 +is_submodule_modified() are needed before 1.7.0

52

53 --------------------------------------------------

54 [Cooking]

55

56 * jh/notes (2010-01-17) 20 commits

137 - . builtin-gc: Teach the new --notes option to garbage-collect notes

138 - . Notes API: gc_notes(): Prune notes that belong to non-existing objects

139 - . t3305: Verify that removing notes triggers automatic fanout consolidation

140 - . builtin-notes: Teach -d option for deleting existing notes

141 - . Teach builtin-notes to remove empty notes

142 - . Teach notes code to properly preserve non-notes in the notes tree

143 - . t3305: Verify that adding many notes with git-notes triggers increased fanout

144 - . t3301: Verify successful annotation of non-commits

145 - . Builtin-ify git-notes

146 - . Refactor notes concatenation into a flexible interface for combining notes

147 - . Notes API: Allow multiple concurrent notes trees with new struct notes_tree

148 - . Notes API: write_notes_tree(): Store the notes tree in the database

149 - . Notes API: for_each_note(): Traverse the entire notes tree with a callback

150 - . Notes API: get_note(): Return the note annotating the given object

151 - . Notes API: remove_note(): Remove note objects from the notes tree structure

152 - . Notes API: add_note(): Add note objects to the internal notes tree structure

153 - . Notes API: init_notes(): Initialize the notes tree from the given notes ref

154 - . Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef

155 - . Notes API: get_commit_notes() -> format_note() + remove the commit restriction

156 - . Minor non-functional fixes to notes.c

157 -

158 -Tentatively ejected, as its tests conflict with tests in a higher priority

159 -fix.

57 + - builtin-gc: Teach the new --notes option to garbage-collect notes

58 + - Notes API: gc_notes(): Prune notes that belong to non-existing objects

59 + - t3305: Verify that removing notes triggers automatic fanout consolidation

60 + - builtin-notes: Teach -d option for deleting existing notes

61 + - Teach builtin-notes to remove empty notes

62 + - Teach notes code to properly preserve non-notes in the notes tree

63 + - t3305: Verify that adding many notes with git-notes triggers increased fanout

64 + - t3301: Verify successful annotation of non-commits

65 + - Builtin-ify git-notes

66 + - Refactor notes concatenation into a flexible interface for combining notes

67 + - Notes API: Allow multiple concurrent notes trees with new struct notes_tree

68 + - Notes API: write_notes_tree(): Store the notes tree in the database

69 + - Notes API: for_each_note(): Traverse the entire notes tree with a callback

70 + - Notes API: get_note(): Return the note annotating the given object

71 + - Notes API: remove_note(): Remove note objects from the notes tree structure

72 + - Notes API: add_note(): Add note objects to the internal notes tree structure

73 + - Notes API: init_notes(): Initialize the notes tree from the given notes ref

74 + - Add tests for checking correct handling of $GIT_NOTES_REF and core.notesRef

75 + - Notes API: get_commit_notes() -> format_note() + remove the commit restriction

76 + - Minor non-functional fixes to notes.c

77 +

78 +The changes to test vector this series makes to t3301 breaks tests that

79 +are in 'master', so 'pu' doesn't pass it.

80

81 * jh/gitweb-cached (2010-01-13) 9 commits

82 - gitweb: File based caching layer (from git.kernel.org)

@@ -169,7 +89,9 @@ fix.

89 - gitweb: change die_error to take "extra" argument for extended die information

90 - gitweb: Load checking

91

172 -Replaced with a re-roll. Update to t9500 is probably needed.

92 +I know there is a series to split the later ones into smaller chunks that

93 +are being discussed on the list, but they don't appear here. I'd prefer

94 +to pick the series up after all the dust from the discussion settles.

95

96 * jc/grep-author-all-match-implicit (2010-01-17) 1 commit

97 - "log --author=me --grep=it" should find intersection, not union

What's cooking (2010/01 #08)