# What's in git.git (stable) 3 messages from 2007-03-31 to 2007-04-05. Participants: Junio C Hamano, Alex Riesen. Thread: https://gitlist.dev/t/7487 ## Junio C Hamano, 2007-03-31 09:34 Subject: What's in git.git (stable) Message-ID: <7v1wj5ycx5.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v1wj5ycx5.fsf%40assigned-by-dhcp.cox.net ``` As you can see, there are a few more fixes on the 'maint' branch since 1.5.0.6; I might do 1.5.0.7 just for the sake of it, but I am fairly determined to tag 1.5.1 on Apr 4th in a shape that is "no worse" than 1.5.0, so it might not be strictly necessary. If you can remind me of patches that are "must have"s for 1.5.1 that I've missed, that would be very nice. We've broken "git am" and "git rebase" (without --merge) on 'master' branch for people who has i18n contents after 1.5.0 but they should be fixed now. Please, remember that the key word for this weekend is "make 1.5.1 NO WORSE than 1.5.0". IOW, the focus is on obvious regression fixes. ---------------------------------------------------------------- * The 'maint' branch has these fixes since the last announcement. Gerrit Pape (2): Documentation/git-svnimport.txt: fix typo. Documentation/git-rev-parse.txt: fix example in SPECIFYING RANGES. H. Peter Anvin (1): git-upload-pack: make sure we close unused pipe ends * The 'master' branch has these since the last announcement in addition to the above. Andy Parkins (1): Reimplement emailing part of hooks--update in contrib/hooks/post-receive-email Christian Couder (1): Bisect: Improve error message in "bisect_next_check". Don Zickus (1): git-mailinfo fixes for patch munging Eric Wong (1): git-svn: avoid respewing similar error messages for missing paths Francis Daly (1): git-quiltimport /bin/sh-ism fix Jakub Narebski (1): gitweb: Support comparing blobs (files) with different names Julian Phillips (1): contrib/workdir: add a simple script to create a working directory Junio C Hamano (2): Update draft release notes for 1.5.1 Do not bother documenting fetch--tool Theodore Ts'o (12): Fix minor formatting issue in man page for git-mergetool mergetool: Replace use of "echo -n" with printf(1) to be more portable mergetool: Don't error out in the merge case where the local file is deleted mergetool: portability fix: don't assume true is in /bin mergetool: portability fix: don't use reserved word function mergetool: factor out common code mergetool: Remove spurious error message if merge.tool config option not set mergetool: Fix abort command when resolving symlinks and deleted files mergetool: Add support for Apple Mac OS X's opendiff command mergetool: Make git-rm quiet when resolving a deleted file conflict mergetool: Clean up description of files and prompts for merge resolutions Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS ``` ## Alex Riesen, 2007-03-31 11:54 Subject: Re: What's in git.git (stable) Message-ID: <20070331115458.GC4377@steel.home> URL: https://gitlist.dev/e/20070331115458.GC4377%40steel.home In-Reply-To: <7v1wj5ycx5.fsf@assigned-by-dhcp.cox.net> ``` Junio C Hamano, Sat, Mar 31, 2007 11:34:14 +0200: > > If you can remind me of patches that are "must have"s for 1.5.1 > that I've missed, that would be very nice. We've broken "git > am" and "git rebase" (without --merge) on 'master' branch for > people who has i18n contents after 1.5.0 but they should be > fixed now. We still have absolutely broken merge-recursive WRT rename/rename conflicts in intermediate trees. > Please, remember that the key word for this weekend is "make > 1.5.1 NO WORSE than 1.5.0". IOW, the focus is on obvious > regression fixes. It is "no worse", but doesn't "pretty bad" count? ``` ## Junio C Hamano, 2007-04-05 06:44 Subject: What's in git.git (stable) Message-ID: <7vejmzuxpr.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vejmzuxpr.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <7v1wj5ycx5.fsf@assigned-by-dhcp.cox.net> ``` So here is the status for tonight. * There is no biggie in 'maint' yet. * On 'master', as I promised, the following topics are merged: - An option to install p4import, and make it part of the RPM binary package suite. - An option to exclude git-gui and gitk. - Build tweak to include GIT_VERSION string in the documentation. - Optimize "add single-path" in a huge directory whose contents are mostly ignored. - Optimize "rev-list --bisect". - A handful gitweb, git-svn and git-blame.el cleanups. In addition, a few patches are also in: - "diff --stat" to show bytesize changes for binary files. - "lost-found" to ignore objects only reachable from the reflog. - "patch -p" is honored even for "diff --git" patches. - A handful internal clean-ups. ---------------------------------------------------------------- * The 'maint' branch has these fixes since v1.5.1 Brian Gernhardt (1): Fix t4200-rerere for white-space from "wc -l" Gerrit Pape (1): rename contrib/hooks/post-receieve-email to contrib/hooks/post-receive-email. Junio C Hamano (1): rerere: make sorting really stable. * The 'master' branch has these since v1.5.1 in addition to the above. Andy Parkins (1): Show binary file size change in diff --stat Brian Gernhardt (1): Remove unused WITH_OWN_SUBPROCESS_PY from RPM spec Eric Wong (1): git-svn: bail out on incorrect command-line options Eygene Ryabinkin (7): Add the WITH_P4IMPORT knob to the Makefile. Added git-p4 package to the list of git RPMs. Added correct Python path to the RPM specfile. NO_TCLTK Add --with-tcltk and --without-tcltk to configure. Rewrite Tcl/Tk interpreter path for the GUI tools. Eliminate checks of user-specified Tcl/Tk interpreter. Frank Lichtenheld (2): Documentation: Replace @@GIT_VERSION@@ in documentation Documentation: Add version information to man pages Jakub Narebski (2): gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (3) gitweb: Quote hash keys, and do not use barewords keys Junio C Hamano (14): t6002: minor spelling fix. git-rev-list: add --bisect-vars option. git-rev-list --bisect: optimization t6004: add a bit more path optimization test. rev-list --bisect: Fix "halfway" optimization. make the previous optimization work also on path-limited rev-list --bisect Documentation: unbreak user-manual. Optional Tck/Tk: ignore generated files. RPM spec: include git-p4 in the list of all packages. Fix bogus error message from merge-recursive error path Propagate cache error internal to refresh_cache() via parameter. Rename internal function "add_file_to_cache" in builtin-update-index.c Rename static variable write_index to update_index in builtin-apply.c Rename add_file_to_index() to add_file_to_cache() Linus Torvalds (1): Optimize directory listing with pathspec limiter. Nicolas Pitre (1): clean up and optimize nth_packed_object_sha1() usage Shawn O. Pearce (2): Fix lost-found to show commits only referenced by reflogs Honor -p when applying git diffs Xavier Maillard (2): git-blame.el: separate git-blame-mode to ease maintenance git-blame.el: pick a set of random colors for each git-blame turn ```