From: Junio C Hamano Date: Mon, 30 Mar 2009 21:42:01 +0000 (-0700) Subject: What's cooking/in X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34838a2c2e13ee27a5e8b65691cb85ee963dbd54;p=thirdparty%2Fgit.git What's cooking/in --- diff --git a/whats/cooking/2009/03/07.txt b/whats/cooking/2009/03/07.txt new file mode 100644 index 0000000000..072640848c --- /dev/null +++ b/whats/cooking/2009/03/07.txt @@ -0,0 +1,318 @@ +To: git@vger.kernel.org +Subject: What's cooking in git.git (Mar 2009, #07; Mon, 30) +X-master-at: 442dd42d6d4903640b0dc5561481a77c88dcea90 +X-next-at: 233382b233530fc38969fd1f31dec27e342c2a9f + +What's cooking in git.git (Mar 2009, #07; Mon, 30) +-------------------------------------------------- + +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] + +* cj/doc-format (Fri Mar 27 00:36:47 2009 -0700) 11 commits + + Merge branch 'cj/doc-quiet' into cj/doc-format + + Documentation: option to render literal text as bold for manpages + + Documentation: asciidoc.conf: fix verse block with block titles + + Documentation: asciidoc.conf: always use for + [blocktext] + + Documentation: move "spurious .sp" code into manpage-base.xsl + + Documentation: move quieting params into manpage-base.xsl + + Documentation: rename docbook-xsl-172 attribute to git-asciidoc- + no-roff + + Documentation: use parametrized manpage-base.xsl with manpage- + {1.72,normal}.xsl + + Documentation: move callouts.xsl to manpage-{base,normal}.xsl + + Documentation/Makefile: break up texi pipeline + + Documentation/Makefile: make most operations "quiet" + +* cj/doc-quiet (Fri Mar 27 01:49:39 2009 -0500) 2 commits + + Documentation/Makefile: break up texi pipeline + + Documentation/Makefile: make most operations "quiet" + +I think these are ready for 'master'. + +* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 3 commits + - checkout -: make "-" to mean "previous branch" everywhere + - Don't permit ref/branch names to end with ".lock" + - check_ref_format(): tighten refname rules + +After all the bottom two are probably not so iffy. + +* jc/name-branch (Sat Mar 21 14:35:51 2009 -0700) 5 commits + + strbuf_check_branch_ref(): a helper to check a refname for a + branch + + Fix branch -m @{-1} newname + + check-ref-format --branch: give Porcelain a way to grok branch + shorthand + + strbuf_branchname(): a wrapper for branch name shorthands + + Rename interpret/substitute nth_last_branch functions + +* sb/format-patch-patchname (Fri Mar 27 01:13:01 2009 +0100) 7 commits + + log-tree: fix patch filename computation in "git format-patch" + + format-patch: --numbered-files and --stdout aren't mutually + exclusive + + format-patch: --attach/inline uses filename instead of SHA1 + + format-patch: move get_patch_filename() into log-tree + + format-patch: pass a commit to reopen_stdout() + + format-patch: construct patch filename in one function + + pretty.c: add %f format specifier to format_commit_message() + +* mg/tracked-local-branches (Thu Mar 26 21:53:25 2009 +0100) 2 commits + - [Reroll requested] Make local branches behave like remote branches + when --tracked + - Test for local branches being followed with --track + +* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 15 commits + - bisect--helper: string output variables together with "&&" + - rev-list: pass "int flags" as last argument of "show_bisect_vars" + - t6030: test bisecting with paths + - bisect: use "bisect--helper" and remove "filter_skipped" function + - bisect: implement "read_bisect_paths" to read paths in + "$GIT_DIR/BISECT_NAMES" + - bisect--helper: implement "git bisect--helper" + - rev-list: call new "filter_skip" function + + rev-list: pass "revs" to "show_bisect_vars" + + rev-list: make "show_bisect_vars" non static + + rev-list: move code to show bisect vars into its own function + + rev-list: move bisect related code into its own file + + rev-list: make "bisect_list" variable local to "cmd_rev_list" + + refs: add "for_each_ref_in" function to refactor "for_each_*_ref" + functions + + quote: add "sq_dequote_to_argv" to put unwrapped args in an argv + array + + quote: implement "sq_dequote_many" to unwrap many args in one + string + +I've reordered them to make the early three patches independent to the +rest of the series. Dscho had a suggestion on the search it internally +does, so we might see further reroll of some patches in the series. + +* jc/shared-literally (Fri Mar 27 23:21:00 2009 -0700) 4 commits + + set_shared_perm(): sometimes we know what the final mode bits + should look like + + move_temp_to_file(): do not forget to chmod() in "Coda hack" + codepath + + Move chmod(foo, 0444) into move_temp_to_file() + + "core.sharedrepository = 0mode" should set, not loosen + +* tr/maint-1.6.1-doc-format-patch--root (Thu Mar 26 18:29:25 2009 +0100) 1 commit + + Documentation: format-patch --root clarifications + +* mh/format-patch-add-header (Thu Mar 26 10:51:05 2009 -0600) 1 commit + + format-patch: add arbitrary email headers + +* ef/fast-export (Mon Mar 23 12:53:09 2009 +0000) 4 commits + + builtin-fast-export.c: handle nested tags + + builtin-fast-export.c: fix crash on tagged trees + + builtin-fast-export.c: turn error into warning + + test-suite: adding a test for fast-export with tag variants + +---------------------------------------------------------------- +[Graduated to "master"] + +* jk/reflog-date (Fri Mar 20 02:00:43 2009 -0400) 1 commit + + make oneline reflog dates more consistent with multiline format + +* js/maint-1.6.0-exec-path-env (Wed Mar 18 08:42:53 2009 +0100) 1 commit + + export GIT_EXEC_PATH when git is run with --exec-path + +* jc/maint-1.6.0-blame-s (Wed Mar 18 00:13:03 2009 -0700) 1 commit + + blame: read custom grafts given by -S before calling + setup_revisions() + +The above are all ready for 'next'. + +* dm/maint-docco (Thu Mar 19 20:35:34 2009 -0700) 6 commits + + Documentation: reword example text in git-bisect.txt. + + Documentation: reworded the "Description" section of git- + bisect.txt. + + Documentation: minor grammatical fixes in git-branch.txt. + + Documentation: minor grammatical fixes in git-blame.txt. + + Documentation: reword the "Description" section of git-bisect.txt. + + Documentation: minor grammatical fixes in git-archive.txt. + +* mg/test-installed (Mon Mar 16 18:03:12 2009 +0100) 2 commits + + test-lib.sh: Allow running the test suite against installed git + + test-lib.sh: Test for presence of git-init in the right path. + +* jc/attributes-checkout (Fri Mar 20 10:32:09 2009 +0100) 2 commits + + Add a test for checking whether gitattributes is honored by + checkout. + + Read attributes from the index that is being checked out + +Original issue identified, and test provided by Kristian Amlie. + +* fg/push-default (Mon Mar 16 16:42:52 2009 +0100) 2 commits + + Display warning for default git push with no push.default config + + New config push.default to decide default behavior for push + +* mg/http-auth (Wed Mar 18 18:46:41 2009 -0500) 6 commits + + http-push.c: use a faux remote to pass to http_init + + Do not name "repo" struct "remote" in push_http.c + + http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient + versions of cURL + + http authentication via prompts + + http_init(): Fix config file parsing + + http.c: style cleanups + +Amos King added push side support on top of my fetch side support. + +We may want to also pass --remote parameter from git-push to this backend +as Daniel did as an interim solution for the fetch side, so that we can +handle the configuration better. + +* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits + + Move push matching and reporting logic into transport.c + + Use a common function to get the pretty name of refs + +---------------------------------------------------------------- +[Will merge to 'master' soon] + +* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit + + stat_tracking_info(): only count real commits + +This gives the merge commits zero weight when talking about how many +commits you have ahead (or behind) of the branch you are tracking. Even +though I agree that they should carry much less weight than the "real" +commits, because your repeated merge from the other branch does not really +add any real value to the end result, giving them absolute zero weight +somehow feels wrong. At least it shows that your have been _active_ on the +branch. But I do not feel very strongly about it. + +* jc/maint-1.6.0-keep-pack (Sat Mar 21 17:26:11 2009 -0500) 6 commits + + pack-objects: don't loosen objects available in alternate or kept + packs + + t7700: demonstrate repack flaw which may loosen objects + unnecessarily + + Remove --kept-pack-only option and associated infrastructure + + pack-objects: only repack or loosen objects residing in "local" + packs + + git-repack.sh: don't use --kept-pack-only option to pack-objects + + t7700-repack: add two new tests demonstrating repacking flaws + +---------------------------------------------------------------- +[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. + +* 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' + +* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit + - archive.c: add support for --submodules[=(all|checkedout)] + +Discussion stalled on the submodule selection criteria. +Probably I should discard it and wait for a reroll if needed. + +* 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 (Sun Jan 11 15:12:10 2009 -0500) 3 commits + - Support fetching from foreign VCSes + - Add specification of git-vcs helpers + - Add "vcs" config option in remotes + +* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits + - 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 know, I really have to drop everything else and re-read these, but I +haven't managed to. + +* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits + - 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 (Wed Mar 18 18:33:41 2009 +0100) 7 commits + - 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 + +Two cvsimport test topics were rewound from 'next' and merged into this +one. I'll keep this in 'pu' so that people can polish their cvsps skilz +to resolve issues these tests identify. + +---------------------------------------------------------------- +[Actively cooking] + +* da/difftool (Tue Mar 24 23:29:59 2009 -0700) 5 commits + - difftool: add a -y shortcut for --no-prompt + - difftool: use perl built-ins when testing for msys + - difftool: add various git-difftool tests + - difftool: add git-difftool to the list of commands + + difftool: move 'git-difftool' out of contrib + +David has further refactoring which was a bit too early for me to pick +up. + +---------------------------------------------------------------- +[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. diff --git a/whats/in/2009/03/06.txt b/whats/in/2009/03/06.txt new file mode 100644 index 0000000000..2a2193c1a5 --- /dev/null +++ b/whats/in/2009/03/06.txt @@ -0,0 +1,381 @@ +To: git@vger.kernel.org +Subject: What's in git.git (Mar 2009, #06; Mon, 30) +X-maint-at: 8c7f78823888306c1cceafcf5fd26739eef99ce3 +X-master-at: 442dd42d6d4903640b0dc5561481a77c88dcea90 +X-maint-was: a54a216098db10d551d33123f33667ce8a036510 +X-master-was: bba2a7b22fdde7a214516e93d957a950571a2026 + +What's in git.git (Mar 2009, #06; Mon, 30) + + maint 8c7f788 (Update draft release notes to 1.6.2.2) + master 442dd42 (Merge branch 'maint') +------------------------------------------------------------------------ + +Many small updates on the 'master' front. I think we can declare feature +freeze for 1.6.3 in about a week, tag -rc0, and keep topics that are still +in 'pu' cooking for 1.6.4 (there are some good ones). + +* The 'maint' branch has these fixes since the last announcement. + +Allan Caffee (1): + Documentation: update graph api example. + +Carlo Marcelo Arenas Belon (1): + documentation: update cvsimport description of "-r" for recent clone + +Daniel Barkalow (1): + Give error when no remote is configured + +Daniel Cheng (aka SDiZ) (1): + Fix bash completion in path with spaces + +David Aguilar (1): + everyday: use the dashless form of git-init + +Emil Sit (1): + test-lib: Clean up comments and Makefile. + +Eric Wong (1): + git-svn: fix ls-tree usage with dash-prefixed paths + +Jeff King (2): + doc: clarify how -S works + ls-files: require worktree when --deleted is given + +Johannes Schindelin (2): + rsync transport: allow local paths, and fix tests + import-zips: fix thinko + +Johannes Sixt (1): + diff --no-index: Do not generate patch output if other output is + requested + +Junio C Hamano (5): + read-tree A B C: do not create a bogus index and do not segfault + GIT 1.6.2.1 + Remove total confusion from git-fetch and git-push + Update draft release notes to 1.6.2.2 + Update draft release notes to 1.6.2.2 + +Linus Torvalds (1): + close_sha1_file(): make it easier to diagnose errors + +Michael J Gruber (2): + git submodule: Add test cases for git submodule add + git submodule: Fix adding of submodules at paths with ./, .. and // + +Nico -telmich- Schottelius (1): + git-tag(1): add hint about commit messages + +Nicolas Pitre (1): + avoid possible overflow in delta size filtering computation + +René Scharfe (3): + diffcore-pickaxe: use memmem() + optimize compat/ memmem() + pickaxe: count regex matches only once + +Shawn O. Pearce (1): + Increase the size of the die/warning buffer to avoid truncation + +Stephen Boyd (1): + format-patch: --numbered-files and --stdout aren't mutually exclusive + +Thomas Rast (3): + send-email: respect in-reply-to regardless of threading + send-email: test --no-thread --in-reply-to combination + bash completion: only show 'log --merge' if merging + + +* The 'master' branch has these since the last announcement + in addition to the above. + +Alex Riesen (4): + disable post-checkout test on Cygwin + Produce a nicer output in case of sha1_object_info failures in ls-tree -l + Microoptimize strbuf_cmp + Improve error message about fetch into current branch + +Amos King (2): + Do not name "repo" struct "remote" in push_http.c + http-push.c: use a faux remote to pass to http_init + +Arto Jonsson (1): + bash completion: add options for 'git fsck' + +Ben Walton (7): + configure: ensure settings from user are also usable in the script + configure: reorganize flow of argument checks + configure: add macros to stash FLAG variables + configure: wrap some library tests with GIT_STASH_FLAGS + configure: asciidoc version test cleanup + configure: make iconv tests aware of user arguments + configure: rework pthread handling to allow for user defined flags + +Benjamin Kramer (1): + Fix various dead stores found by the clang static analyzer + +Brandon Casey (2): + git-branch: display "was sha1" on branch deletion rather than just "sha1" + builtin-send-pack.c: avoid empty structure initialization + +Brian Gernhardt (2): + Create USE_ST_TIMESPEC and turn it on for Darwin + Makefile: Set compiler switch for USE_NSEC + +Carlos Rica (1): + config: test for --replace-all with one argument and fix documentation. + +Chris Johnsen (2): + git-push.txt: describe how to default to pushing only current branch + Documentation: remove extra quoting/emphasis around literal texts + +Daniel Barkalow (7): + Make clone parse the default refspec with the normal code + Use a single function to match names against patterns + Use the matching function to generate the match results + Keep '*' in pattern refspecs + Support '*' in the middle of a refspec + Use a common function to get the pretty name of refs + Move push matching and reporting logic into transport.c + +David J. Mellor (12): + Documentation: minor grammatical fixes in git-archive.txt. + Documentation: reword the "Description" section of git-bisect.txt. + Documentation: minor grammatical fixes in git-blame.txt. + Documentation: minor grammatical fixes in git-branch.txt. + Documentation: reworded the "Description" section of git-bisect.txt. + Documentation: reword example text in git-bisect.txt. + Documentation: remove some uses of the passive voice in git-bisect.txt + Documentation: minor grammatical fixes and rewording in git-bundle.txt + Documentation: minor grammatical fixes in git-cat-file.txt + Documentation: minor grammatical fixes in git-check-attr.txt + Documentation: minor grammatical fix in git-check-ref-format.txt + Documentation: Remove spurious uses of "you" in git-bisect.txt. + +Elijah Newren (3): + git-filter-branch: avoid collisions with variables in eval'ed commands + Correct missing SP characters in grammar comment at top of fast-import.c + fast-export: Avoid dropping files from commits + +Emil Sit (1): + config.txt: Describe special 'none' handling in core.gitProxy. + +Eric Wong (1): + git-svn: fix ls-tree usage with dash-prefixed paths + +Felipe Contreras (8): + git_config(): not having a per-repo config file is not an error + git config: trivial rename in preparation for parseopt + git config: reorganize get_color* + git config: reorganize to use parseopt + git config: don't allow multiple config file locations + git config: don't allow multiple variable types + git config: don't allow extra arguments for -e or -l. + git config: don't allow --get-color* and variable type + +Finn Arne Gangstad (2): + New config push.default to decide default behavior for push + Display warning for default git push with no push.default config + +Giuseppe Bilotta (1): + import-tars: separate author from committer + +Heiko Voigt (1): + Add warning about known issues to documentation of cvsimport + +Janos Laube (1): + MinGW: implement mmap + +Jay Soffian (20): + move duplicated get_local_heads() to remote.c + move duplicated ref_newer() to remote.c + move locate_head() to remote.c + remote: simplify guess_remote_head() + remote: make copy_ref() perform a deep copy + remote: let guess_remote_head() optionally return all matches + remote: make match_refs() copy src ref before assigning to peer_ref + remote: make match_refs() not short-circuit + string-list: new for_each_string_list() function + builtin-remote: refactor duplicated cleanup code + builtin-remote: remove unused code in get_ref_states + builtin-remote: rename variables and eliminate redundant function call + builtin-remote: make get_remote_ref_states() always populate + states.tracked + builtin-remote: fix two inconsistencies in the output of "show " + builtin-remote: teach show to display remote HEAD + builtin-remote: add set-head subcommand + builtin-remote: new show output style + builtin-remote: new show output style for push refspecs + send-email: refactor and ensure prompting doesn't loop forever + send-email: add tests for refactored prompting + +Jeff King (12): + test scripts: refactor start_httpd helper + add basic http clone/fetch tests + refactor find_ref_by_name() to accept const list + remote: make guess_remote_head() use exact HEAD lookup if it is available + config: set help text for --bool-or-int + t3000: use test_cmp instead of diff + ls-files: fix broken --no-empty-directory + ls-files: require worktree when --deleted is given + make oneline reflog dates more consistent with multiline format + remote: improve sorting of "configure for git push" list + Makefile: turn on USE_ST_TIMESPEC for FreeBSD + t0060: fix whitespace in "wc -c" invocation + +Jens Lehmann (1): + githooks documentation: post-checkout hook is also called after clone + +Johannes Schindelin (7): + Turn the flags in struct dir_struct into a single variable + rebase -i: avoid 'git reset' when possible + winansi: support ESC [ K (erase in line) + gc --aggressive: make it really aggressive + t7300: fix clean up on Windows + Smudge the files fed to external diff and textconv + Guard a few Makefile variables against user environments + +Johannes Sixt (30): + recv_sideband: Bands #2 and #3 always go to stderr + t9400, t9401: Do not force hard-linked clone + test suite: Use 'say' to say something instead of 'test_expect_success' + Call 'say' outside test_expect_success + test-lib: Replace uses of $(expr ...) by POSIX shell features. + test-lib: Simplify test counting. + test-lib: Introduce test_chmod and use it instead of update-index --chmod + t2200, t7004: Avoid glob pattern that also matches files + t5300, t5302, t5303: Do not use /dev/zero + t5602: Work around path mangling on MSYS + test-lib: Work around incompatible sort and find on Windows + test-lib: Work around missing sum on Windows + Tests on Windows: $(pwd) must return Windows-style paths + t0050: Check whether git init detected symbolic link support correctly + test-lib: Infrastructure to test and check for prerequisites + Propagate --exec-path setting to external commands via GIT_EXEC_PATH + t3600: Use test prerequisite tags + Skip tests that fail if the executable bit is not handled by the + filesystem + t5302: Use prerequisite tags to skip 64-bit offset tests + t9100, t9129: Use prerequisite tags for UTF-8 tests + Use prerequisite tags to skip tests that depend on symbolic links + t0060: Fix tests on Windows + Skip tests that require a filesystem that obeys POSIX permissions + t3700: Skip a test with backslashes in pathspec + Use prerequisites to skip tests that need unzip + t7004: Use prerequisite tags to skip tests that need gpg + t5503: GIT_DEBUG_SEND_PACK is not supported on MinGW + MinGW: Quote arguments for subprocesses that contain a single-quote + t7005-editor: Use $SHELL_PATH in the editor scripts + t7502-commit: Skip SIGTERM test on Windows + +Junio C Hamano (15): + Make git-clone respect branch.autosetuprebase + builtin-remote.c: no "commented out" code, please + Not all systems use st_[cm]tim field for ns resolution file timestamp + grep: cast printf %.*s "precision" argument explicitly to int + http.c: style cleanups + Improve "git branch --tracking" output + http_init(): Fix config file parsing + http authentication via prompts + http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of + cURL + Read attributes from the index that is being checked out + Update draft release notes to 1.6.3 + blame: read custom grafts given by -S before calling setup_revisions() + http tests: Darwin is not that special + diff --cached: do not borrow from a work tree when a path is marked as + assume-unchanged + Update draft release notes to 1.6.3 + +Kevin Ballard (1): + builtin-push.c: Fix typo: "anythig" -> "anything" + +Kevin McConnell (1): + Add --staged to bash completion for git diff + +Kjetil Barvik (17): + lstat_cache(): small cleanup and optimisation + lstat_cache(): generalise longest_match_lstat_cache() + lstat_cache(): swap func(length, string) into func(string, length) + unlink_entry(): introduce schedule_dir_for_removal() + create_directories(): remove some memcpy() and strchr() calls + write_entry(): cleanup of some duplicated code + write_entry(): use fstat() instead of lstat() when file is open + show_patch_diff(): remove a call to fstat() + lstat_cache(): print a warning if doing ping-pong between cache types + check_updates(): effective removal of cache entries marked CE_REMOVE + fix compile error when USE_NSEC is defined + make USE_NSEC work as expected + verify_uptodate(): add ce_uptodate(ce) test + write_index(): update index_state->timestamp after flushing to disk + Record ns-timestamps if possible, but do not use it without USE_NSEC + checkout bugfix: use stat.mtime instead of stat.ctime in two places + Revert "lstat_cache(): print a warning if doing ping-pong between cache + types" + +Kristian Amlie (1): + Add a test for checking whether gitattributes is honored by checkout. + +Michael J Gruber (3): + test-lib.sh: Test for presence of git-init in the right path. + test-lib.sh: Allow running the test suite against installed git + git-branch.txt: document -f correctly + +Michele Ballabio (6): + apply: consistent spelling of "don't" + apply: hide unused options from short help + git log: avoid segfault with --all-match + document --force-rebase + rebase: add options passed to git-am + rebase: fix typo (force_rebas -> force-rebas) + +Miklos Vajna (11): + parse-opt: migrate builtin-ls-files. + Tests: use test_cmp instead of diff where possible + http-push: using error() and warning() as appropriate + builtin-apply: use warning() instead of fprintf(stderr, "warning: ") + builtin-checkout: use warning() instead of fprintf(stderr, "warning: ") + builtin-fetch-pack: use warning() instead of fprintf(stderr, "warning: ") + builtin-init-db: use warning() instead of fprintf(stderr, "warning: ") + builtin-rm: use warning() instead of fprintf(stderr, "warning: ") + builtin-show-branch: use warning() instead of fprintf(stderr, "warning: + ") + builtin-show-ref: use warning() instead of fprintf(stderr, "warning: ") + refs: use warning() instead of fprintf(stderr, "warning: ") + +Nate Case (1): + format-patch: Respect --quiet option + +Nguyễn Thái Ngọc Duy (1): + grep: prefer builtin over external one when coloring results + +Petr Kodl (2): + MinGW: a helper function that translates Win32 API error codes + MinGW: a hardlink implementation + +René Scharfe (6): + grep: micro-optimize hit collection for AND nodes + grep: remove grep_opt argument from match_expr_eval() + grep: add pmatch and eflags arguments to match_one_pattern() + grep: color patterns in output + grep: add support for coloring with external greps + pickaxe: count regex matches only once + +Santi Béjar (2): + Documentation: enhance branch..{remote,merge} + Documentation: push.default applies to all remotes + +Simon Arlott (1): + git-svn: don't output git commits in quiet mode + +Stephen Boyd (4): + git-send-email.txt: describe --compose better + completion: add --annotate option to send-email + completion: add --cc and --no-attachment option to format-patch + completion: add --thread=deep/shallow to format-patch + +Wincent Colaiuta (2): + Grammar fixes to "merge" and "patch-id" docs + Grammar fix for "git merge" man page +