76feac4331 · matheusbsbs/matheus-bagliano

@@ -1,8 +1,10 @@

1 -Subject: What's cooking in git.git (Dec 2008, #01; Tue, 02)

2 -X-master-at: 757c7f60a78004fc3d0ea62f44320d54ef430c10

3 -X-next-at: 44b0c4a7f55234e12cead3e1909c17be7c068dca

1 +To: git@vger.kernel.org

2 +Subject: What's cooking in git.git (Dec 2008, #02; Sun, 14)

3 +bcc: William Pursell <bill.pursell@gmail.com>, Theodore Tso <tytso@mit.edu>

4 +X-master-at: 7e76aba317b690932c8236311219b0faf97f1571

5 +X-next-at: eb2f0c452e2cf87efa16cc9ace8587e198d60eb0

6

5 -What's cooking in git.git (Dec 2008, #01; Tue, 02)

7 +What's cooking in git.git (Dec 2008, #02; Sun, 14)

8 --------------------------------------------------

9

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

@@ -12,125 +14,94 @@ in 'next'.

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

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

16

15 -As we have already passed -rc1, things queued in 'next' let alone 'pu' are

17 +As we have already passed -rc2, things queued in 'next' let alone 'pu' are

18 unlikely to be merged to 'master' by the end of year unless otherwise

19 noted.

20

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

22 [New Topics]

23

22 -* gb/gitweb-patch (Sat Nov 29 14:41:11 2008 +0100) 2 commits

23 - - [DONTMERGE: wait for signoff] gitweb: links to patch action in

24 - commitdiff and shortlog view

25 - - gitweb: add patch view

24 +* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits

25 + + Add 'g' command to go to a hunk

26 + + Add subroutine to display one-line summary of hunks

27

27 -* lt/reset-merge (Mon Dec 1 09:30:31 2008 -0800) 1 commit

28 - + Add 'merge' mode to 'git reset'

28 +* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits

29 + - gitweb: cache $parent_commit info in git_blame()

30 + - gitweb: A bit of code cleanup in git_blame()

31 + - gitweb: Move 'lineno' id from link to row element in git_blame

32

30 -Unfortunately, I cannot write down a good use case in what circumstances

31 -this is needed, even though I do recall that I occasionally (perhaps once

32 -every two months) needed to do "read-tree -m -u" myself in the past, and

33 -this patch brings that feature close to Porcelain. On the other hand, the

