Git

Just thought I'd make this available, in case there's others with niche needs that find it useful... git_fast_filter assists with quickly rewriting the history of a repository by making it easy to write scripts whose purpose is to serve as safe ... [More] filters between fast-export and fast-import. git_fast_filter comes with example programs, a basic test-suite, and a double your money back satisfaction guarantee. (I love free software.) You can get it from git://gitorious.org/git_fast_filter/mainline.git In more detail... === Purpose === git_fast_filter is designed to make it easy to filter or rewrite the history of a repository. As such, it fills the same role as git-filter-branch, and was written primarily to overcome the sometimes severe speed shortcomings of git-filter-branch. In particular, using git_fast_filter can avoid thousands or millions of new process forks, and can allow you to rewrite the same file only one time instead of 50,000 times. However, while using git_fast_filter is fairly simple and quick, it is hard to beat writing a simple git-filter-branch one-liner for efficiency of human time. Also, the two tools use very different methods of rewriting history and do not have exactly overlapping feature sets, so the best tool for a particular job is going to be very problem dependent. As human time is often more important than computer time, especially for one-shot rewrites, git-filter-branch will probably continue to be the more common tool. However, git_fast_filter is useful in cases where computer time of a rewrite matters (particularly larger repositories and more involved rewrites that need to be run and tested many times on large data sets). Also git_fast_filter has a couple features that may come in handy in special cases (assisting with generating fast-export output from scratch, interleaving commits from seperate repositories, and bidirectional collaboration between filtered and unfiltered repositories). === Idea === The way git_fast_filter works is by providing a simple python library, git_fast_filter.py. This library can be used in simple python scripts to create a filter for the output of git-fast-export. Thus, the typical calling convention is of the form: git fast-export | filter_script.py | git fast-import === Example === An example script that renames the 'master' branch to 'other is shown below (this is similar to the example in the git-fast-export manpage, but is safe against the string 'refs/heads/master' appearing in some file or commit message in the repository): #!/usr/bin/python from git_fast_filter import Commit, FastExportFilter def my_commit_callback(commit): if commit.branch == "refs/heads/master": commit.branch = "refs/heads/other" filter = FastExportFilter(commit_callback = my_commit_callback) filter.run() The user can then run this script by: $ mkdir target && cd target && git init $ (cd /PATH/LEADING/TO/source && git fast-export --all) \ | /PATH/TO/filter_script.py | git fast-import (Note: The user can have the script take care of the git init, the cd's, and the invocations of git fast-export and git fast-import by just passing directory names to FastExportFilter.run; however, writing out the details explicitly as in the above example makes it clearer what is going on.) Elijah -- 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.6.2.2 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.6.2.2.tar.{gz,bz2} (source tarball) git-htmldocs-1.6.2.2.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.6.2.2.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS/$arch/git-*-1.6.2.2-1.fc9.$arch.rpm (RPM) Mostly documentation updates with a few bugfixes. ---------------------------------------------------------------- GIT v1.6.2.2 Release Notes ========================== Fixes since v1.6.2.1 -------------------- * A longstanding confusing description of what --pickaxe option of git-diff does has been clarified in the documentation. * "git-blame -S" did not quite work near the commits that were given on the command line correctly. * "git diff --pickaxe-regexp" did not count overlapping matches correctly. * "git diff" did not feed files in work-tree representation to external diff and textconv. * "git-fetch" in a repository that was not cloned from anywhere said it cannot find 'origin', which was hard to understand for new people. * "git-format-patch --numbered-files --stdout" did not have to die of incompatible options; it now simply ignores --numbered-files as no files are produced anyway. * "git-ls-files --deleted" did not work well with GIT_DIR&GIT_WORK_TREE. * "git-read-tree A B C..." without -m option has been broken for a long time. * git-send-email ignored --in-reply-to when --no-thread was given. * 'git-submodule add' did not tolerate extra slashes and ./ in the path it accepted from the command line; it now is more lenient. * git-svn misbehaved when the project contained a path that began with two dashes. * import-zips script (in contrib) did not compute the common directory prefix correctly. * miscompilation of negated enum constants by old gcc (2.9) affected the codepaths to spawn subprocesses. Many small documentation updates are included as well. ---------------------------------------------------------------- Changes since v1.6.2.1 are as follows: Allan Caffee (1): Documentation: update graph api example. Brandon Casey (1): git-branch: display "was sha1" on branch deletion rather than just "sha1" 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 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. Emil Sit (1): test-lib: Clean up comments and Makefile. Eric Wong (1): git-svn: fix ls-tree usage with dash-prefixed paths Holger Weiß (1): Documentation: Remove an odd "instead" Jeff King (3): doc: clarify how -S works ls-files: require worktree when --deleted is given fix portability problem with IS_RUN_COMMAND_ERR Johannes Schindelin (4): rsync transport: allow local paths, and fix tests Smudge the files fed to external diff and textconv import-zips: fix thinko mailmap: resurrect lower-casing of email addresses Johannes Sixt (2): Propagate --exec-path setting to external commands via GIT_EXEC_PATH diff --no-index: Do not generate patch output if other output is requested Junio C Hamano (6): read-tree A B C: do not create a bogus index and do not segfault Remove total confusion from git-fetch and git-push blame: read custom grafts given by -S before calling setup_revisions() Update draft release notes to 1.6.2.2 Update draft release notes to 1.6.2.2 GIT 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 (4): send-email: respect in-reply-to regardless of threading send-email: test --no-thread --in-reply-to combination Documentation: format-patch --root clarifications bash completion: only show 'log --merge' if merging -- 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]

