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 integration branches, but I am still holding onto them. I'll be packing my primary machine tomorrow morning, and hopefully I can resume my git activity early next week. This will be the last pushout until then. -------------------------------------------------- [New Topics] * bw/diff-metainfo-color (2010-05-04) 1 commit - [sign-off?] diff: fix coloring of extended diff headers * ph/clone-message-reword (2010-05-09) 1 commit - clone: reword messages to match the end-user perception * rc/ls-remote-default (2010-05-12) 1 commit - ls-remote: print URL when no repo is specified * fg/autocrlf (2010-05-12) 1 commit - autocrlf: Make it work also for un-normalized repositories * tc/merge-m-log (2010-05-11) 8 commits - merge: --log appends shortlog to message if specified - fmt-merge-msg: add function to append shortlog only - fmt-merge-msg: refactor merge title formatting - fmt-merge-msg: minor refactor of fmt_merge_msg() - merge: rename variable - merge: update comment - t7604-merge-custom-message: show that --log doesn't append to -m - t7604-merge-custom-message: shift expected output creation -------------------------------------------------- [Stalled] * jc/rev-list-ancestry-path (2010-04-20) 1 commit - revision: --ancestry-path Just an illustration patch. merge simplification logic used when pathspecs are in effect interacts with this rather badly. * js/rebase-origin-x (2010-02-05) 1 commit - [RFC w/o test and incomplete] rebase: add -x option to record original commit name I retract my objection against the idea of -x; needs polishing before moving forward. * js/grep-open (2010-05-01) 3 commits - grep: do not ignore return value from chdir() - grep -O: allow optional argument specifying the pager (or editor) - grep: Add the option '--open-files-in-pager' (this branch is used by jp/hold-string-list-sanity.) Probably needs to support --no-index mode as well. * jp/hold-string-list-sanity (2010-04-06) 9 commits . string_list: Fix argument order for string_list_append . Merge branch 'sr/remote-helper-export' into HEAD . Merge branch 'js/grep-open' into HEAD . Merge branch 'sb/fmt-merge-msg' into HEAD . string_list: Fix argument order for string_list_lookup . string_list: Fix argument order for string_list_insert_at_index . string_list: Fix argument order for string_list_insert . string_list: Fix argument order for for_each_string_list . string_list: Fix argument order for print_string_list (this branch uses js/grep-open and sr/remote-helper-export.) Building this on top of slushy codebase is not a very promising endeavor. Good thing to do, but it came at a bad time. -------------------------------------------------- [Cooking] * jn/gitweb-fastcgi (2010-05-07) 5 commits - gitweb: Add support for FastCGI, using CGI::Fast - gitweb: Put all per-connection code in run() subroutine + gitweb: Use nonlocal jump instead of 'exit' in die_error + gitweb: href(..., -path_info => 0|1) + Export more test-related variables when running external tests (this branch shares commits with jn/gitweb-caching-prep.) * jn/make-header-dependency (2010-05-08) 2 commits - Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES - Makefile: fix header dependency checker to allow NO_CURL builds * js/try-to-free-stackable (2010-05-08) 2 commits - Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used - Have set_try_to_free_routine return the previous routine (this branch uses np/malloc-threading.) Should be Ok for 'next'. * jn/gitweb-syntax-highlight (2010-04-27) 2 commits - gitweb: Refactor syntax highlighting support - gitweb: Syntax highlighting support * jn/maint-amend-missing-name (2010-05-02) 1 commit (merged to 'next' on 2010-05-09 at 9023332) + commit --amend: cope with missing display name * rs/diff-no-minimal (2010-05-02) 1 commit (merged to 'next' on 2010-05-09 at 6c74aa0) + git diff too slow for a file * ab/test-cleanup (2010-05-07) 2 commits - Turn setup code in t2007-checkout-symlink.sh into a test - Move t6000lib.sh to lib-* Should be Ok for 'next'. * by/blame-doc-m-c (2010-05-06) 1 commit (merged to 'next' on 2010-05-09 at c975ad5) + blame-options.txt: Add default value for `-M/-C` options. * by/log-follow (2010-05-10) 4 commits (merged to 'next' on 2010-05-10 at f4ce9f8) + tests: rename duplicate t4205 (merged to 'next' on 2010-05-09 at d97e924) + Make git log --follow find copies among unmodified files. + Make diffcore_std only can run once before a diff_flush + Add a macro DIFF_QUEUE_CLEAR. * jn/notes-doc (2010-05-08) 8 commits - Documentation/notes: nitpicks - Documentation/notes: clean up description of rewriting configuration - Documentation/notes: simplify treatment of default display refs - Documentation/log: add a CONFIGURATION section - Documentation/notes: simplify treatment of default notes ref - Documentation/notes: add configuration section - Documentation/notes: describe content of notes blobs - Documentation/notes: document format of notes trees * mg/advice-statushints (2010-04-22) 2 commits (merged to 'next' on 2010-05-09 at 4642509) + wt-status: take advice.statusHints seriously + t7508: test advice.statusHints * cb/maint-stash-orphaned-file (2010-04-18) 2 commits (merged to 'next' on 2010-05-04 at 38488ba) + stash tests: stash can lose data in a file removed from the index + stash: Don't overwrite files that have gone from the index (has been in 'next' since 2010-04-22) * jn/maint-bundle (2010-04-19) 2 commits (merged to 'next' on 2010-05-04 at f2086f5) + fix "bundle --stdin" segfault + t5704 (bundle): add tests for bundle --stdin (has been in 'next' since 2010-04-22) * pb/patch-id-plus (2010-04-19) 2 commits (merged to 'next' on 2010-05-04 at 59881b8) + patch-id: Add support for mbox format + patch-id: extract parsing one diff out of generate_id_list (has been in 'next' since 2010-04-22) * rr/doc-submitting (2010-04-19) 1 commit (merged to 'next' on 2010-05-04 at 5f040bd) + SubmittingPatches: Add new section about what to base work on (has been in 'next' since 2010-04-22) * st/remote-tags-no-tags (2010-04-20) 2 commits (merged to 'next' on 2010-05-09 at fa9e04e) + remote add: add a --[no-]tags option + Honor "tagopt = --tags" configuration option * cb/assume-unchanged-fix (2010-05-01) 2 commits - Documentation: git-add does not update files marked "assume unchanged" - do not overwrite files marked "assume unchanged" * jn/fsck-ident (2010-04-24) 1 commit (merged to 'next' on 2010-05-09 at 0d36355) + fsck: check ident lines in commit objects There also was a companion patch to fast-import to deal with foreign SCM interface that may not have human-readable author identifier. * jn/gitweb-caching-prep (2010-04-24) 5 commits (merged to 'next' on 2010-05-09 at ceb4dad) + gitweb: Move generating page title to separate subroutine + gitweb: Add custom error handler using die_error + gitweb: Use nonlocal jump instead of 'exit' in die_error + gitweb: href(..., -path_info => 0|1) + Export more test-related variables when running external tests (this branch shares commits with jn/gitweb-fastcgi.) * jn/gitweb-install (2010-05-01) 2 commits (merged to 'next' on 2010-05-09 at 9ea6cad) + gitweb: Create install target for gitweb in Makefile + gitweb: Improve installation instructions in gitweb/INSTALL * jn/gitweb-our-squelch (2010-04-30) 1 commit (merged to 'next' on 2010-05-09 at 060726a) + gitweb: Silence 'Variable VAR may be unavailable' warnings * jn/maint-request-pull (2010-05-07) 3 commits + t5150: protect backslash with backslash in shell + request-pull: protect against OPTIONS_KEEPDASHDASH from environment + tests for request-pull (this branch is used by jn/request-pull.) * jn/request-pull (2010-05-10) 3 commits (merged to 'next' on 2010-05-10 at fcae760) + tests: chmod +x t5150 (merged to 'next' on 2010-05-09 at 05aadd6) + adapt request-pull tests for new pull request format + Merge branch 'jn/maint-request-pull' into jn/request-pull (this branch uses jn/maint-request-pull.) * jn/shortlog (2010-05-03) 5 commits (merged to 'next' on 2010-05-09 at efd1311) + pretty: Respect --abbrev option + shortlog: Document and test --format option + t4201 (shortlog): Test output format with multiple authors + t4201 (shortlog): guard setup with test_expect_success + Documentation/shortlog: scripted users should not rely on implicit HEAD * wp/pretty-enhancement (2010-05-08) 4 commits (merged to 'next' on 2010-05-09 at eeaa4dc) + pretty: initialize new cmt_fmt_map to 0 + pretty: add aliases for pretty formats + pretty: add infrastructure for commit format aliases + pretty: make it easier to add new formats * jn/t7006-fixup (2010-04-14) 1 commit (merged to 'next' on 2010-05-04 at 490ab5d) + t7006: guard cleanup with test_expect_success (has been in 'next' since 2010-04-22) * js/maint-receive-pack-symref-alias (2010-04-19) 3 commits (merged to 'next' on 2010-05-04 at 259f4f1) + t5516-fetch-push.sh: style cleanup + receive-pack: detect aliased updates which can occur with symrefs + receive-pack: switch global variable 'commands' to a parameter (has been in 'next' since 2010-04-22) * sp/maint-dumb-http-pack-reidx (2010-04-19) 12 commits (merged to 'next' on 2010-05-04 at 166443a) + http.c::new_http_pack_request: do away with the temp variable filename + http-fetch: Use temporary files for pack-*.idx until verified + http-fetch: Use index-pack rather than verify-pack to check packs + Allow parse_pack_index on temporary files + Extract verify_pack_index for reuse from verify_pack + Introduce close_pack_index to permit replacement + http.c: Remove unnecessary strdup of sha1_to_hex result + http.c: Don't store destination name in request structures + http.c: Drop useless != NULL test in finish_http_pack_request + http.c: Tiny refactoring of finish_http_pack_request + t5550-http-fetch: Use subshell for repository operations + http.c: Remove bad free of static block (has been in 'next' since 2010-04-22) * hg/id-munging (2010-04-06) 2 commits - convert: Keep foreign $Id$ on checkout. - convert: Safer handling of $Id$ contraction. * jn/submodule-basic-test (2010-04-10) 3 commits (merged to 'next' on 2010-05-04 at 0bec27a) + t7400: clarify submodule update tests + t7400: clarify 'submodule add' tests + t7400: split setup into multiple tests (has been in 'next' since 2010-04-22) * np/index-pack-memsave (2010-04-12) 3 commits (merged to 'next' on 2010-05-04 at 366b014) + index-pack: smarter memory usage when appending objects + index-pack: rationalize unpack_entry_data() + index-pack: smarter memory usage when resolving deltas (has been in 'next' since 2010-04-22) * jc/am-3-show-corrupted-patch (2010-04-09) 1 commit (merged to 'next' on 2010-05-04 at 951f0e6) + am -3: recover the diagnostic messages for corrupt patches (has been in 'next' since 2010-04-22) * jc/maint-no-reflog-expire-unreach-for-head (2010-04-09) 3 commits (merged to 'next' on 2010-05-04 at d23a180) + reflog --expire-unreachable: special case entries in "HEAD" reflog + more war on "sleep" in tests + Document gc.<pattern>.reflogexpire variables (has been in 'next' since 2010-04-22) * cw/maint-exec-defpath (2010-04-15) 2 commits (merged to 'next' on 2010-05-04 at 8d1591f) + autoconf: Check if <paths.h> exists and set HAVE_PATHS_H + exec_cmd.c: replace hard-coded path list with one from <paths.h> (has been in 'next' since 2010-04-22) * tr/word-diff (2010-04-14) 1 commit (merged to 'next' on 2010-05-04 at d191b25) + diff: add --word-diff option that generalizes --color-words (has been in 'next' since 2010-04-22) There are gitk patches that go with this series. * sp/maint-describe-tiebreak-with-tagger-date (2010-04-12) 5 commits (merged to 'next' on 2010-05-04 at af2d605) + describe: Break annotated tag ties by tagger date + tag.c: Parse tagger date (if present) + tag.c: Refactor parse_tag_buffer to be saner to program + tag.h: Remove unused signature field + tag.c: Correct indentation (has been in 'next' since 2010-04-22) * jc/status-show-ignored (2010-05-01) 6 commits (merged to 'next' on 2010-05-04 at 8b32120) + wt-status: fix 'fprintf' compilation warning + status: --ignored option shows ignored files + wt-status: rename and restructure status-print-untracked + wt-status: collect ignored files + wt-status: plug memory leak while collecting untracked files + wt-status: remove unused workdir_untracked member (has been in 'next' since 2010-05-01) I am negative about conflating the JSON output to the mix at this point. Let's stabilize "status" with the existing --porcelain/-z option first. * np/malloc-threading (2010-04-08) 2 commits (merged to 'next' on 2010-05-04 at 1b0567f) + Thread-safe xmalloc and xrealloc needs a recursive mutex + Make xmalloc and xrealloc thread-safe (this branch is used by js/try-to-free-stackable.) (has been in 'next' since 2010-04-10) The fix should eventually go to 'maint' and 'master'. * js/async-thread (2010-03-09) 7 commits - Enable threaded async procedures whenever pthreads is available (merged to 'next' on 2010-05-04 at 2644e74) + Dying in an async procedure should only exit the thread, not the process. + Reimplement async procedures using pthreads + Windows: more pthreads functions + Fix signature of fcntl() compatibility dummy + Make report() from usage.c public as vreportf() and use it. + Modernize t5530-upload-pack-error. (all except for the tip has been in 'next' since 2010-03-20). * sr/remote-helper-export (2010-04-12) 9 commits (merged to 'next' on 2010-05-04 at 519ab16) + t5800: testgit helper requires Python support + Makefile: Simplify handling of python scripts + remote-helpers: add tests for testgit helper + remote-helpers: add testgit helper + remote-helpers: add support for an export command + remote-helpers: allow requesing the path to the .git directory + fast-import: always create marks_file directories + clone: also configure url for bare clones + clone: pass the remote name to remote_get (this branch is used by jp/hold-string-list-sanity.) (has been in 'next' since 2010-04-12) * ld/discovery-limit-to-fs (2010-04-04) 6 commits - write-index: check and warn when worktree crosses a filesystem boundary (merged to 'next' on 2010-05-04 at b7118ad) + Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM + GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries + Add support for GIT_ONE_FILESYSTEM + truncate cwd string before printing error message + config.c: remove static keyword from git_env_bool() (all except for the tip has been in 'next' since 2010-04-07) The tip one is a bit iffy. * em/checkout-orphan (2010-03-21) 1 commit (merged to 'next' on 2010-05-04 at ddb45fc) + git checkout: create unparented branch by --orphan (has been in 'next' since 2010-03-28) Perhaps needs a bit of documentation updates, describing the "going open source" scenario. * ar/config-from-command-line (2010-03-26) 2 commits (merged to 'next' on 2010-05-04 at 2962717) + Use strbufs instead of open-coded string manipulation + Allow passing of configuration parameters in the command line (has been in 'next' since 2010-04-07) ---------------------------------------------------------------- [Dropped] * eb/crlf (2010-05-08) 4 commits . Add per-repository eol normalization . Pass eol conv mode as an argument instead of using global auto_crlf . Add tests for per-repository eol normalization . Add "core.eolStyle" variable to control end-of-line conversion Perhaps will be rerolled after discussion settles. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html