dc7a9d1556 · matheusbsbs/matheus-bagliano

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

1 -What's cooking in git.git (Jun 2008, issue #02; Mon, 23)

1 +What's cooking in git.git (Jun 2008, issue #03; Wed, 25)

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

3

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

@@ -19,26 +19,21 @@ good set of feature enhancements. But bigger changes will be:

19

20 * git-merge will be rewritten in C.

21

22 -Currently tip of 'pu' is broken and does not pass tests, as j6t/mingw has

23 -interaction with dr/ceiling and jc/merge-theirs has interaction with

24 -mv/merge-in-c.

22 + * default pack and idx versions will be updated as scheduled for some

23 + time ago.

24

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

26 [New Topics]

27

29 -* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits

30 - - rerere.autoupdate

31 - - t4200: fix rerere test

32 - - rerere: remove dubious "tail_optimization"

33 - - git-rerere: detect unparsable conflicts

34 - - rerere: rerere_created_at() and has_resolution() abstraction

35 -

36 -* sb/rebase (Sun Jun 22 01:55:50 2008 +0200) 2 commits

37 - + t3404: stricter tests for git-rebase--interactive

38 - + api-builtin.txt: update and fix typo

39 -

40 -* sb/maint-rebase (Sun Jun 22 16:07:02 2008 +0200) 1 commit

41 - + git-rebase.sh: Add check if rebase is in progress

28 +* ph/parseopt-step-blame (Tue Jun 24 11:12:12 2008 +0200) 7 commits

29 + - Migrate git-blame to parse-option partially.

30 + - parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.

31 + - parse-opt: fake short strings for callers to believe in.

32 + - parse-opt: do not pring errors on unknown options, return -2

33 + intead.

34 + - parse-opt: create parse_options_step.

35 + - parse-opt: Export a non NORETURN usage dumper.

36 + - parse-opt: have parse_options_{start,end}.

37

38 ----------------------------------------------------------------

39 [Will merge to master soon]

@@ -53,10 +48,12 @@ mv/merge-in-c.

48 + Split up default "user" config parsing into helper routine

49 + Split up default "core" config parsing into helper routine

50

56 -* nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit

51 +* nd/dashless (Tue Jun 24 19:58:11 2008 -0700) 2 commits

52 + + Keep some git-* programs in $(bindir)

53 + Move all dashed-form commands to libexecdir

54

59 -Scheduled for 1.6.0.

55 +Scheduled for 1.6.0. We'll leave server-side programs in $(bindir)

56 +so that ssh clients can ask for "git-program" and find them on the $PATH.

57

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

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

@@ -85,11 +82,9 @@ Beginning of regression tests for Perl part of the system.

82 ----------------------------------------------------------------

83 [Actively Cooking]

84

88 -* mv/merge-in-c (Sat Jun 21 19:15:35 2008 +0200) 14 commits

85 +* mv/merge-in-c (Sat Jun 21 19:15:35 2008 +0200) 12 commits

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

87 possible

91 - - Add new test case to ensure git-merge filters for independent

92 - parents

88 - Build in merge

89 - Introduce reduce_heads()

90 - Introduce get_merge_bases_many()

@@ -97,17 +92,18 @@ Beginning of regression tests for Perl part of the system.

92 - Introduce get_octopus_merge_bases() in commit.c

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

94 - Move read_cache_unmerged() to read-cache.c

100 - - parseopt: add a new PARSE_OPT_ARGV0_IS_AN_OPTION option

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

96 pull.octopus

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

98 - Move commit_list_count() to commit.c

99 - Move split_cmdline() to alias.c

100

101 +I dropped the change to parseopt in this series and fixed up the caller.

102 +

103 * jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits

108 - - Prepare execv_git_cmd() for removal of builtins from the

104 + + Prepare execv_git_cmd() for removal of builtins from the

105 filesystem

110 - - git-shell: accept "git foo" form

106 + + git-shell: accept "git foo" form

107

108 We do not plan to remove git-foo form completely from the filesystem at

109 this point, but git-shell may need to be updated.

@@ -118,54 +114,23 @@ this point, but git-shell may need to be updated.

114 + Fold test-absolute-path into test-path-utils

115 + Implement normalize_absolute_path

116

121 -----------------------------------------------------------------

122 -[Graduated to "master"]

123 -

124 -* rs/archive-ignore (Sun Jun 8 18:42:33 2008 +0200) 1 commit

125 - + Teach new attribute 'export-ignore' to git-archive

126 -

127 -* lt/racy-empty (Tue Jun 10 10:44:43 2008 -0700) 1 commit

128 - + racy-git: an empty blob has a fixed object name

129 -

130 -* sn/static (Thu Jun 19 08:21:11 2008 +0900) 2 commits