Hi people, teamGit is a functional git gui written in qt, its ultimate aim is to add functionality on top of git targeted at small closely knit teams. I have tagged the repo with v0.0.10!!! You can now get the .deb from ubuntu intrepid ppa deb ... [More] http://ppa.launchpad.net/bain-devslashzero/ubuntu intrepid main package name is teamgit. The main project website is http://www.devslashzero.com/teamgit Changes from v0.0.9 include a visual interactive merge conflict resolution. Changelog from v0.0.9 follows Abhijit Bhopatkar (32): Revert "Check, whether valid data is parseable or not" guifycommanddialogimpl.cpp: Avoid crashing for unparsable man pages gitprocess: whitespace cleanup Add slot to check for merge conflicts Add merge conflict label Add merge conflict checking in refresh settings_ui: Add mergetool path text box and select button Move git specific settings from mainwindow to settings for easier management Add merge tool path setting Add mergetool selction and fix writing it to settings file whitespace fixes Fix merge conflict label Merge branch 'master' of git://gitorious.org/teamgit/mainline Show files with merge conflicts only once Move GIT_INVOKE from mainwindowsimpl to gitthread Added merge dialog ui file Added merge dialog implementation Added merge dialog file to the qmake project Execute merge dialog when merge conflict label is clicked Connect filediff signal from git thread to mergedialog Show conflicting files in the merge dialog Added slot for getting merge conflict file's contents Gather conflicting file contents for unmerged files Disable merge tool options group box Fix: Clear previous contents in merge dialog on init gitprocess: append the filename to the conflict contents signal Disable the mergetool settings mergedialog: execute meld to resolve merge conflict Set commit message in commit dialog if COMMIT_EDITMSG exists diffviewer: Move font setting from mainwindowimpl to diffviewer User .git/MERGE_MSG instead of COMMIT_EDITMSG Fix merege conflict message while commiting Terje Rosten (1): fixing .desktop file -- 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.6.2.1 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.6.2.1.tar.{gz,bz2} (source tarball) git-htmldocs-1.6.2.1.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.6.2.1.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS//git-*-1.6.2.1-1.fc9.$arch.rpm (RPM) ---------------------------------------------------------------- GIT v1.6.2.1 Release Notes ========================== Fixes since v1.6.2 ------------------ * .gitignore learned to handle backslash as a quoting mechanism for comment introduction character "#". * timestamp output in --date=relative mode used to display timestamps that are long time ago in the default mode; it now uses "N years M months ago", and "N years ago". * git-add -i/-p now works with non-ASCII pathnames. * "git hash-object -w" did not read from the configuration file from the correct .git directory. * git-send-email learned to correctly handle multiple Cc: addresses. -- 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]