34 -existing "reset --mixed" is very easily explained ("after starting to add

35 -changes to the staging area, you realized that you screwed up, and you

36 -want to redo it from scratch"). Therefore, I cannot justify what the log

37 -message of this change claims myself.

33 +I've briefly looked at the resurrection of Ajaxy blame that comes on top

34 +of this series and it looked promising.

35

39 -* jc/rm-i-t-a (Fri Nov 28 19:56:34 2008 -0800) 5 commits

40 - + git add --intent-to-add: do not let an empty blob be committed by

41 - accident

42 - + git add --intent-to-add: fix removal of cached emptiness

43 - + builtin-rm.c: explain and clarify the "local change" logic

44 - + Merge branch 'nd/narrow' (early part) into jc/add-i-t-a

45 - + Extend index to save more flags

36 +* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit

37 + - Add support for a pdf version of the user manual

38

47 -As intent-to-add index entry is a new feature for 1.6.1, it probably is a

48 -good idea to merge this to 'master'. Nitpicks and bugfixes are very much

49 -appreciated.

50 -

51 -* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits

52 - - In add --patch, Handle K,k,J,j slightly more gracefully.

53 - - Add / command in add --patch

54 - - git-add -i/-p: Change prompt separater from slash to comma

55 -

56 -There are some other useful bits and pieces around this area exchanged on

57 -the list with the author of these patches. I think it would become a

58 -useful series after reassembling their pieces. Waiting for v2.

39 +I do not have a new enough combination of dblatex and asciidoc myself but

40 +this would help interested people.

41

60 -* jn/gitweb-utf8 (Mon Dec 1 19:01:42 2008 +0100) 1 commit

61 - - gitweb: Fix handling of non-ASCII characters in inserted HTML

62 - files.

42 +* np/auto-thread (Sat Dec 13 15:06:40 2008 -0500) 2 commits

43 + + pack-objects: don't use too many threads with few objects

44 + + autodetect number of CPUs by default when using threads

45

64 -Possibly a bugfix worthy to have in 1.6.1.

65 -

66 -* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits

67 - - clone: test the new HEAD detection logic

68 - - Merge commit 'HEAD@{2}' into HEAD

69 - - upload-pack: send the HEAD information

70 - - clone: find the current branch more explicitly

71 - - connect.c::read_extra_info(): find where HEAD points at

72 - - connect.c::read_extra_info(): prepare to receive more than server

73 - capabilities

74 - - get_remote_heads(): refactor code to read "server capabilities"

75 -

76 -This is no way meant for 1.6.1, let alone next, yet.

46 +* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits

47 + - gitweb: Optional grouping of projects by category

48 + - gitweb: Split git_project_list_body in two functions

49 + - gitweb: Modularized git_get_project_description to be more generic

50

51 ----------------------------------------------------------------

79 -[Graduated to "master"]

52 +[Post 1.6.1 items]

53

81 -* cr/remote-update-v (Tue Nov 18 19:04:02 2008 +0800) 1 commit

82 - + git-remote: add verbose mode to git remote update

54 +* gb/gitweb-patch (Sat Dec 6 16:02:35 2008 +0100) 3 commits

55 + - gitweb: link to patch(es) view from commit and log views

56 + - gitweb: add patches view

57 + - gitweb: add patch view

58

84 -* rs/strbuf-expand (Sun Nov 23 00:16:59 2008 +0100) 6 commits

85 - + remove the unused files interpolate.c and interpolate.h

86 - + daemon: deglobalize variable 'directory'

87 - + daemon: inline fill_in_extra_table_entries()

88 - + daemon: use strbuf_expand() instead of interpolate()

89 - + merge-recursive: use strbuf_expand() instead of interpolate()

90 - + add strbuf_expand_dict_cb(), a helper for simple cases

59 +Updated series. Reviews and Acks?

60

92 -* mv/fast-export (Sun Nov 23 12:55:54 2008 +0100) 2 commits

93 - + fast-export: use an unsorted string list for extra_refs

94 - + Add new testcase to show fast-export does not always exports all

95 - tags

61 +* lt/reset-merge (Wed Dec 3 18:00:12 2008 -0800) 2 commits

62 + + Document "git-reset --merge"

63 + + Add 'merge' mode to 'git reset'

64

97 -* st/levenshtein (Thu Nov 20 14:27:27 2008 +0100) 2 commits

98 - + Document levenshtein.c

99 - + Fix deletion of last character in levenshtein distance

65 +With updated documents.

66

101 -* js/mingw-rename-fix (Wed Nov 19 17:25:27 2008 +0100) 1 commit

102 - + compat/mingw.c: Teach mingw_rename() to replace read-only files

67 +* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits

68 + . In add --patch, Handle K,k,J,j slightly more gracefully.

69 + . Add / command in add --patch

70 + . git-add -i/-p: Change prompt separater from slash to comma

71

104 -* mv/clone-strbuf (Fri Nov 21 01:45:01 2008 +0100) 3 commits

105 - + builtin_clone: use strbuf in cmd_clone()

106 - + builtin-clone: use strbuf in clone_local() and

107 - copy_or_link_directory()

108 - + builtin-clone: use strbuf in guess_dir_name()

72 +I am still holding onto this earlier topic to add '/' subcommand to allow

73 +finding a hunk with given text, but I'd rather not merge/rebase it on top

74 +of wp/add-p-goto series myself. Waiting for a reroll.

75

110 -* pw/maint-p4 (Wed Nov 26 13:52:15 2008 -0500) 1 commit

111 - - git-p4: fix keyword-expansion regex

76 +* cb/mergetool (Fri Dec 12 21:48:41 2008 +0000) 4 commits

77 + - mergetool: Don't keep temporary merge files unless told to

78 + - mergetool: Add prompt to continue after failing to merge a file

79 + - Add -y/--no-prompt option to mergetool

80 + - Fix some tab/space inconsistencies in git-mergetool.sh

81

113 -* cc/bisect-skip (Sun Nov 23 22:02:49 2008 +0100) 1 commit

114 - - bisect: teach "skip" to accept special arguments like "A..B"

82 +Updated series. Waiting for comments from the original author (Ted) and

83 +other interested parties.

84

116 -Should be in 1.6.1-rc1.

85 +----------------------------------------------------------------

86 +[Graduated to "master"]

87

118 -* lt/preload-lstat (Mon Nov 17 09:01:20 2008 -0800) 2 commits

119 - + Fix index preloading for racy dirty case

120 - + Add cache preload facility

88 +* jc/rm-i-t-a (Fri Nov 28 19:56:34 2008 -0800) 5 commits

89 + + git add --intent-to-add: do not let an empty blob be committed by

90 + accident

91 + + git add --intent-to-add: fix removal of cached emptiness

92 + + builtin-rm.c: explain and clarify the "local change" logic

93 + + Merge branch 'nd/narrow' (early part) into jc/add-i-t-a

94 + + Extend index to save more flags

95

122 -* ta/quiet-pull (Mon Nov 17 23:09:30 2008 +0100) 2 commits

123 - + Retain multiple -q/-v occurrences in git pull

124 - + Teach/Fix pull/fetch -q/-v options

96 +As intent-to-add index entry is a new feature for 1.6.1, it probably is a

97 +good idea to merge this to 'master'. Nitpicks and bugfixes are very much

98 +appreciated.

99

126 -* ph/send-email (Tue Nov 11 00:54:02 2008 +0100) 4 commits

127 - + git send-email: ask less questions when --compose is used.

128 - + git send-email: add --annotate option

129 - + git send-email: interpret unknown files as revision lists

130 - + git send-email: make the message file name more specific.

100 +* jn/gitweb-utf8 (Mon Dec 1 19:01:42 2008 +0100) 1 commit

101 + + gitweb: Fix handling of non-ASCII characters in inserted HTML

102 + files.

103

132 -After merging these to 'master' I found a breakage which I hopefully

133 -fixed.

104 +A bugfix.

105

106 ----------------------------------------------------------------

107 [Will merge to "master" soon]

@@ -140,14 +111,6 @@ What are you looking for? We are in -rc ;-)

