To: git@vger.kernel.org
-Subject: What's cooking in git.git (Feb 2009, #02; Wed, 04)
-X-master-at: 88ccb9f9745ff1f44bff7c6d6c17ad4b46870706
-X-next-at: c5d3fa64fe3170d80a48f5c5b99f14dbabcbd9b4
+Subject: What's cooking in git.git (Feb 2009, #03; Sat, 07)
+X-master-at: 621f1b4bcf40f1469fc59202248df35619e33c82
+X-next-at: 5e148c2bfc7eda43fad0646e9583a9959b15bb2a
-What's cooking in git.git (Feb 2009, #02; Wed, 04)
+What's cooking in git.git (Feb 2009, #03; Sat, 07)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
The topics list the commits in reverse chronological order. The topics
meant to be merged to the maintenance series have "maint-" in their names.
-I was this close (shows thumb and index finger almost touching) to merge
-js/notes to master and declare 1.6.2-rc0 but decided against it, because I
-thought I need to at least have heard about somebody who used it before
-doing so. Perhaps I'll try it out myself to keep track of commits that
-happened between 1.6.1 and master that need to be cherry-picked to maint,
-or something silly like that. In any case, my prediction is that -rc0
-would look like what 'next' tonight looks like, nothing more, not much
-less (I'd probably drop jc/blame).
+The master branch is at -rc0 now.
+
+Traditionally, rc freeze, especially post -rc1, meant that I stop paying
+attention to whatever topic that did not graduate to 'master', and not
+queuing further updates to 'next' to encourage people to concentrate on
+'master' bugfixes by discouraging them from tinkering the topics that
+won't be in the next release.
+
+I do not think that approach has worked well in practice, so let's try
+something slightly different.
+
+I'll try to leave 'next' open during this freeze, but the new topics and
+topics that hasn't cooked to maturity by -rc1 will not be in 1.6.2. That
+is what a freeze means, so it may not be necessary to say so, but I am
+just trying to make it clear.
----------------------------------------------------------------
[New Topics]
-* jc/refuse-push-to-current-1.7.0 (Sat Jan 31 17:34:05 2009 -0800) 1 commit
- - Refuse updating the current branch in a non-bare repository via
- push
+* jn/gitweb-committag (Fri Feb 6 10:12:41 2009 +0100) 1 commit
+ + gitweb: Better regexp for SHA-1 committag match
-This is for 1.7.0.
+* js/maint-1.6.0-path-normalize (Sat Feb 7 16:08:31 2009 +0100) 5 commits
+ + Remove unused normalize_absolute_path()
+ + Test and fix normalize_path_copy()
+ + Fix GIT_CEILING_DIRECTORIES on Windows
+ + Move sanitary_path_copy() to path.c and rename it to
+ normalize_path_copy()
+ + Make test-path-utils more robust against incorrect use
-* js/maint-remote-remove-mirror (Wed Feb 4 11:06:07 2009 -0500) 2 commits
- + builtin-remote: make rm operation safer in mirrored repository
- + builtin-remote: make rm() use properly named variable to hold
- return value
-
-* ek/maint-filter-branch-bare (Tue Feb 3 13:27:03 2009 -0500) 1 commit
- + filter-branch: Fix fatal error on bare repositories
+Replaces one from René that was queued earlier.
-* tr/add-p-single (Wed Feb 4 21:12:39 2009 +0100) 2 commits
- - add -p: print errors in separate color
- - add -p: prompt for single characters
+* js/git-submodule-trailing-slash (Sat Feb 7 14:43:15 2009 +0100) 2 commits
+ + submodule: warn about non-submodules
+ + Let ls-files strip trailing slashes in submodules' paths
-Will move to 'next'; it may or may not mature in time for 1.6.2.
+* ms/mailmap (Thu Feb 5 09:06:41 2009 +0100) 4 commits
+ - Change current mailmap usage to do matching on both name and email
+ of author/committer.
+ - Add map_user() and clear_mailmap() to mailmap
+ - Add find_insert_index, insert_at_index and clear_func functions to
+ string_list
+ - Add log.mailmap as configurational option for mailmap location
-----------------------------------------------------------------
-[Stalled and may need help and prodding to go forward]
+* ff/submodule-no-fetch (Thu Feb 5 20:18:32 2009 -0200) 1 commit
+ - submodule: add --no-fetch parameter to update command
-* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
- - git-merge-file: allow converting the results for the work tree
+* mc/setup-cd-p (Fri Feb 6 19:24:28 2009 -0800) 1 commit
+ - git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work
+ tree
-This is a feature waiting for a user. I do not need it in 1.6.2
+* js/rebase-error-a-bit-more-verbose (Sat Feb 7 18:20:09 2009 +0100) 1 commit
+ + rebase: explain why when the HEAD could not be detached
-We did not give scripted Porcelains a way to say "this temporary file I am
-using for merging is for this path, so use the core.autocrlf and attributes
-rules for that final path". Instead, merge-file simply wrote out the
-data in the canonical repository representation.
+All of these looked sensible, and I think many deserve to be in 1.6.2.
+They are not in -rc0 only because I started the release engineering before
+they arrived.
-rerere has the same issue, but it is a lot worse. It reads the three
-files (preimage, postimage and thisimage) from the work tree in the work
-tree representation, merges them without converting them to the canonical
-representation first but inserts the conflict markers with the canonical
-representation and writes the resulting mess out. It needs to be fixed to
-read with convert_to_git(), merge them while they are still in the
-canonical representation and possibly add conflict markers, and then write
-the results out after convert_to_working_tree(). It also needs to write
-in binary mode as well.
+----------------------------------------------------------------
+[Stalled and may need help and prodding to go forward]
* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits
+ blame: show "previous" information in --porcelain/--incremental
may need refining, and sanity checking code for reference counting may
need to be resurrected before this can move forward.
+Recent tig discussion may blow new life into it. Let's see.
+
* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits
- Support fetching from foreign VCSes
- Add specification of git-vcs helpers
convinced it is doing the right thing in the connectivity traverser.
I'd like to keep this out of 1.6.2.
-* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 6 commits
- - archive.c: add support for --submodules[=(all|checkedout)]
- - tree.c: allow read_tree_recursive() to traverse gitlink entries
- + Revert round #1 of the series
- + builtin-ls-tree: enable traversal of submodules
- + archive.c: enable traversal of submodules
- + tree.c: add support for traversal of submodules
-
-Sorry, but what's the status of this one? I am not particularly
-interested in this new feature myself, so unless I hear otherwise from
-people, I'd like to keep this out of 1.6.2. That would have the added
-benefit of being able to discard the first four that is already in 'next'
-to get a fresh start post 1.6.2 ;-)
-
* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits
- gitweb: Optional grouping of projects by category
- gitweb: Split git_project_list_body in two functions
Design discussion between Jakub and Sebastien seems to have stalled.
+* jc/fsck (Fri Jan 30 02:33:47 2009 -0800) 4 commits
+ - fsck: three levels of validation
+ - verify-pack: add --quick
+ - verify_pack(): allow a quicker verification for a pack with
+ version 2 idx
+ - pack-check.c: minor formatting fix to match coding style
+
+J6t has a good point that if this had any value then medium level should
+replace the default. I am tempted to actually dropping this as a failed
+experiment.
+
----------------------------------------------------------------
[Reverted]
This broke git-format-patch badly.
+* rs/maint-1.6.0-windows-ceiling (Sat Feb 7 12:40:40 2009 -0800) 2 commits
+ ? Revert "fix t1504 on Windows"
+ ? fix t1504 on Windows
+
+I'm giving a fresh start to J6t's series which contains this.
+
+* lh/reverted-submodule-tree-traversal (Sun Jan 25 18:39:55 2009 -0800) 4 commits
+ ? Revert round #1 of the series
+ ? builtin-ls-tree: enable traversal of submodules
+ ? archive.c: enable traversal of submodules
+ ? tree.c: add support for traversal of submodules
+
+I'm giving a fresh start to Lars's second iteration.
+
----------------------------------------------------------------
[Actively cooking]
-* jc/fsck (Fri Jan 30 02:44:13 2009 -0800) 5 commits
- - fsck: revert --quick to the default and introduce --medium
- - fsck: three levels of validation
- - verify-pack: add --quick
- - verify_pack(): allow a quicker verification for a pack with
- version 2 idx
- - pack-check.c: minor formatting fix to match coding style
+* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 2 commits
+ - archive.c: add support for --submodules[=(all|checkedout)]
+ + tree.c: allow read_tree_recursive() to traverse gitlink entries
-I haven't heard anything positive nor negative about this series. I think
-the tip two commits should be squashed (and perhaps the option parser
-cleaned up as suggested on the list).
+I think the first one is Ok to have in 1.6.2 but I didn't audit all the
+r-t-r callback functions myself to make sure they do not return
+READ_TREE_RECURSIVE when they shouldn't. Perhaps somebody else should
+double check.
* kb/checkout-optim (Wed Feb 4 13:53:20 2009 +0100) 8 commits
- lstat_cache(): print a warning if doing ping-pong between cache
- lstat_cache(): generalise longest_match_lstat_cache()
- lstat_cache(): small cleanup and optimisation
-Should be in 'next' soon.
+I thought it looked fine, but Kjetil asks to cook this a bit longer.
-* js/valgrind (Wed Feb 4 00:26:31 2009 +0100) 8 commits
- - test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
- - Tests: let --valgrind imply --verbose and --tee
- - Add a script to coalesce the valgrind outputs
- - t/Makefile: provide a 'valgrind' target
- - test-lib.sh: optionally output to test-results/$TEST.out, too
- - Valgrind support: check for more than just programming errors
- - valgrind: ignore ldso and more libz errors
- - Add valgrind support in test scripts
+* js/valgrind (Thu Feb 5 22:03:00 2009 +0100) 9 commits
+ + valgrind: do not require valgrind 3.4.0 or newer
+ + test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
+ + Tests: let --valgrind imply --verbose and --tee
+ + Add a script to coalesce the valgrind outputs
+ + t/Makefile: provide a 'valgrind' target
+ + test-lib.sh: optionally output to test-results/$TEST.out, too
+ + Valgrind support: check for more than just programming errors
+ + valgrind: ignore ldso and more libz errors
+ + Add valgrind support in test scripts
+
+----------------------------------------------------------------
+[Graduated to "master"]
+
+* js/maint-remote-remove-mirror (Wed Feb 4 11:06:07 2009 -0500) 2 commits
+ + builtin-remote: make rm operation safer in mirrored repository
+ + builtin-remote: make rm() use properly named variable to hold
+ return value
+
+* ek/maint-filter-branch-bare (Tue Feb 3 13:27:03 2009 -0500) 1 commit
+ + filter-branch: Fix fatal error on bare repositories
-Should be in 'next' soon.
+* tr/add-p-single (Fri Feb 6 20:30:01 2009 +0100) 3 commits
+ + add -p: import Term::ReadKey with 'require'
+ + add -p: print errors in separate color
+ + add -p: prompt for single characters
* js/notes (Tue Jan 13 20:57:16 2009 +0100) 6 commits
+ git-notes: fix printing of multi-line notes
+ Add a script to edit/inspect notes
+ Introduce commit notes
-It would be nice to hear a real world success story using the notes
-mechanism; Dscho says he also wants to make sure the current choice
-of the structure scales well before casting it in stone, but nothing
-has happened since then.
-
-----------------------------------------------------------------
-[Graduated to "master"]
-
-* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits
- + In add --patch, Handle K,k,J,j slightly more gracefully.
- + Add / command in add --patch
- + git-add -i/-p: Change prompt separater from slash to comma
-
-* jc/maint-add-u-remove-conflicted (Wed Jan 28 14:24:53 2009 -0800) 1 commit
- + add -u: do not fail to resolve a path as deleted
-
-* jk/maint-cleanup-after-exec-failure (Wed Jan 28 02:38:14 2009 -0500) 4 commits
- + git: use run_command() to execute dashed externals
- + run_command(): help callers distinguish errors
- + run_command(): handle missing command errors more gracefully
- + git: s/run_command/run_builtin/
-
-* ns/am-slacker (Sat Jan 24 10:18:02 2009 +0900) 2 commits
- + git-am: Add --ignore-date option
- + am: Add --committer-date-is-author-date option
-
-----------------------------------------------------------------
-[Will merge to "master" soon]
-
* gt/utf8-width (Fri Jan 30 04:41:29 2009 -0500) 2 commits
+ builtin-blame.c: Use utf8_strwidth for author's names
+ utf8: add utf8_strwidth()
+ symbolic ref: refuse non-ref targets in HEAD
+ validate_headref: tighten ref-matching to just branches
-Looked fine for 1.6.2.
-
* rc/http-push (Tue Feb 3 20:39:00 2009 +0800) 4 commits
+ http-push: wrap signature of get_remote_object_url
+ http-push: add back underscore separator before lock token
USE_CURL_MULTI
+ http-push: refactor request url creation
-As these are supposed to be only clean-ups without any functionality
-change, let's flush it out before 1.6.2.
-
* jc/refuse-push-to-current (Sat Jan 31 17:34:05 2009 -0800) 1 commit
+ receive-pack: explain what to do when push updates the current
branch
-This prepares to finally switch the default for receive.denyCurrentBranch
-to "refuse". The idea is to issue a big warning to people who push into
-currently checked out branch when the configuration is unset and we
-default to "warn", and explain in detail (1) why it is not likely to be
-what they want to do (to help new people), (2) if it is what they want,
-how to squelch that annoyingly long message, and (3) the default will be
-changed to "refuse" in a future release of git.
-
* cb/mergetool (Fri Jan 30 23:20:11 2009 +0000) 3 commits
+ mergetool: fix running mergetool in sub-directories
+ mergetool: Add a test for running mergetool in a sub-directory
----------------------------------------------------------------
[On Hold]
+* jc/refuse-push-to-current-1.7.0 (Sat Jan 31 17:34:05 2009 -0800) 1 commit
+ - Refuse updating the current branch in a non-bare repository via
+ push
+
+This is for 1.7.0.
+
* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits
- git commit: pathspec without -i/-o implies -i semantics during a
merge
This is only meant as a weatherballoon to help facilitate discussion.
+* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit
+ - git-merge-file: allow converting the results for the work tree
+
+This is a feature waiting for a user. I do not need it in 1.6.2
+
+We did not give scripted Porcelains a way to say "this temporary file I am
+using for merging is for this path, so use the core.autocrlf and attributes
+rules for that final path". Instead, merge-file simply wrote out the
+data in the canonical repository representation.
+
+rerere has the same issue, but it is a lot worse. It reads the three
+files (preimage, postimage and thisimage) from the work tree in the work
+tree representation, merges them without converting them to the canonical
+representation first but inserts the conflict markers with the canonical
+representation and writes the resulting mess out. It needs to be fixed to
+read with convert_to_git(), merge them while they are still in the
+canonical representation and possibly add conflict markers, and then write
+the results out after convert_to_working_tree(). It also needs to write
+in binary mode as well.
+
* jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit
. diff: enable "too large a rename" warning when -M/-C is explicitly
asked for
projects / thirdparty / git.git / commitdiff
