{"thread":{"id":"4706","subject":"What's in git.git","startedAt":"2006-06-29T06:41:08Z","lastAt":"2006-06-29T06:41:08Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"22775","messageId":"7vpsgstqez.fsf@assigned-by-dhcp.cox.net","threadId":"4706","inReplyTo":null,"subject":"What's in git.git","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-06-29T06:41:08Z","receivedAt":"2006-06-29T06:41:08Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Hopefully 'master' which I tagged and pushed out as v1.4.1-rc2\nis very close to the final.  I would like to merge format-patch\nfixes by Johannes, see nobody yells at me for a few days, and\ncall it 1.4.1 this weekend.\n\nThanks to Pavel Roskin and Marco Roeland, the Perly Git series\nby Pasky should be in much better shape now.  Timo's diff output\nformat options updates is looking better and I am gaining\nconfidence in it, especially after I've done small testsuite and\nfixed things here and there.  I would want a bit more tests to\ncover wider combinations to avoid regression but basically it\nlooks ready.  These two series are still in \"pu\" and I'd like to\npull them into \"next\" after 1.4.1.\n\nA late comer is Linus's merge-tree/merge-files work.  I'm\nparking it on \"pu\" but haven't read it through yet.\n\n----------------------------------------------------------------\n\n* The 'master' branch has these since the last announcement.\n\n   Andreas Ericsson:\n      git wrapper: fix command name in an error message.\n\n   Dennis Stosberg:\n      Solaris needs inclusion of signal.h for signal()\n      Fix pkt-line.h to compile with a non-GCC compiler\n      Fix expr usage for FreeBSD\n\n   Eric Wong:\n      rebase: allow --merge option to handle patches merged upstream\n      rebase: cleanup rebasing with --merge\n      rebase: allow --skip to work with --merge\n      git-svn: SVN 1.1.x library compatibility\n      git-svn: several graft-branches improvements\n      git-svn: add the commit-diff command\n      git-svn: add --follow-parent and --no-metadata options to fetch\n      git-svn: be verbose by default on fetch/commit, add -q/--quiet option\n      rebase: get rid of outdated MRESOLVEMSG\n      rebase: check for errors from git-commit\n\n   Jeff King:\n      quote.c: silence compiler warnings from EMIT macro\n\n   Johannes Schindelin:\n      Teach diff about -b and -w flags\n      cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}\n      Save errno in handle_alias()\n\n   Junio C Hamano:\n      git-merge --squash\n      diff --color: use $GIT_DIR/config\n      combine-diff.c: type sanity\n      connect.c: remove unused parameters from tcp_connect and proxy_connect\n      connect.c: check the commit buffer boundary while parsing.\n      t/README: start testing porcelainish\n      checkout -m: fix read-tree invocation\n\n   Martin Langhoff:\n      cvsimport: setup indexes correctly for ancestors and incremental imports\n      cvsimport - cleanup of the multi-indexes handling\n\n   Matthias Lederhofer:\n      correct documentation for git grep\n\n   Timo Hirvonen:\n      Make some strings const\n\n\n* The 'next' branch, in addition, has these.\n\n   Johannes Schindelin:\n      add diff_flush_patch_id() to calculate the patch id\n      format-patch: introduce \"--ignore-if-in-upstream\"\n      t4014: fix for whitespace from \"wc -l\"\n      format-patch: use clear_commit_marks() instead of some ad-hockery\n\n   Junio C Hamano:\n      Makefile: add framework to verify and bench sha1 implementations.\n      test-sha1: test hashing large buffer\n      git-repack: Be careful when updating the same pack as an existing one.\n      t4013: add tests for diff/log family output options.\n      t4014: add format-patch --ignore-if-in-upstream test\n      t4013: add more tests around -c and --cc\n      t4014: fix test commit labels.\n      diff.c: fix get_patch_id()\n\n   Linus Torvalds:\n      xdiff: generate \"anti-diffs\" aka what is common to two files\n\n\n* The 'pu' branch, in addition, has these.\n\n   Dennis Stosberg:\n      \"test\" in Solaris' /bin/sh does not support -e\n      Makefile fix for Solaris\n      Add possibility to pass CFLAGS and LDFLAGS specific to the perl subdir\n\n   Junio C Hamano:\n      Fix some more diff options changes.\n      t4013 test updates for new output code.\n      combine-diff.c: type sanity.\n      Perl interface: add build-time configuration to allow building with -fPIC\n      Perl interface: make testsuite work again.\n      perl: fix make clean\n      Git.pm: tentative fix to test the freshly built Git.pm\n      Perly Git: arrange include path settings properly.\n      Makefile: Set USE_PIC on x86-64\n\n   Linus Torvalds:\n      Prepare \"git-merge-tree\" for future work\n      Improved three-way blob merging code\n\n   Matthias Lederhofer:\n      GIT_TRACE: show which built-in/external commands are executed\n\n   Petr Baudis:\n      Introduce Git.pm (v4)\n      Git.pm: Implement Git::exec_path()\n      Git.pm: Call external commands using execv_git_cmd()\n      Git.pm: Implement Git::version()\n      Add Error.pm to the distribution\n      Git.pm: Better error handling\n      Git.pm: Handle failed commands' output\n      Git.pm: Enhance the command_pipe() mechanism\n      Git.pm: Implement options for the command interface\n      Git.pm: Add support for subdirectories inside of working copies\n      Convert git-mv to use Git.pm\n      Git.pm: assorted build related fixes.\n      Git.pm: Try to support ActiveState output pipe\n      Git.pm: Swap hash_object() parameters\n      Git.pm: Fix Git->repository(\"/somewhere/totally/elsewhere\")\n      Git.pm: Support for perl/ being built by a different compiler\n\n   Timo Hirvonen:\n      Merge with_raw, with_stat and summary variables to output_format\n      Make --raw option available for all diff commands\n      Set default diff output format after parsing command line\n      DIFF_FORMAT_RAW is not default anymore\n      Add msg_sep to diff_options\n      Don't xcalloc() struct diffstat_t\n      whatchanged: Default to DIFF_FORMAT_RAW\n      Print empty line between raw, stat, summary and patch\n      diff-tree: Use ---\\n as a message separator\n      log --raw: Don't descend into subdirectories by default\n      Fix diff-tree -s\n      --name-only, --name-status, --check and -s are mutually exclusive\n      Remove awkward compatibility warts\n      Fix a mixed declarations and code warning\n\n   Unknown:\n      A better-scheduled PPC SHA-1 implementation.\n"}]}