111 ----------------------------------------------------------------

112 [On Hold]

113

143 -* cb/mergetool (Thu Nov 13 12:41:15 2008 +0000) 3 commits

144 - - [DONTMERGE] Add -k/--keep-going option to mergetool

145 - - Add -y/--no-prompt option to mergetool

146 - - Fix some tab/space inconsistencies in git-mergetool.sh

147 -

148 -Jeff had good comments on the last one; the discussion needs concluded,

149 -and also waiting for comments from the original author (Ted).

150 -

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

115 + blame: show "previous" information in --porcelain/--incremental

116 format

@@ -198,7 +161,7 @@ fetch and push should use the real ancestry information recorded in the

161 underlying objects, while rev-list, log, etc. should always use the

162 replaced objects). I have a suspicion that even cat-file could honor it.

163

201 -* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 18 commits

164 +* nd/narrow (Sun Nov 30 17:54:38 2008 +0700) 17 commits

165 - wt-status: show sparse checkout info

166 - Introduce default sparse patterns (core.defaultsparse)

167 - checkout: add new options to support sparse checkout

@@ -218,9 +181,22 @@ replaced objects). I have a suspicion that even cat-file could honor it.

181 + update-index: refactor mark_valid() in preparation for new options

182 + ls-files: add options to support sparse checkout

183 + Introduce CE_NO_CHECKOUT bit

221 - + Extend index to save more flags

184

223 -Kicked back to 'on hold' until 1.6.1 final by popular(?) demand.

185 +Kicked back to 'on hold' until 1.6.1 final by popular demand; will be

186 +dropped from 'next' (see recent discussion on the interaction between the

187 +checkout area and commands such as "grep").

188 +

189 +* jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits

190 + - clone: test the new HEAD detection logic

191 + - Merge commit 'HEAD@{2}' into HEAD

192 + - upload-pack: send the HEAD information

193 + - clone: find the current branch more explicitly

194 + - connect.c::read_extra_info(): find where HEAD points at

195 + - connect.c::read_extra_info(): prepare to receive more than server

196 + capabilities

197 + - get_remote_heads(): refactor code to read "server capabilities"

198 +

199 +This is no way meant for 1.6.1, let alone next, yet.

200

201 * jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit

202 - "git push": tellme-more protocol extension

What's cooking (2008/12 #02)