Git

Guilt v0.29 is available for download (once it mirrors out on kernel.org). Guilt (Git Quilt) is a series of bash scripts which add a Mercurial queues-like functionality and interface to git. Tarballs: ... [More] http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/ Git repo: git://git.kernel.org/pub/scm/linux/kernel/git/jsipek/guilt.git This release is quite uneventful. It is made up of a few fixes here and there, and complete regression suite rewrite. Unfortunately, most of the exciting Guilt development went on in a topic branch, but the changes are far too invasive for me to include them in v0.29, so I'm going to merge that in for v0.30. As always, patches, and other feedback is welcome. Josef "Jeff" Sipek. ------------ Changes since v0.28: Josef 'Jeff' Sipek (20): repair: new command to repair repository state patchbomb: Git parses the patch mboxes and extracts Cc lines automatically push: fix whitespace handling regression: rewrote regression suite core regression: test 010: test the init code regression: test 011: test failure of commands on non-init'd repo regression: test 020: test push code regression: test 023: test top code regression: test 021: test pop code regression: test 060: test files code regression: test 022: test applied code regression: test 024: test unapplied code regression: test 025: test new code regression: test 026: test delete code regression: test 027: test refresh code push: output current patch name, not cmd-line argument Use 'git ' instead of 'git-cmd' header: fix patch name existence in the series regression: add tests for guilt-header Guilt v0.29 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

Hello, A new version of tig is available! It brings many documentation improvements, bug fixes, and some much needed updates to work better with git (e.g. by using --no-color and avoiding to use git-diff). On startup, tig will now attempt to first ... [More] read a system-wide configuration file before loading the user specific configuration file. Cherry picking from inside tig has been generalized, making it possible to wire external commands, which can access information about the current commit, to a keybinding. Among possible incompatible changes, option parsing has been changed to be more similar with gitk's by deprecating almost all tig options, so to startup in the status view use `tig status'! Building the documentation (sadly?) now depends on DocBook XSL 1.72 to reduce the number of accumulated AsciiDoc and XSL hacks. In the pipeline for the next release are improved rename support in the status view and encoding and drawing fixes from Dominik Vogt. The deprecated options will probably also go away, including the special handling of "--". What is tig? ------------ Tig is a ncurses-based text-mode interface for git. It functions mainly as a git repository browser, but can also act as a pager for output from various git commands. Homepage: http://jonas.nitro.dk/tig/ Manual: http://jonas.nitro.dk/tig/manual.html Tarballs: http://jonas.nitro.dk/tig/releases/ Gitfeed: git://repo.or.cz/tig.git Gitweb: http://repo.or.cz/w/tig.git Changes in this release ----------------------- Below is the diffstat and shortlog for changes made in this release. .gitignore | 5 - INSTALL | 12 - Makefile | 48 --- TODO | 10 VERSION | 2 - asciidoc.conf | 28 - config.make.in | 1 contrib/tig-completion.bash | 44 --- manpage.xsl | 55 ----- manual.txt | 65 -- tig.1.txt | 112 ---- tig.c | 470 ----------- tigrc.5.txt | 109 ---- 13 files changed, 620 insertions( ), 341 deletions(-) Dominik Vogt (8): Minor formatting and spelling fixes. Add documentation for undocumented color options. Added color option main-revgraph to color the revision graph. Added action tree-parent and bound it to backspace by default. Removed trailing whitespace. Updated .gitignore Added examples to tig(1) manpage Add system-wide configuration file and new config file environment vars James Bowes (1): Add missing = for comparison in obsolete actions check Jari Aalto (1): Makefile: add ASCIIDOC_FLAGS Jonas Fonseca (24): tig-0.10.git Unify REQ_NONE and REQ_UNKNOWN by moving REQ_NONE to be the last request Add support binding keys to running external commands Obsolete the cherry-pick action and define as builtin external command Improve sanity check error messages Collect remaining string in last entry when parsing config file lines Use get_key_name() in get_key() Fix crash when opening mergetool for lines that are not unmerged Rearrange the order of option parsing Use --no-color option when calling git-log and git-diff Avoid using git-diff since it might run external diff drivers manual: remove section on porcelains Ignore HTML files in general Install manpages in $(prefix)/share/man TODO: Mention tig.c splitting and revgraph rewrite Update manpages to not contain contain so many formatting workarounds INSTALL: Document the optional documentation tools Replace the manpage XSL workarounds with AsciiDoc conf workarounds Simplify documentation building and fix asciidoc.conf dependency Drop -B from diff options Add support for showing boundary commits in the main view Make it possible to overwrite the default (terminal) colors Make command line parsing more compatible with gitk tig-0.10 -- Jonas Fonseca -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