131 - + config.c: make git_env_bool() static

132 - + environment.c: remove unused function

133 -

134 -* jc/maint-combine-diff-pre-context (Wed Jun 18 23:59:41 2008 -0700) 1 commit

135 - + diff -c/--cc: do not include uninteresting deletion before leading

136 - context

137 -

138 -* lt/maint-gitdir-relative (Thu Jun 19 12:34:06 2008 -0700) 1 commit

139 - + Make git_dir a path relative to work_tree in setup_work_tree()

140 -

141 -* jn/web (Tue Jun 10 19:21:44 2008 +0200) 2 commits

142 - + gitweb: Separate generating 'sort by' table header

143 - + gitweb: Separate filling list of projects info

144 -

145 -* rg/gitweb (Fri Jun 6 09:53:32 2008 +0200) 1 commit

146 - + gitweb: remove git_blame and rename git_blame2 to git_blame

147 -

148 -* kh/update-ref (Tue Jun 3 01:34:53 2008 +0200) 2 commits

149 - + Make old sha1 optional with git update-ref -d

150 - + Clean up builtin-update-ref's option parsing

117 +* jc/rerere (Sun Jun 22 02:04:31 2008 -0700) 5 commits

118 + - rerere.autoupdate

119 + - t4200: fix rerere test

120 + - rerere: remove dubious "tail_optimization"

121 + - git-rerere: detect unparsable conflicts

122 + - rerere: rerere_created_at() and has_resolution() abstraction

123

152 -* mo/status-untracked (Thu Jun 5 14:47:50 2008 +0200) 3 commits

153 - + Add configuration option for default untracked files mode

154 - + Add argument 'no' commit/status option -u|--untracked-files

155 - + Add an optional <mode> argument to commit/status -u|--untracked-

156 - files option

124 +* sb/rebase (Sun Jun 22 01:55:50 2008 +0200) 2 commits

125 + + t3404: stricter tests for git-rebase--interactive

126 + + api-builtin.txt: update and fix typo

127

158 -* jk/test (Sat Jun 14 03:28:07 2008 -0400) 5 commits

159 - + enable whitespace checking of test scripts

160 - + avoid trailing whitespace in zero-change diffstat lines

161 - + avoid whitespace on empty line in automatic usage message

162 - + mask necessary whitespace policy violations in test scripts

163 - + fix whitespace violations in test scripts

128 +* sb/maint-rebase (Sun Jun 22 16:07:02 2008 +0200) 1 commit

129 + + git-rebase.sh: Add check if rebase is in progress

130

165 -Tightens whitespace rules for t/*.sh scripts.

131 +----------------------------------------------------------------

132 +[Graduated to "master"]

133

167 -* pb/fast-export (Wed Jun 11 13:17:04 2008 +0200) 1 commit

168 - + builtin-fast-export: Add importing and exporting of revision marks

134

135 ----------------------------------------------------------------

136 [On Hold]

@@ -175,7 +140,7 @@ Tightens whitespace rules for t/*.sh scripts.

140

141 Waiting for success reports from people who use various backends.

142

178 -* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 38 commits

143 +* j6t/mingw (Sat Nov 17 20:48:14 2007 +0100) 39 commits

144 - compat/pread.c: Add a forward declaration to fix a warning

145 - Windows: Fix ntohl() related warnings about printf formatting

146 - Windows: TMP and TEMP environment variables specify a temporary

@@ -210,22 +175,23 @@ Waiting for success reports from people who use various backends.

175 - Windows: Implement setitimer() and sigaction().

176 - Windows: Fix PRIuMAX definition.

177 - Windows: Implement gettimeofday().

213 - - Windows: Handle absolute paths in

214 - safe_create_leading_directories().

215 - - Windows: Treat Windows style path names.

216 - - setup.c: Prepare for Windows directory separators.

178 + - Make my_mktime() public and rename it to tm_to_time_t()

179 - Windows: Work around misbehaved rename().

180 - Windows: always chmod(, 0666) before unlink().

181 - Windows: A minimal implemention of getpwuid().

182 - Windows: Implement a wrapper of the open() function.

183 - Windows: Strip ".exe" from the program name.

184 + - Windows: Handle absolute paths in

185 + safe_create_leading_directories().

186 + - Windows: Treat Windows style path names.

187 + - setup.c: Prepare for Windows directory separators.

188 - Windows: Use the Windows style PATH separator ';'.

189 - Add target architecture MinGW.

190 - Compile some programs only conditionally.

191 - Add compat/regex.[ch] and compat/fnmatch.[ch].

192

193 No explanation is necessary ;-). The series is probably 'next' worthy

228 -as-is.

194 +as-is, except that template renaming hack won't be needed anymore.

195

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

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