From fa041b4d84bc45b04e58c2f3d321c0cecea19d71 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 11 Aug 2008 17:26:24 -0700 Subject: [PATCH] What's in/cooking updates --- whats/cooking/2008/08/02.txt | 159 +++++++++++++++++++++++++++++++++++ whats/in/2008/08/02.txt | 124 +++++++++++++++++++++++++++ 2 files changed, 283 insertions(+) create mode 100644 whats/cooking/2008/08/02.txt create mode 100644 whats/in/2008/08/02.txt diff --git a/whats/cooking/2008/08/02.txt b/whats/cooking/2008/08/02.txt new file mode 100644 index 0000000000..394b44a983 --- /dev/null +++ b/whats/cooking/2008/08/02.txt @@ -0,0 +1,159 @@ +Subject: What's cooking in git.git (Aug 2008, #02; Mon, 11) +X-master-at: 10d9d887ecdc81197162d7bbe5dfc0d028498fd6 +X-next-at: 3cb9d94cdc74f3137599446af9f5442b7ae1ab27 + +What's cooking in git.git (Aug 2008, #02; Mon, 11) +-------------------------------------------------- + +Here are the topics that have been cooking. Commits prefixed +with '-' are only in 'pu' while commits prefixed with '+' are +in 'next'. + +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] + +* jc/test-deeper (Fri Aug 8 02:26:28 2008 -0700) 1 commit + - tests: use $TEST_DIRECTORY to refer to the t/ directory + +* kh/diff-tree (Sun Aug 10 18:13:04 2008 +0200) 4 commits + + Add test for diff-tree --stdin with two trees + + Teach git diff-tree --stdin to diff trees + + diff-tree: Note that the commit ID is printed with --stdin + + Refactoring: Split up diff_tree_stdin + +* js/parallel-test (Fri Aug 8 13:08:37 2008 +0200) 3 commits + + Enable parallel tests + + tests: Clarify dependencies between tests, 'aggregate-results' and + 'clean' + + t9700: remove useless check + +* xx/post-1.6.0 (Sun Aug 10 19:10:04 2008 -0400) 3 commits + + git-submodule - Add 'foreach' subcommand + + builtin-reflog: Allow reflog expire to name partial ref + + git-am: ignore --binary option + +Some collection of patches to queue for post-1.6.0 development. + +---------------------------------------------------------------- +[Graduated to "master"] + +* rs/archive-parse-options (Fri Jul 25 12:41:26 2008 +0200) 1 commit + + archive: allow --exec and --remote without equal sign + +---------------------------------------------------------------- +[On Hold and/or Cooking] + +* jc/post-simplify (Sun Aug 3 17:47:16 2008 -0700) 3 commits + + Topo-sort before --simplify-merges + + revision traversal: show full history with merge simplification + + revision.c: whitespace fix + +"log --full-history" is with too much clutter, "log" itself is too cleverer +than some people, and here is the middle level of merge simplification. + +* sp/smart-http (Sun Aug 3 00:25:17 2008 -0700) 2 commits + - [do not merge -- original version] Add Git-aware CGI for Git-aware + smart HTTP transport + - Add backdoor options to receive-pack for use in Git-aware CGI + +The "magic" detection protocol was revised to use POST to info/refs; the +top one queued is from before that discussion. + +* jc/add-stop-at-symlink (Mon Aug 4 00:52:37 2008 -0700) 2 commits + + add: refuse to add working tree items beyond symlinks + + update-index: refuse to add working tree items beyond symlinks + +Fix for a longstanding bug that allows "git add" and "git update-index" to +add a path "a/b" to the index when "a" is a symbolic link. We would need +a similar fix for the case where "a" is a submodule. + +* dp/hash-literally (Sun Aug 3 18:36:22 2008 +0400) 6 commits + + add --no-filters option to git hash-object + + add --path option to git hash-object + + use parse_options() in git hash-object + + correct usage help string for git-hash-object + + correct argument checking test for git hash-object + + teach index_fd to work with pipes + +Gives a bit more flexibility to hash-objects by allowing us to lie about +the path the contents comes from. + +* mv/merge-custom (Sat Aug 2 10:08:38 2008 +0200) 6 commits + + Builtin git-help. + + builtin-help: always load_command_list() in cmd_help() + + Add a second testcase for handling invalid strategies in git-merge + + Add a new test for using a custom merge strategy + + builtin-merge: allow using a custom strategy + + builtin-help: make some internal functions available to other + builtins + +* cc/merge-base-many (Sun Jul 27 13:47:22 2008 -0700) 4 commits + - git-merge-octopus: use (merge-base A (merge B C D E...)) for + stepwise merge + + merge-base-many: add trivial tests based on the documentation + + documentation: merge-base: explain "git merge-base" with more than + 2 args + + merge-base: teach "git merge-base" to drive underlying + merge_bases_many() + +* rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits + + Documentation: Improve documentation for git-imap-send(1) + + imap-send.c: more style fixes + + imap-send.c: style fixes + + git-imap-send: Support SSL + + git-imap-send: Allow the program to be run from subdirectories of + a git tree + +Some people seem to prefer having this feature available also with gnutls. +Such an enhancement can be done in-tree on top of this series if they are +so inclined. + +* cc/bisect (Fri Jul 25 05:36:37 2008 +0200) 2 commits + - bisect: only check merge bases when needed + - bisect: test merge base if good rev is not an ancestor of bad rev + +The first one alone does not pass its self-test but combined together they +seem to. It does not build confidence as the latter one is supposed to be +an optimization only. + +* jc/add-addremove (Tue Jul 22 22:30:40 2008 -0700) 2 commits + + builtin-add.c: optimize -A option and "git add ." + + builtin-add.c: restructure the code for maintainability + +* jk/pager-swap (Tue Jul 22 03:14:12 2008 -0400) 2 commits + + spawn pager via run_command interface + + run-command: add pre-exec callback + +This changes the parent-child relationship between the pager and the git +process. We used to make pager the parent which meant that the exit +status from git is lost from the caller. + +* ph/enable-threaded (Mon Jul 21 11:23:43 2008 +0200) 1 commit + + Enable threaded delta search on *BSD and Linux. + +* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit + + merge: remove deprecated summary and diffstat options and config + variables + +This was previously in "will be in master soon" category, but it turns out +that the synonyms to the ones this one deletes are fairly new invention +that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps +in 1.7.0. + +* jc/dashless (Thu Jun 26 16:43:34 2008 -0700) 2 commits + + Revert "Make clients ask for "git program" over ssh and local + transport" + + Make clients ask for "git program" over ssh and local transport + +This is the "botched" one. Will be resurrected during 1.7.0 or 1.8.0 +timeframe. + +* 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 + +This would be the right thing to do for command line use, but gitk will be +hit due to tcl/tk's limitation, so I am holding this back for now. diff --git a/whats/in/2008/08/02.txt b/whats/in/2008/08/02.txt new file mode 100644 index 0000000000..23cecca25d --- /dev/null +++ b/whats/in/2008/08/02.txt @@ -0,0 +1,124 @@ +Subject: What's in git.git (Aug 2008, #02; Mon, 11) +X-maint-at: 4f80b27d48fee1c588810f3341ffe5d14558cea2 +X-master-at: 10d9d887ecdc81197162d7bbe5dfc0d028498fd6 +X-maint-was: 2d0f5f3459278475602394a7165bf8919412f4e4 +X-master-was: ddd63e64e4ac7e455dff3e807bf6a6977bb61456 + +What's in git.git (Aug 2008, #02; Mon, 11) + + maint 4f80b27 (Documentation: fix invalid reference to 'mybranch' in user manual) + master 10d9d88 (Merge branch 'maint') +------------------------------------------------------------------------ + +Minor fixes toward 1.6.0 final continue to flow in, but many of them are +also applicable to 'maint'. + +Also on 'maint' branch, there are a few backmerges of topics that have +already been in 'master' for a while. Not all of them are "fixes", +though. We may or may not have 1.5.6.6 before 1.6.0 happens. + +* The 'maint' branch has these fixes since the last announcement. + +Alexander Gavrilov (1): + Fix quadratic performance in rewrite_one. + +Ivan Stankovic (1): + Documentation: fix invalid reference to 'mybranch' in user manual + +Junio C Hamano (7): + Per-ref reflog expiry configuration + Make default expiration period of reflog used for stash infinite + fix diff-tree --stdin documentation + Files given on the command line are relative to $cwd + GIT 1.5.6.5 + asciidoc markup fixes + Fix deleting reflog entries from HEAD reflog + +Linus Torvalds (4): + Split up default "core" config parsing into helper routine + Split up default "user" config parsing into helper routine + Split up default "i18n" and "branch" config parsing into helper routines + Add config option to enable 'fsync()' of object files + +Petr Baudis (1): + Fail properly when cloning from invalid HTTP URL + +Pieter de Bie (1): + reflog test: add more tests for 'reflog delete' + +Thomas Rast (1): + Documentation: rev-list-options: Fix -g paragraph formatting + + +* The 'master' branch has these since the last announcement + in addition to the above. + +Alexander Gavrilov (6): + gitk: Kill back-end processes on window close + gitk: Arrange to kill diff-files & diff-index on quit + gitk: On Windows, use a Cygwin-specific flag for kill + gitk: Fixed broken exception handling in diff + gitk: Fixed automatic row selection during load + gitk: Fallback to selecting the head commit upon load + +Brandon Casey (3): + perl/Makefile: handle paths with spaces in the NO_PERL_MAKEMAKER section + Makefile: set SHELL to value of SHELL_PATH + Makefile: add a target which will abort compilation with ancient shells + +Christian Stimming (2): + git-gui: Update German translation + gitk: Updated German translation + +Eric Wong (2): + git-svn: add ability to specify --commit-url for dcommit + git-svn: wrap long lines in a few places + +Johannes Schindelin (1): + clone --mirror: avoid storing repeated tags + +Johannes Sixt (1): + git-gui: Adapt discovery of oguilib to execdir 'libexec/git-core' + +Jonathan Nieder (1): + Documentation: user-manual: "git commit -a" doesn't motivate .gitignore + +Junio C Hamano (4): + GIT 1.6.0-rc2 + GIT-VERSION-GEN: mark the version 'dirty' only if there are modified + files + mailinfo: fix MIME multi-part message boundary handling + Update draft RelNotes for 1.6.0 + +Marcus Griep (2): + Fix multi-glob assertion in git-svn + git-svn: Allow deep branch names by supporting multi-globs + +Michele Ballabio (2): + git-gui: update po/it.po + git-gui: add a part about format strings in po/README + +Mikael Magnusson (2): + git-gui: Update swedish translation. + gitk: Update swedish translation. + +Nanako Shiraishi (1): + git-gui: update Japanese translation + +Pieter de Bie (1): + builtin-rm: Add a --force flag + +René Scharfe (1): + archive: allow --exec and --remote without equal sign + +SZEDER Gábor (1): + bash: remove redundant check for 'git stash apply' options + +Shawn O. Pearce (1): + git-gui: Update git-gui.pot for 0.11 nearing release + +Thomas Rast (3): + Documentation: commit-tree: remove 16 parents restriction + Documentation: filter-branch: document how to filter all refs + filter-branch: be more helpful when an annotated tag changes + -- 2.32.0.93.g670b81a890