I have a nearly complete revision machinary implementation for jgit. The series follows on top of my pack index v2 work, which is in my master branch of repo.or.cz/egit/spearce.git. This series started because I found the History view was just too ... [More] slow for words. Running JProbe on Eclipse pointed out that our existing revision walking code was not up to the challenge of a real-world sized repository. Here goes a summary... series is here: git://repo.or.cz/egit/spearce.git revwalk Fixes and cleanups ------------------ * Correct unsigned integer conversion issues * Include refs/remotes as part of the ref search path * Only use bytes 1-5 for a SHA-1 ObjectId hashCode * Fix the OBJECT_ID_LENGTH constant at 20 * Hand unroll the ObjectId.equals method * Don't bother caching commits in the delta base cache * Teach FileMode how to return the proper instance of itself * Teach FileMode about S_IFGITLINK being 0160000 * Teach FileMode about MISSING being 0 These have nothing to do with the series directly, but were done to improve its code or fix some earlier bugs. Revision Machinary ------------------ * New revision walking library for jgit * Teach RevWalk about uninteresting commits * Document the flag constants used in RevWalk * Implement a commit filtering API for RevWalk * Make all RevFilter implementations cloneable * Allow RevFilters to break out of the main walk loop * Implement a commit time based RevFilter for before/after filtering * Refactor basic commit walking from RevWalk to a streamable iterator API * Evaluate RevFilters before inserting parent commits to pending * Dispose of a RevCommit as soon as it is no longer interesting * Use a FIFO queue of RevCommit during reset rather than sorting by date Aside from --topo-order this is a nearly full revision machinary. Features like --author, --committer, --grep, --not, all work. We don't parse "A..B" but we can do it as "A --not B", or "A ^B ^C D". The package's performance on Java 6/x86/Windows is well within spitting distance of Git on Cygwin. I'm seeing jgit take just over 50 ms longer to produce back ~13,000 commits. I'll get --topo-order done soon, most likely this weekend. It will probably also get an incremental restart trick like we do in C Git, where we shovel the data out as early as we can but signal a restart if topo order was violated. Memory can still be reduced a tad, but its fast as heck. Our main suckage for memory is the ObjectId class. On a modern HotSpot JVM it costs 44 bytes to store a 20 byte SHA-1. I think our second main suckage is the ObjectIdMap. java.util.HashMap is not that efficient when it comes to memory usage. Tree Diff --------- * New tree walking library for jgit * Implement a tree entry filtering API for TreeWalk * Define a path limiter for TreeWalk to reduce results Turns out the Tree class is too slow for serious work. This is a concurrent tree walker that can do an N-way difference of an arbitrary number of trees, recursively and shallow. We can also limit the difference to only entries matching a particular filter expression. I spent a good amount of time tuning this library, but it probably can still benefit from more micro-optimization. Java is just dog slow, but I think we're doing almost the best we can. At present this library only does tree objects, but it should also be able to walk the local filesystem and an index (or two or three) concurrently with trees. I'll implement those other iterators in the near future. Path Limiter & Parent Rewrites ------------------------------ * Implement path limited revision walking and parent rewriting * Allow revwalk and treewalk to directly access cached object data These changes give us functionality like "git log HEAD -- foo.c", where the DAG gets subsetted down to only those commits that had an interesting change against foo.c. Yes, it also works on directories and combinations of paths. I've done a bunch of manual testing and differencing against the C Git output for the same inputs, and jgit is producing identical results. That's with "--parents". So we can now get a dense, plottable subsetted DAG. Yay. When the path limiter is enabled we spend ~98% of our CPU time inside of the treewalk package introduced above for the tree difference feature. Its horribly slow. If the path we are looking for is early enough in the tree we're not too far off from C Git's performance, but try matching on say "t" and the world falls over. We are 4x slower. Fixes and cleanups ------------------ * Implement some basic command line programs built on top of jgit This a "jgit" command line wrapper, along with basic subcommand tools like "log", "rev-list", "ls-tree" and "diff-tree", all built on top of the above functionality. jgit is starting to feel like it is actually capable of doing some of the major functions C Git does. "jgit log | less" has a slight lag before the first commit when compared to "git log", but is still faster than "svn log". ;- -- Shawn. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest maintenance release GIT 1.5.4.4 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.5.4.4.tar.{gz,bz2} (tarball) git-htmldocs-1.5.4.4.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.5.4.4.tar.{gz,bz2} (preformatted docs) RPMS/$arch/git-*-1.5.4.4-1.$arch.rpm (RPM) ---------------------------------------------------------------- GIT v1.5.4.4 Release Notes ========================== Fixes since v1.5.4.3 -------------------- * Building and installing with an overtight umask such as 077 made installed templates unreadable by others, while the rest of the install are done in a way that is friendly to umask 022. * "git cvsexportcommit -w $cvsdir" misbehaved when GIT_DIR is set to a relative directory. * "git http-push" had an invalid memory access that could lead it to segfault. * When "git rebase -i" gave control back to the user for a commit that is marked to be edited, it just said "modify it with commit --amend", without saying what to do to continue after modifying it. Give an explicit instruction to run "rebase --continue" to be more helpful. * "git send-email" in 1.5.4.3 issued a bogus empty In-Reply-To: header. * "git bisect" showed mysterious "won't bisect on seeked tree" error message. This was leftover from Cogito days to prevent "bisect" starting from a cg-seeked state. We still keep the Cogito safety, but running "git bisect start" when another bisect was in effect will clean up and start over. * "git push" with an explicit PATH to receive-pack did not quite work if receive-pack was not on usual PATH. We earlier fixed the same issue with "git fetch" and upload-pack, but somehow forgot to do so in the other direction. * git-gui's info dialog was not displayed correctly when the user tries to commit nothing (i.e. without staging anything). * "git revert" did not properly fail when attempting to run with a dirty index. * "git merge --no-commit --no-ff " incorrectly made commits. * "git merge --squash --no-ff ", which is a nonsense combination of options, was not rejected. * "git ls-remote" and "git remote show" against an empty repository failed, instead of just giving an empty result (regression). * "git fast-import" did not handle a renamed path whose name needs to be quoted, due to a bug in unquote_c_style() function. * "git cvsexportcommit" was confused when multiple files with the same basename needed to be pushed out in the same commit. * "git daemon" did not send early errors to syslog. * "git log --merge" did not work well with --left-right option. * "git svn" promprted for client cert password every time it accessed the server. * The reset command in "git fast-import" data stream was documented to end with an optional LF, but it actually required one. * "git svn dcommit/rebase" did not honor --rewrite-root option. Also included are a handful documentation updates. ---------------------------------------------------------------- Changes since v1.5.4.3 are as follows: Adeodato Simó (1): Really make the LF after reset in fast-import optional Björn Steinbrink (1): receive-pack: Initialize PATH to include exec-dir. Brandon Casey (1): builtin-reflog.c: don't install new reflog on write failure Bryan Donlan (1): Documentation/git-am.txt: Pass -r in the example invocation of rm -f .dotest Caio Marcelo de Oliveira Filho (1): filter-branch documentation: non-zero exit status in command abort the filter Carl Worth (1): Eliminate confusing "won't bisect on seeked tree" failure Daniel Barkalow (3): Use a single implementation and API for copy_file() Don't use GIT_CONFIG in t5505-remote Correct name of diff_flush() in API documentation Gerrit Pape (2): templates/Makefile: don't depend on local umask setting git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options Jay Soffian (2): rev-parse: fix potential bus error with --parseopt option spec handling send-email: fix In-Reply-To regression Jeff King (1): revert: actually check for a dirty index Johan Herland (2): Add testcase for 'git cvsexportcommit -w $cvsdir ...' with relative $GIT_DIR Fix 'git cvsexportcommit -w $cvsdir ...' when used with relative $GIT_DIR Johannes Schindelin (4): http-push: avoid invalid memory accesses http-push: do not get confused by submodules http-push: avoid a needless goto cvsexportcommit: be graceful when "cvs status" reorders the arguments Johannes Sixt (2): daemon: send more error messages to the syslog daemon: ensure that base-path is an existing directory John Goerzen (1): Fix dcommit, rebase when rewriteRoot is in use Jonathan del Strother (1): Prompt to continue when editing during rebase --interactive Junio C Hamano (6): Fix "git log --merge --left-right" Start preparing for 1.5.4.4 tests: introduce test_must_fail Update draft release notes for 1.5.4.4 test-lib: fix TERM to dumb for test repeatability GIT 1.5.4.4 Matthieu Moy (1): Fix incorrect wording in git-merge.txt. Mike Hommey (2): Set proxy override with http_init() Fix random crashes in http_cleanup() Mike Ralphson (1): Documentation cherry-pick: Fix cut-and-paste error Miklos Vajna (2): Documentation/git-filter-branch: add a new msg-filter example Documentation/git svn log: add a note about timezones. Pierre Habouzit (1): unquote_c_style: fix off-by-one. Ping Yin (1): git-submodule: Fix typo 'url' which should be '$url' Rémi Vanicat (1): git.el: find the git-status buffer whatever its name is Santi Béjar (1): ident.c: reword error message when the user name cannot be determined Sebastian Noack (1): git-svn: Don't prompt for client cert password everytime. Shawn O. Pearce (6): Ensure 'make dist' compiles git-archive.exe on Cygwin Protect peel_ref fallback case from NULL parse_object result Correct fast-export file mode strings to match fast-import standard git-gui: Paper bag fix info dialog when no files are staged at commit Fix 'git remote show' regression on empty repository in 1.5.4 git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails Steven Drake (1): timezone_names[]: fixed the tz offset for New Zealand. Uwe Kleine-König (1): config.txt: refer to --upload-pack and --receive-pack instead of --exec -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