A new bugfix-release of cgit, a fast webinterface for git, is now available: Clone: git://hjemli.net/pub/git/cgit Browse: http://hjemli.net/git/cgit Shortlog since v0.8.2: Eric Wong (1): fix segfault when displaying empty blobs Lars ... [More] Hjemli (3): ui-tree: escape ascii-text properly in hexdump view ui-snapshot: avoid segfault when no filename is specified CGIT 0.8.2.1 -- 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]

TortoiseGit Shell can not appear at explore context menu because miss install ATL library at v0.4.1.0. I am sorry for such critial problem happen. This release is for quick fix this issue. Version 0.4.2.0 version(external) *Fix Shell menu ... [More] disappear because ATL library have not installed. *Fix Commit Dialog and Log Dialog default column is wrong *Fix some dialog can't show after resize and close and open again *Fix ProgressDlg Sometime thread is dead blocked. Version 0.4.1.0 version(external) *Fixed x64 build of TortoiseProc crashed due to received unexpected messages *Fix tag to head when *force* check box checked *Add Git document to help Version 0.4.0.0 version(internal) Features: *Full Overlay Icon Support. Show "Conflict, ignore file, untracked file, modified, Add, staged" icon according to file status. *Rebase Support. Support "Pick" "Sqaush" "Edit" and "Skip" commit when rebase branch. Support abort. *Combine Multi-commits to one commit. Combine continous commits to one commit. The limition is the only single line(no merge point) above combined commit. *Cherry Pick multi commits. User can use multi commits at log dialog and then choose cherry pick these. Cherry Pick dialog guide you finish whole work. Support "Pick" "Squash" "Edit" and "Skip" commits. *First x64 version. *Support version "browse" at switch, export, new branch/tag and merge dialogs. *Add context menu item "Revert" at Commit dialog File List. *Show bold font for HEAD at log dialog. *Add "Whole Project" checkbox at commit dialog *First Version Help Document. Bug Fix: *Fix issue 36, Push not working if no remote branch is specified *Default UnCheck untrack file at commit dialog *Issue 40: Commit from subfolder shows unversioned files in parent *Fix diff problem when filenames have embedded spaces *Fix Issue 24,45, Commit results not in window with scroll bars *Fix for win2k context menu icons *Fix Issue 46, The about window title still displays TortoiseSVN *Fix Issue 37, When the file name contains Chinese char, Diff doesn't work. *Fix Issue 28, "Add" status icon overlay is not correct. -- 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]

It's time for the next release of Magit, the Emacs interface to Git! http://zagadka.vm.bytemark.co.uk/magit/ A lot of people have contributed to it. Thanks a lot! Please report bugs and general feedback to our little mailing list: ... [More] http://groups.google.com/group/magit or to me directly, of course. What's new: * Tagging, on 't' and 'T'. * Stashing, on 'z' and 'Z'. * Wazzup, on 'w'. Wazzup gives you an overview over how other branches relate to the current one. * There is more control over pushing. 'P' now takes a prefix argument and pushing a branch without a default remote will ask for one. * Logs have changed a bit: 'l' shows the traditional brief log, and 'L' shows a more verbose log. Use the prefix arg to specify the range of the log. * M-x magit-status doesn't prompt anymore for a directory when invoked from within a Git repository. Use C-u to force a prompt. * When you have nothing staged, 'c' will now explicitly ask whether to commit everything instead of just going ahead and do it. This can be customized. * The digit keys '1', '2', '3', and '4' now show sections on the respective level and hide everything below. With Meta, they work on all sections; without, they work only on sections that are a parent or child of the current section. * Typing ' ' and '-' will change the size of hunks, via the "-U" option to git diff. '0' resets hunks to their default size. * Typing 'k' on the "Untracked files" section title will offer to delete all untracked files. * Magit understands a bit of git-svn: the status buffer shows unpushed and unpulled commits, 'N r' runs git svn rebase, and 'N c' runs git svn dcommit. * Magit now also works when the direcory is accessed via tramp. * M-x magit-status can also create new repositories when given a directory that is not a Git repository. * Magit works better with oldish Gits that don't understand "--graph", for example. * The name of the Git program and common options for it can be customized. Enjoy! -- 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 *, I'm happy to announce that TopGit 0.7 was released today. This release brings you several bug fixes and a few new features. The most useful new feature (in my opinon) is a new export method that provides your patches as a linear history ... [More] in a regular git branch for pulling by your upstream. TopGit aims to make handling of large amount of interdependent topic branches easier. In fact, it is designed especially for the case when you maintain a queue of third-party patches on top of another (perhaps Git-controlled) project and want to easily organize, maintain and submit them - TopGit achieves that by keeping a separate topic branch for each patch and providing few tools to maintain the branches You can get TopGit at http://repo.or.cz/w/topgit.git or if you run Debian you can install the version from the unstable distribution[*1*]. If you want to read more about TopGit's design, usage and implementation, let me point you to TopGit's README at http://repo.or.cz/w/topgit.git?a=blob;f=README The full shortlog since version TopGit 0.5[*2*] can be found below. I would be happy if you gave it a try and reported your impressions, suggestions and bugs. Best regards Uwe [*1*] Up to now it didn't hit unstable, but if you cannot wait for a few hours you have to install from source :-) [*2*] Version 0.6 was skipped, because a change bumping the version number was accidently pushed to a public repo. As the latest version get some more changes, we decided to skip to 0.7. Bert Wesarg (1): tg-summary: -t and --graphviz are mutual exclusive Jonas Fonseca (1): README: spelling fixes Kirill Smelkov (5): tg-completion: complete options for `tg summary` tg-completion: complete options for `tg remote` Implement setup_pager just like in git tg-patch: fix pagination tg-patch: add support for generating patches against worktree and index Marc Weber (1): Pass -- to rev-list for branch/filename disambiguation Uwe Kleine-K [Less]

