You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
259 lines
10 KiB
259 lines
10 KiB
To: git@vger.kernel.org |
|
Subject: What's cooking in git.git (May 2009, #01; Sat, 09) |
|
X-master-at: 6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0 |
|
X-next-at: 99c766e3a22715646df19711aeaf76e0c938bacd |
|
|
|
What's cooking in git.git (May 2009, #01; Sat, 09) |
|
-------------------------------------------------- |
|
|
|
Here are the topics that have been cooking. Commits prefixed with '-' are |
|
only in 'pu' while commits prefixed with '+' are in 'next'. The ones |
|
marked with '.' do not appear in any of the branches, but I am still |
|
holding onto them. |
|
|
|
The topics list the commits in reverse chronological order. The topics |
|
meant to be merged to the maintenance series have "maint-" in their names. |
|
|
|
---------------------------------------------------------------- |
|
[New Topics] |
|
|
|
* mt/submodule-reference (Mon May 4 22:30:01 2009 +0300) 1 commit |
|
+ Add --reference option to git submodule. |
|
|
|
* rr/forbid-bs-in-ref (Fri May 8 07:32:37 2009 +0200) 1 commit |
|
+ Disallow '\' in ref names |
|
|
|
This retroactively forbids use of what people could have been using |
|
happily, which, strictly speaking, is a no-no, but makes sense in the |
|
longer term. |
|
|
|
* jk/maint-add-empty (Tue Apr 28 23:21:01 2009 -0400) 1 commit |
|
- add: don't complain when adding empty project root |
|
|
|
When you say "git add ." in an empty directory, you get "No path matches |
|
''", instead of "No path matches '.'", and this "fixes" it by hiding the |
|
error and making the command silently succeed. Strictly speaking it |
|
introduces inconsistency, but I think an empty directory is so |
|
uninteresting special case that not signalling it as an error is Ok. |
|
|
|
Will merge to 'next'. |
|
|
|
* lt/maint-diff-reduce-lstat (Sat May 9 15:11:17 2009 -0700) 2 commits |
|
+ Teach 'git checkout' to preload the index contents |
|
+ Avoid unnecessary 'lstat()' calls in 'get_stat_data()' |
|
|
|
* jk/maint-1.6.0-trace-argv (Fri May 8 05:06:15 2009 -0400) 1 commit |
|
+ fix GIT_TRACE segfault with shell-quoted aliases |
|
|
|
* hv/sample-update (Fri May 8 17:22:30 2009 +0200) 1 commit |
|
+ Extend sample update hook, disable modifying of existing tags |
|
|
|
* rs/grep-parseopt (Thu May 7 21:46:48 2009 +0200) 5 commits |
|
+ grep: use parseopt |
|
+ grep: remove global variable builtin_grep |
|
+ parseopt: add PARSE_OPT_NODASH |
|
+ parseopt: add OPT_NUMBER_CALLBACK |
|
+ parseopt: add OPT_NEGBIT |
|
|
|
* do/maint-merge-recursive-fix (Sat May 9 14:49:59 2009 -0700) 1 commit |
|
+ merge-recursive: never leave index unmerged while recursing |
|
|
|
* np/push-delta (Fri May 1 16:56:47 2009 -0400) 1 commit |
|
+ allow OFS_DELTA objects during a push |
|
|
|
* jm/format-patch-no-auto-n-when-k-is-given (Sat May 9 10:12:01 2009 +0200) 1 commit |
|
+ format-patch let -k override a config-specified format.numbered |
|
|
|
* da/mergetool-lib (Sat May 2 01:57:21 2009 -0700) 1 commit |
|
- mergetool--lib: specialize diff options for emerge and ecmerge |
|
|
|
* jk/no-no-no-empty-directory (Fri May 8 01:01:17 2009 -0400) 2 commits |
|
+ parseopt: add OPT_NEGBIT |
|
+ parseopt: add OPT_NEGBIT |
|
|
|
I somehow botched the commit log message of the top one; it is about |
|
fixing "ls-files --no-empty-directory". |
|
|
|
* fl/git-pm (Thu May 7 15:41:28 2009 +0200) 2 commits |
|
+ Git.pm: Always set Repository to absolute path if autodetecting |
|
+ Git.pm: Set GIT_WORK_TREE if we set GIT_DIR |
|
|
|
---------------------------------------------------------------- |
|
[Will merge to "master" soon] |
|
|
|
|
|
---------------------------------------------------------------- |
|
[Stalled and may need help and prodding to go forward] |
|
|
|
* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit |
|
- blame.c: start libifying the blame infrastructure |
|
|
|
A few minor point remains in this initial one. I hate to do these minor |
|
fix-ups myself, but I may end up doing so... |
|
|
|
* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit |
|
- Allow --date=local --date=other-format to work as expected |
|
|
|
The one I posted had a few corner-case bugs that was caught with the test |
|
suite; this one has them fixed. People did not like the UI so it is kept |
|
out of 'next' |
|
|
|
* 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. |
|
|
|
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. |
|
|
|
* db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits |
|
- Add option for using a foreign VCS |
|
- Document details of transport function APIs |
|
- Allow late reporting of fetched hashes |
|
|
|
* js/notes (Tue Apr 14 00:03:36 2009 +0200) 15 commits |
|
- Documentation: fix 'linkgit' macro in "git-notes.txt" |
|
- tests: fix "export var=val" |
|
- notes: refuse to edit notes outside refs/notes/ |
|
- t3301: use test_must_fail instead of ! |
|
- t3301: fix confusing quoting in test for valid notes ref |
|
- notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR |
|
- notes: only clean up message file when editing |
|
- handle empty notes gracefully |
|
- git notes show: test empty notes |
|
- git-notes: fix printing of multi-line notes |
|
- notes: fix core.notesRef documentation |
|
- Add an expensive test for git-notes |
|
- Speed up git notes lookup |
|
- Add a script to edit/inspect notes |
|
- Introduce commit notes |
|
|
|
* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits |
|
- t/t9600: remove exit after test_done |
|
- cvsimport: extend testcase about patchset order to contain |
|
branches |
|
- cvsimport: add test illustrating a bug in cvsps |
|
- Add a test of "git cvsimport"'s handling of tags and branches |
|
- Add some tests of git-cvsimport's handling of vendor branches |
|
- Test contents of entire cvsimported "master" tree contents |
|
- Use CVS's -f option if available (ignore user's ~/.cvsrc file) |
|
- Start a library for cvsimport-related tests |
|
|
|
---------------------------------------------------------------- |
|
[Actively cooking] |
|
|
|
* cc/bisect (Fri Apr 24 08:29:01 2009 +0200) 10 commits |
|
- am: simplify "sq" function by using "git rev-parse --sq-quote" |
|
- bisect: use "git rev-parse --sq-quote" instead of a custom "sq" |
|
function |
|
- rev-parse: add --sq-quote to shell quote arguments |
|
- rev-list: remove stringed output flag from "show_bisect_vars" |
|
- bisect--helper: remove "--next-vars" option as it is now useless |
|
- bisect: use "git bisect--helper --next-exit" in "git-bisect.sh" |
|
- bisect--helper: add "--next-exit" to output bisect results |
|
- bisect: move common bisect functionality to "bisect_common" |
|
- rev-list: refactor printing bisect vars |
|
- rev-list: make "estimate_bisect_steps" non static |
|
|
|
Will merge to 'next'. |
|
|
|
* mh/show-branch-color (Sat Apr 25 13:46:14 2009 +0200) 2 commits |
|
+ bash completion: show-branch color support |
|
+ show-branch: color the commit status signs |
|
|
|
* ac/graph-horizontal-line (Tue Apr 21 08:47:01 2009 -0400) 1 commit |
|
+ graph API: Use horizontal lines for more compact graphs |
|
|
|
* ar/merge-one-file-diag (Wed Apr 29 23:40:50 2009 +0200) 1 commit |
|
- Clarify kind of conflict in merge-one-file helper |
|
|
|
Will merge to 'next'. |
|
|
|
* mh/diff-stat-color (Sat Apr 25 00:06:47 2009 +0200) 1 commit |
|
- diff: do not color --stat output like patch context |
|
|
|
Will merge to 'next'. |
|
|
|
* rc/http-push (Sat Apr 25 00:35:57 2009 +0800) 3 commits |
|
- http-push: send out fetch requests on queue |
|
- t5540-http-push: test fetching of packed objects |
|
- t5540-http-push: test fetching of loose objects |
|
|
|
* ae/anon-fetch-info (Fri Apr 17 10:20:11 2009 +0200) 1 commit |
|
+ fetch: Strip usernames from url's before storing them |
|
|
|
* ar/unlink-err (Wed Apr 29 23:24:52 2009 +0200) 3 commits |
|
- print unlink(2) errno in copy_or_link_directory |
|
- replace direct calls to unlink(2) with unlink_or_warn |
|
- Introduce an unlink(2) wrapper which gives warning if unlink |
|
failed |
|
|
|
Will merge to 'next'. |
|
|
|
* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit |
|
- git-submodule: add support for --rebase. |
|
|
|
Will merge to 'next'. |
|
|
|
* mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits |
|
- send-email: Remove superfluous `my $editor = ...' |
|
- send-email: 'References:' should only reference what is sent |
|
- send-email: Handle "GIT:" rather than "GIT: " during --compose |
|
- Docs: send-email: --smtp-server-port can take symbolic ports |
|
- Docs: send-email: Refer to CONFIGURATION section for |
|
sendemail.multiedit |
|
- Docs: send-email: Put options back into alphabetical order |
|
|
|
Only partially queued, but this is not 1.6.3 material and we are not in a |
|
hurry. |
|
|
|
Will merge to 'next'. |
|
|
|
* js/add-edit (Mon Apr 27 19:51:42 2009 +0200) 2 commits |
|
+ t3702: fix reliance on SHELL_PATH being '/bin/sh' |
|
+ git-add: introduce --edit (to edit the diff vs. the index) |
|
|
|
* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits |
|
- Documentation: add documentation for "git replace" |
|
- Add git-replace to .gitignore |
|
- builtin-replace: use "usage_msg_opt" to give better error messages |
|
- parse-options: add new function "usage_msg_opt" |
|
- builtin-replace: teach "git replace" to actually replace |
|
- Add new "git replace" command |
|
- environment: add global variable to disable replacement |
|
- mktag: call "check_sha1_signature" with the replacement sha1 |
|
- replace_object: add a test case |
|
- object: call "check_sha1_signature" with the replacement sha1 |
|
- sha1_file: add a "read_sha1_file_repl" function |
|
- replace_object: add mechanism to replace objects found in |
|
"refs/replace/" |
|
- refs: add a "for_each_replace_ref" function |
|
|
|
I suspect an attempt to replace an object that is directly listed on the |
|
command line would not work very well with this series. |
|
|
|
---------------------------------------------------------------- |
|
[On Hold] |
|
|
|
* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit |
|
- receive-pack: default receive.denyDeleteCurrent to refuse |
|
|
|
* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit |
|
- Refuse updating the current branch in a non-bare repository via |
|
push |
|
|
|
These are for 1.7.0, but the messages when they trigger together may need |
|
to be rethought. Will start merging them to 'next' shortly. |
|
|
|
|