Hello everyone, I spent the last two days writing a text-based tree visualizer; gitk is really convenient, but unfortunately it needs an X display, tigs tree view left me unimpressed, and I actually wanted a tool that does not read all commits in ... [More] like gitk/tig do, but just gives me the treeview. Screenshot: http://jengelh.hopto.org/other/git-forest.png Program (perl): http://dev.computergmbh.de/gitweb.cgi?p=hxtools;a=blob_plain;f=bin/git-forest Top of file contains option overview. Feedback is welcome. thanks, Jan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest maintenance release GIT 1.5.4.3 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.5.4.3.tar.{gz,bz2} (tarball) git-htmldocs-1.5.4.3.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.5.4.3.tar.{gz,bz2} (preformatted docs) RPMS/$arch/git-*-1.5.4.3-1.$arch.rpm (RPM) Largest user visible change in this is RPM packaging updates by Kristian Høgsberg. 'git-core' will only be pure git without pulling foreign SCM packages in as its dependencies anymore when you do "yum install git-core". ---------------------------------------------------------------- GIT v1.5.4.3 Release Notes ========================== Fixes since v1.5.4.2 -------------------- * RPM spec used to pull in everything with 'git'. This has been changed so that 'git' package contains just the core parts, and we now supply 'git-all' metapackage to slurp in everything. This should match end user's expectation better. * When some refs failed to update, git-push reported "failure" which was unclear if some other refs were updated or all of them failed atomically (the answer is the former). Reworded the message to clarify this. * "git clone" from a repository whose HEAD was misconfigured did not set up the remote properly. Now it tries to do better. * Updated git-push documentation to clarify what "matching" means, in order to reduce user confusion. * Updated git-add documentation to clarify "add -u" operates in the current subdirectory you are in, just like other commands. * git-gui updates to work on OSX and Windows better. ---------------------------------------------------------------- Changes since v1.5.4.2 are as follows: Gerrit Pape (1): git-clone.sh: properly configure remote even if remote's head is dangling Jay Soffian (2): git-gui: support Git Gui.app under OS X 10.5 send-email: squelch warning due to comparing undefined $_ to "" Jeff King (4): push: indicate partialness of error message Documentation/push: clarify matching refspec behavior push: document the status output hash: fix lookup_hash semantics Junio C Hamano (1): GIT 1.5.4.3 Kristian H淡gsberg (1): Rename git-core rpm to just git and rename the meta-pacakge to git-all. Miklos Vajna (1): Documentation/git-stash: document options for git stash list Pekka Kaitaniemi (1): Clarified the meaning of git-add -u in the documentation Shawn O. Pearce (5): git-gui: Ensure error dialogs always appear over all other windows git-gui: Paper bag fix error dialogs opening over the main window git-gui: Default TCL_PATH to same location as TCLTK_PATH git-gui: Avoid hardcoded Windows paths in Cygwin package files git-gui: Focus insertion point at end of strings in repository chooser Wincent Colaiuta (1): git-gui: relax "dirty" version detection - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