TortoiseGit 0.3.3 released. http://code.google.com/p/tortoisegit/downloads/list Features: *Full Overlay Icon Support. Show "Conflict, ignore file, untracked file, modified, Add, staged" icon according to file status. *Rebase Support. ... [More] Support "Pick" "Sqaush" "Edit" and "Skip" commit when rebase branch. Support abort. *Combine Multi-commits to one commit. Combine continous commits to one commit. The limition is the only single line(no merge point) above combined commit. *Cherry Pick multi commits. User can use multi commits at log dialog and then choose cherry pick these. Cherry Pick dialog guide you finish whole work. Support "Pick" "Squash" "Edit" and "Skip" commits. *First x64 version. *Support version "browse" at switch, export, new branch/tag and merge dialogs. *Add context menu item "Revert" at Commit dialog File List. *Show bold font for HEAD at log dialog. *Add "Whole Project" checkbox at commit dialog *First Version Help Document. Bug Fix: *Fix issue 36, Push not working if no remote branch is specified *Default UnCheck untrack file at commit dialog *Issue 40: Commit from subfolder shows unversioned files in parent *Fix diff problem when filenames have embedded spaces *Fix Issue 24,45, Commit results not in window with scroll bars *Fix for win2k context menu icons *Fix Issue 46, The about window title still displays TortoiseSVN *Fix Issue 37, When the file name contains Chinese char, Diff doesn't work. *Fix Issue 28, "Add" status icon overlay is not correct. *Fixed x64 build of TortoiseProc crashed due to received unexpected messages *Fix tag to head when *force* check box checked *Add Git document to help Known Issue: *Git clone can't support git protocol. SSH need enable TortoisePLink as SSH client. User should use setting dialog network page to setup TortoisePLink as SSH client. *Git clone can't capture TortoisePLink output. So there are no progress info during download from remote repository. *64bit setup package can not auto installed MFC 9.0 and ATL 9.0 Redistribute package. Work around: install MFC 9.0 and ATL 9.0 redistribute package before install 64bit tortoisegit. -- 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.6.2 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.6.2.tar.{gz,bz2} (source tarball) git-htmldocs-1.6.2.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.6.2.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: RPMS//git-*-1.6.2-1.fc9.$arch.rpm (RPM) ---------------------------------------------------------------- GIT v1.6.2 Release Notes ======================== With the next major release, "git push" into a branch that is currently checked out will be refused by default. You can choose what should happen upon such a push by setting the configuration variable receive.denyCurrentBranch in the receiving repository. To ease the transition plan, the receiving repository of such a push running this release will issue a big warning when the configuration variable is missing. Please refer to: http://git.or.cz/gitwiki/GitFaq#non-bare http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 for more details on the reason why this change is needed and the transition plan. For a similar reason, "git push $there :$killed" to delete the branch $killed in a remote repository $there, if $killed branch is the current branch pointed at by its HEAD, gets a large warning. You can choose what should happen upon such a push by setting the configuration variable receive.denyDeleteCurrent in the receiving repository. Updates since v1.6.1 -------------------- (subsystems) * git-svn updates. * gitweb updates, including a new patch view and RSS/Atom feed improvements. * (contrib/emacs) git.el now has commands for checking out a branch, creating a branch, cherry-picking and reverting commits; vc-git.el is not shipped with git anymore (it is part of official Emacs). (performance) * pack-objects autodetects the number of CPUs available and uses threaded version. (usability, bells and whistles) * automatic typo correction works on aliases as well * @{-1} is a way to refer to the last branch you were on. This is accepted not only where an object name is expected, but anywhere a branch name is expected and acts as if you typed the branch name. E.g. "git branch --track mybranch @{-1}", "git merge @{-1}", and "git rev-parse --symbolic-full-name @{-1}" would work as expected. * When refs/remotes/origin/HEAD points at a remote tracking branch that has been pruned away, many git operations issued warning when they internally enumerated the refs. We now warn only when you say "origin" to refer to that pruned branch. * The location of .mailmap file can be configured, and its file format was enhanced to allow mapping an incorrect e-mail field as well. * "git add -p" learned 'g'oto action to jump directly to a hunk. * "git add -p" learned to find a hunk with given text with '/'. * "git add -p" optionally can be told to work with just the command letter without Enter. * when "git am" stops upon a patch that does not apply, it shows the title of the offending patch. * "git am --directory=" and "git am --reject" passes these options to underlying "git apply". * "git am" learned --ignore-date option. * "git blame" aligns author names better when they are spelled in non US-ASCII encoding. * "git clone" now makes its best effort when cloning from an empty repository to set up configuration variables to refer to the remote repository. * "git checkout -" is a shorthand for "git checkout @{-1}". * "git cherry" defaults to whatever the current branch is tracking (if exists) when the argument is not given. * "git cvsserver" can be told not to add extra "via git-CVS emulator" to the commit log message it serves via gitcvs.commitmsgannotation configuration. * "git cvsserver" learned to handle 'noop' command some CVS clients seem to expect to work. * "git diff" learned a new option --inter-hunk-context to coalesce close hunks together and show context between them. * The definition of what constitutes a word for "git diff --color-words" can be customized via gitattributes, command line or a configuration. * "git diff" learned --patience to run "patience diff" algorithm. * "git filter-branch" learned --prune-empty option that discards commits that do not change the contents. * "git fsck" now checks loose objects in alternate object stores, instead of misreporting them as missing. * "git gc --prune" was resurrected to allow "git gc --no-prune" and giving non-default expiration period e.g. "git gc --prune=now". * "git grep -w" and "git grep" for fixed strings have been optimized. * "git mergetool" learned -y(--no-prompt) option to disable prompting. * "git rebase -i" can transplant a history down to root to elsewhere with --root option. * "git reset --merge" is a new mode that works similar to the way "git checkout" switches branches, taking the local changes while switching to another commit. * "git submodule update" learned --no-fetch option. * "git tag" learned --contains that works the same way as the same option from "git branch". Fixes since v1.6.1 ------------------ All of the fixes in v1.6.1.X maintenance series are included in this release, unless otherwise noted. Here are fixes that this release has, but have not been backported to v1.6.1.X series. * "git-add sub/file" when sub is a submodule incorrectly added the path to the superproject. * "git bundle" did not exclude annotated tags even when a range given from the command line wanted to. * "git filter-branch" unnecessarily refused to work when you had checked out a different commit from what is recorded in the superproject index in a submodule. * "git filter-branch" incorrectly tried to update a nonexistent work tree at the end when it is run in a bare repository. * "git gc" did not work if your repository was created with an ancient git and never had any pack files in it before. * "git mergetool" used to ignore autocrlf and other attributes based content rewriting. * branch switching and merges had a silly bug that did not validate the correct directory when making sure an existing subdirectory is clean. * "git -p cmd" when cmd is not a built-in one left the display in funny state when killed in the middle. -- 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]