Junio C Hamano writes: > ... As announced, I'll rewind > and rebuild "next" with the surviving topics on top of "master", > sometime tomorrow. ... which just happened. The old history leading to "next" used to be 1323 commits ahead of ... [More] v1.5.4.2 but the rebased one now is only 182 commits ahead, mostly due to old merge commits that never went out of "next" to "master" and a handful reverts. On k.org and repo.or.cz repo, I pushed out a branch "old-next" whose ancestry is connected to the old "next" and whose tip-tree matches that of the tip of "next", so if any of you have been building on top of 'next', you may want a one-time conversion to do: $ git fetch $ git rebase --onto origin/next origin/old-next my-branch-on-next Recent "git pull --rebase" may be good enough by consulting your remotes/origin/next@{1} to find the base without using the old-next trick, though I haven't checked. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest maintenance release GIT 1.5.4.2 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.5.4.2.tar.{gz,bz2} (tarball) git-htmldocs-1.5.4.2.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.5.4.2.tar.{gz,bz2} (preformatted docs) RPMS/$arch/git-*-1.5.4.2-1.$arch.rpm (RPM) ---------------------------------------------------------------- GIT v1.5.4.2 Release Notes ========================== Fixes since v1.5.4 ------------------ * The configuration parser was not prepared to see string valued variables misspelled as boolean and segfaulted. * Temporary files left behind due to interrupted object transfers were not cleaned up with "git prune". * "git config --unset" was confused when the unset variables were spelled with continuation lines in the config file. * The merge message detection in "git cvsimport" did not catch a message that began with "Merge...". * "git status" suggests "git rm --cached" for unstaging the earlier "git add" before the initial commit. * "git status" output was incorrect during a partial commit. * "git bisect" refused to start when the HEAD was detached. * "git bisect" allowed a wildcard character in the commit message expanded while writing its log file. * Manual pages were not formatted correctly with docbook xsl 1.72; added a workaround. * "git-commit -C $tag" used to work but rewrite in C done in 1.5.4 broke it. This was fixed in 1.5.4.1. * An entry in the .gitattributes file that names a pattern in a subdirectory of the directory it is in did not match correctly (e.g. pattern "b/*.c" in "a/.gitattributes" should match "a/b/foo.c" but it didn't). This was fixed in 1.5.4.1. * Customized color specification was parsed incorrectly when numeric color values are used. This was fixed in 1.5.4.1. * http transport misbehaved when linked with curl-gnutls. ---------------------------------------------------------------- Changes since v1.5.4.1 are as follows: Christian Couder (8): config: add test cases for empty value and no value config variables. diff.c: replace a 'strdup' with 'xstrdup'. diff.c: remove useless check for value != NULL config: add 'git_config_string' to refactor string config variables. Add "const" qualifier to "char *pager_program". Add "const" qualifier to "char *editor_program". Add "const" qualifier to "char *excludes_file". diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver" Daniel Barkalow (1): Validate nicknames of remote branches to prohibit confusing ones David Steven Tweed (1): Make git prune remove temporary packs that look like write failures Frank Lichtenheld (1): config: Fix --unset for continuation lines Gerrit Pape (2): builtin-commit: remove .git/SQUASH_MSG upon successful commit cvsimport: have default merge regex also match beginning of commit message James Bowes (1): Add a BuildRequires for gettext in the spec file. Jay Soffian (1): mailinfo: feed only one line to handle_filter() for QP input Jeff King (2): status: suggest "git rm --cached" to unstage for initial commit commit: discard index after setting up partial commit Johannes Schindelin (3): bisect: allow starting with a detached HEAD Document that the default of branch.autosetupmerge is true bisect: use verbatim commit subject in the bisect log Johannes Sixt (1): upload-pack: Initialize the exec-path. Jonas Fonseca (1): man pages are littered with .ft C and others Junio C Hamano (31): git-pull documentation: fix markup archive-tar.c: guard config parser from value=NULL Add config_error_nonbool() helper function builtin-apply.c: guard config parser from value=NULL builtin-branch.c: guard config parser from value=NULL builtin-commit.c: guard config parser from value=NULL builtin-config.c: guard config parser from value=NULL builtin-log.c: guard config parser from value=NULL builtin-reflog.c: guard config parser from value=NULL builtin-show-branch.c: guard config parser from value=NULL builtin-tag.c: guard config parser from value=NULL connect.c: guard config parser from value=NULL convert.c: guard config parser from value=NULL diff.c: guard config parser from value=NULL git.c: guard config parser from value=NULL help.c: guard config parser from value=NULL http.c: guard config parser from value=NULL merge-recursive.c: guard config parser from value=NULL remote.c: guard config parser from value=NULL setup.c: guard config parser from value=NULL wt-status.c: guard config parser from value=NULL imap-send.c: guard config parser from value=NULL builtin-log.c: guard config parser from value=NULL config.c: guard config parser from value=NULL Revert "pack-objects: only throw away data during memory pressure" Protect get_author_ident_from_commit() from filenames in work tree diff.c: fixup garding of config parser from value=NULL diff: Fix miscounting of --check output filter-branch: handle filenames that need quoting Documentation/git-reset: GIT 1.5.4.2 Martin Koegler (1): pack-objects: only throw away data during memory pressure Mike Hommey (1): Work around curl-gnutls not liking to be reinitialized Miklos Vajna (2): builtin-gc.c: guard config parser from value=NULL git clone -s documentation: force a new paragraph for the NOTE Pieter de Bie (2): Documentation/git-reset: don't mention --mixed for selected-paths reset Documentation/git-reset: Add an example of resetting selected paths Sergei Organov (1): git-cvsimport.txt: fix '-M' description. Shawn O. Pearce (1): fast-import: check return value from unpack_entry() Stelian Pop (1): hg-to-git: fix parent analysis Uwe Kleine-K旦nig (1): rebase -i: accept -m as advertised in the man page - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest maintenance release GIT 1.5.4.1 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.5.4.1.tar.{gz,bz2} (tarball) git-htmldocs-1.5.4.1.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.5.4.1.tar.{gz,bz2} (preformatted docs) RPMS/$arch/git-*-1.5.4.1-1.$arch.rpm (RPM) Among a handful of documentation patches, there are a few true bugfixes. * An entry in the .gitattributes file that names a pattern in a subdirectory of the directory it is in did not match correctly (e.g. pattern "b/*.c" in "a/.gitattributes" should match "a/b/foo.c" but it didn't). * "git-commit -C $tag" used to work but rewrite in C done in 1.5.4 broke it, which this release fixes. * Customized color specification was parsed incorrectly when numeric color values are used. ---------------------------------------------------------------- Changes since v1.5.4 are as follows: Gerrit Pape (1): INSTALL: git-merge no longer uses cpio Jari Aalto (1): Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2) Junio C Hamano (3): Update stale documentation links from the main documentation. Fix "git-commit -C $tag" gitattributes: fix relative path matching Jörg Sommer (2): git-am: fix type in its usage string git-remote documentation: fix synopsis to match description Tim Stoakes (1): Fix typo in 'blame' documentation. Timo Hirvonen (1): Fix parsing numeric color values - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]

The latest feature release GIT 1.5.4 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.5.4.tar.{gz,bz2} (tarball) git-htmldocs-1.5.4.tar.{gz,bz2} (preformatted docs) git-manpages-1.5.4.tar.{gz,bz2} ... [More] (preformatted docs) RPMS/$arch/git-*-1.5.4-1.$arch.rpm (RPM) It has been an unusually long cycle. 5 months since the last feature release 1.5.3 was really a bit too long. But I hope it was worth waiting for. Thanks everybody for working hard to improve it. Changes since v1.5.3: 1595 non-merge commits 165 contributors 684 files changed, 70435 insertions, 28984 deletions ---------------------------------------------------------------- GIT v1.5.4 Release Notes ======================== Removal ------- * "git svnimport" was removed in favor of "git svn". It is still there in the source tree (contrib/examples) but unsupported. * As git-commit and git-status have been rewritten, "git runstatus" helper script lost all its users and has been removed. Temporarily disabled -------------------- * "git http-push" is known not to work well with cURL library older than 7.16, and we had reports of repository corruption. It is disabled on such platforms for now. Unfortunately, 1.5.3.8 shares the same issue. In other words, this does not mean you will be fine if you stick to an older git release. For now, please do not use http-push from older git with cURL older than 7.16 if you value your data. A proper fix will hopefully materialize in later versions. Deprecation notices ------------------- * From v1.6.0, git will by default install dashed form of commands (e.g. "git-commit") outside of users' normal $PATH, and will install only selected commands ("git" itself, and "gitk") in $PATH. This implies: - Using dashed forms of git commands (e.g. "git-commit") from the command line has been informally deprecated since early 2006, but now it officially is, and will be removed in the future. Use dash-less forms (e.g. "git commit") instead. - Using dashed forms from your scripts, without first prepending the return value from "git --exec-path" to the scripts' PATH, has been informally deprecated since early 2006, but now it officially is. - Use of dashed forms with "PATH=$(git --exec-path):$PATH; export PATH" early in your script is not deprecated with this change. Users are strongly encouraged to adjust their habits and scripts now to prepare for this change. * The post-receive hook was introduced in March 2007 to supersede the post-update hook, primarily to overcome the command line length limitation of the latter. Use of post-update hook will be deprecated in future versions of git, starting from v1.6.0. * "git lost-found" was deprecated in favor of "git fsck"'s --lost-found option, and will be removed in the future. * "git peek-remote" is deprecated, as "git ls-remote" was written in C and works for all transports; "git peek-remote" will be removed in the future. * "git repo-config" which was an old name for "git config" command has been supported without being advertised for a long time. The next feature release will remove it. * From v1.6.0, the repack.usedeltabaseoffset config option will default to true, which will give denser packfiles (i.e. more efficient storage). The downside is that git older than version 1.4.4 will not be able to directly use a repository packed using this setting. * From v1.6.0, the pack.indexversion config option will default to 2, which is slightly more efficient, and makes repacking more immune to data corruptions. Git older than version 1.5.2 may revert to version 1 of the pack index with a manual "git index-pack" to be able to directly access corresponding pack files. Updates since v1.5.3 -------------------- * Comes with much improved gitk, with i18n. * Comes with git-gui 0.9.2 with i18n. * gitk is now merged as a subdirectory of git.git project, in preparation for its i18n. * progress displays from many commands are a lot nicer to the eye. Transfer commands show throughput data. * many commands that pay attention to per-directory .gitignore now do so lazily, which makes the usual case go much faster. * Output processing for '--pretty=format:' has been optimized. * Rename detection of diff family while detecting exact matches has been greatly optimized. * Rename detection of diff family tries to make more natural looking pairing. Earlier, if multiple identical rename sources were found in the preimage, the source used was picked pretty much at random. * Value "true" for color.diff and color.status configuration used to mean "always" (even when the output is not going to a terminal). This has been corrected to mean the same thing as "auto". * "git diff" Porcelain now respects diff.external configuration, which is another way to specify GIT_EXTERNAL_DIFF. * "git diff" can be told to use different prefixes other than "a/" and "b/" e.g. "git diff --src-prefix=l/ --dst-prefix=k/". * "git diff" sometimes did not quote paths with funny characters properly. * "git log" (and any revision traversal commands) misbehaved when --diff-filter is given but was not asked to actually produce diff. * HTTP proxy can be specified per remote repository using remote.*.httpproxy configuration, or global http.proxy configuration variable. * Various Perforce importer updates. * Example update and post-receive hooks have been improved. * Any command that wants to take a commit object name can now use ":/string" syntax to name a commit. * "git reset" is now built-in and its output can be squelched with -q. * "git reset --hard" does not make any sense in a bare repository, but did not error out; fixed. * "git send-email" can optionally talk over ssmtp and use SMTP-AUTH. * "git rebase" learned --whitespace option. * In "git rebase", when you decide not to replay a particular change after the command stopped with a conflict, you can say "git rebase --skip" without first running "git reset --hard", as the command now runs it for you. * "git rebase --interactive" mode can now work on detached HEAD. * Other minor to serious bugs in "git rebase -i" have been fixed. * "git rebase" now detaches head during its operation, so after a successful "git rebase" operation, the reflog entry branch@{1} for the current branch points at the commit before the rebase was started. * "git rebase -i" also triggers rerere to help your repeated merges. * "git merge" can call the "post-merge" hook. * "git pack-objects" can optionally run deltification with multiple threads. * "git archive" can optionally substitute keywords in files marked with export-subst attribute. * "git cherry-pick" made a misguided attempt to repeat the original command line in the generated log message, when told to cherry-pick a commit by naming a tag that points at it. It does not anymore. * "git for-each-ref" learned %(xxxdate:) syntax to show the various date fields in different formats. * "git gc --auto" is a low-impact way to automatically run a variant of "git repack" that does not lose unreferenced objects (read: safer than the usual one) after the user accumulates too many loose objects. * "git clean" has been rewritten in C. * You need to explicitly set clean.requireForce to "false" to allow "git clean" without -f to do any damage (lack of the configuration variable used to mean "do not require -f option to lose untracked files", but we now use the safer default). * The kinds of whitespace errors "git diff" and "git apply" notice (and fix) can be controlled via 'core.whitespace' configuration variable and 'whitespace' attribute in .gitattributes file. * "git push" learned --dry-run option to show what would happen if a push is run. * "git push" does not update a tracking ref on the local side when the remote refused to update the corresponding ref. * "git push" learned --mirror option. This is to push the local refs one-to-one to the remote, and deletes refs from the remote that do not exist anymore in the repository on the pushing side. * "git push" can remove a corrupt ref at the remote site with the usual ":ref" refspec. * "git remote" knows --mirror mode. This is to set up configuration to push into a remote repository to store local branch heads to the same branch on the remote side, and remove branch heads locally removed from local repository at the same time. Suitable for pushing into a back-up repository. * "git remote" learned "rm" subcommand. * "git cvsserver" can be run via "git shell". Also, "cvs" is recognized as a synonym for "git cvsserver", so that CVS users can be switched to git just by changing their login shell. * "git cvsserver" acts more like receive-pack by running post-receive and post-update hooks. * "git am" and "git rebase" are far less verbose. * "git pull" learned to pass --[no-]ff option to underlying "git merge". * "git pull --rebase" is a different way to integrate what you fetched into your current branch. * "git fast-export" produces data-stream that can be fed to fast-import to reproduce the history recorded in a git repository. * "git add -i" takes pathspecs to limit the set of files to work on. * "git add -p" is a short-hand to go directly to the selective patch subcommand in the interactive command loop and to exit when done. * "git add -i" UI has been colorized. The interactive prompt and menu can be colored by setting color.interactive configuration. The diff output (including the hunk picker) are colored with color.diff configuration. * "git commit --allow-empty" allows you to create a single-parent commit that records the same tree as its parent, overriding the usual safety valve. * "git commit --amend" can amend a merge that does not change the tree from its first parent. * "git commit" used to unconditionally strip comment lines that began with '#' and removed excess blank lines. This behavior has been made configurable. * "git commit" has been rewritten in C. * "git stash random-text" does not create a new stash anymore. It was a UI mistake. Use "git stash save random-text", or "git stash" (without extra args) for that. * "git stash clear extra-text" does not clear the whole stash anymore. It is tempting to expect "git stash clear stash@{2}" to drop only a single named stash entry, and it is rude to discard everything when that is asked (but not provided). * "git prune --expire " can exempt young loose objects from getting pruned. * "git branch --contains " can list branches that are descendants of a given commit. * "git log" learned --early-output option to help interactive GUI implementations. * "git bisect" learned "skip" action to mark untestable commits. * "git bisect visualize" learned a shorter synonym "git bisect view". * "git bisect visualize" runs "git log" in a non-windowed environments. It also can be told what command to run (e.g. "git bisect visualize tig"). * "git format-patch" learned "format.numbered" configuration variable to automatically turn --numbered option on when more than one commits are formatted. * "git ls-files" learned "--exclude-standard" to use the canned set of exclude files. * "git tag -a -f existing" begins the editor session using the existing annotation message. * "git tag -m one -m bar" (multiple -m options) behaves similarly to "git commit"; the parameters to -m options are formatted as separate paragraphs. * The format "git show" outputs an annotated tag has been updated to include "Tagger: " and "Date: " lines from the tag itself. Strictly speaking this is a backward incompatible change, but this is a reasonable usability fix and people's scripts shouldn't have been relying on the exact output from "git show" Porcelain anyway. * "git cvsimport" did not notice errors from underlying "cvsps" and produced a corrupt import silently. * "git cvsexportcommit" learned -w option to specify and switch to the CVS working directory. * "git checkout" from a subdirectory learned to use "../path" to allow checking out a path outside the current directory without cd'ing up. * "git checkout" from and to detached HEAD leaves a bit more information in the reflog. * "git send-email --dry-run" shows full headers for easier diagnosis. * "git merge-ours" is now built-in. * "git svn" learned "info" and "show-externals" subcommands. * "git svn" run from a subdirectory failed to read settings from the .git/config. * "git svn" learned --use-log-author option, which picks up more descriptive name from From: and Signed-off-by: lines in the commit message. * "git svn" wasted way too much disk to record revision mappings between svn and git; a new representation that is much more compact for this information has been introduced to correct this. * "git svn" left temporary index files it used without cleaning them up; this was corrected. * "git status" from a subdirectory now shows relative paths, which makes copy-and-pasting for git-checkout/git-add/git-rm easier. The traditional behavior to show the full path relative to the top of the work tree can be had by setting status.relativepaths configuration variable to false. * "git blame" kept text for each annotated revision in core needlessly; this has been corrected. * "git shortlog" learned to default to HEAD when the standard input is a terminal and the user did not give any revision parameter. * "git shortlog" learned "-e" option to show e-mail addresses as well as authors' names. * "git help" learned "-w" option to show documentation in browsers. * In addition there are quite a few internal clean-ups. Notably: - many fork/exec have been replaced with run-command API, brought from the msysgit effort. - introduction and more use of the option parser API. - enhancement and more use of the strbuf API. * Makefile tweaks to support HP-UX is in. Fixes since v1.5.3 ------------------ All of the fixes in v1.5.3 maintenance series are included in this release, unless otherwise noted. These fixes are only in v1.5.4 and not backported to v1.5.3 maintenance series. * The way "git diff --check" behaves is much more consistent with the way "git apply --whitespace=warn" works. * "git svn" talking with the SVN over HTTP will correctly quote branch and project names. * "git config" did not work correctly on platforms that define REG_NOMATCH to an even number. * Recent versions of AsciiDoc 8 has a change to break our documentation; a workaround has been implemented. * "git diff --color-words" colored context lines in a wrong color. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html [Less]