Git

The latest feature release GIT 1.6.1 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.6.1.tar.{gz,bz2} (source tarball) git-htmldocs-1.6.1.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.6.1.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are also found in the vicinity. RPMS/$arch/git-*-1.6.1-1.fc9.$arch.rpm (RPM) ---------------------------------------------------------------- GIT v1.6.1 Release Notes ======================== Updates since v1.6.0 -------------------- When some commands (e.g. "git log", "git diff") spawn pager internally, we used to make the pager the parent process of the git command that produces output. This meant that the exit status of the whole thing comes from the pager, not the underlying git command. We swapped the order of the processes around and you will see the exit code from the command from now on. (subsystems) * gitk can call out to git-gui to view "git blame" output; git-gui in turn can run gitk from its blame view. * Various git-gui updates including updated translations. * Various gitweb updates from repo.or.cz installation. * Updates to emacs bindings. (portability) * A few test scripts used nonportable "grep" that did not work well on some platforms, e.g. Solaris. * Sample pre-auto-gc script has OS X support. * Makefile has support for (ancient) FreeBSD 4.9. (performance) * Many operations that are lstat(3) heavy can be told to pre-execute necessary lstat(3) in parallel before their main operations, which potentially gives much improved performance for cold-cache cases or in environments with weak metadata caching (e.g. NFS). * The underlying diff machinery to produce textual output has been optimized, which would result in faster "git blame" processing. * Most of the test scripts (but not the ones that try to run servers) can be run in parallel. * Bash completion of refnames in a repository with massive number of refs has been optimized. * Cygwin port uses native stat/lstat implementations when applicable, which leads to improved performance. * "git push" pays attention to alternate repositories to avoid sending unnecessary objects. * "git svn" can rebuild an out-of-date rev_map file. (usability, bells and whistles) * When you mistype a command name, git helpfully suggests what it guesses you might have meant to say. help.autocorrect configuration can be set to a non-zero value to accept the suggestion when git can uniquely guess. * The packfile machinery hopefully is more robust when dealing with corrupt packs if redundant objects involved in the corruption are available elsewhere. * "git add -N path..." adds the named paths as an empty blob, so that subsequent "git diff" will show a diff as if they are creation events. * "git add" gained a built-in synonym for people who want to say "stage changes" instead of "add contents to the staging area" which amounts to the same thing. * "git apply" learned --include=paths option, similar to the existing --exclude=paths option. * "git bisect" is careful about a user mistake and suggests testing of merge base first when good is not a strict ancestor of bad. * "git bisect skip" can take a range of commits. * "git blame" re-encodes the commit metainfo to UTF-8 from i18n.commitEncoding by default. * "git check-attr --stdin" can check attributes for multiple paths. * "git checkout --track origin/hack" used to be a syntax error. It now DWIMs to create a corresponding local branch "hack", i.e. acts as if you said "git checkout --track -b hack origin/hack". * "git checkout --ours/--theirs" can be used to check out one side of a conflicting merge during conflict resolution. * "git checkout -m" can be used to recreate the initial conflicted state during conflict resolution. * "git cherry-pick" can also utilize rerere for conflict resolution. * "git clone" learned to be verbose with -v * "git commit --author=$name" can look up author name from existing commits. * output from "git commit" has been reworded in a more concise and yet more informative way. * "git count-objects" reports the on-disk footprint for packfiles and their corresponding idx files. * "git daemon" learned --max-connections= option. * "git daemon" exports REMOTE_ADDR to record client address, so that spawned programs can act differently on it. * "git describe --tags" favours closer lightweight tags than farther annotated tags now. * "git diff" learned to mimic --suppress-blank-empty from GNU diff via a configuration option. * "git diff" learned to put more sensible hunk headers for Python, HTML and ObjC contents. * "git diff" learned to vary the a/ vs b/ prefix depending on what are being compared, controlled by diff.mnemonicprefix configuration. * "git diff" learned --dirstat-by-file to count changed files, not number of lines, when summarizing the global picture. * "git diff" learned "textconv" filters --- a binary or hard-to-read contents can be munged into human readable form and the difference between the results of the conversion can be viewed (obviously this cannot produce a patch that can be applied, so this is disabled in format-patch among other things). * "--cached" option to "git diff has an easier to remember synonym "--staged", to ask "what is the difference between the given commit and the contents staged in the index?" * "git for-each-ref" learned "refname:short" token that gives an unambiguously abbreviated refname. * Auto-numbering of the subject lines is the default for "git format-patch" now. * "git grep" learned to accept -z similar to GNU grep. * "git help" learned to use GIT_MAN_VIEWER environment variable before using "man" program. * "git imap-send" can optionally talk SSL. * "git index-pack" is more careful against disk corruption while completing a thin pack. * "git log --check" and "git log --exit-code" passes their underlying diff status with their exit status code. * "git log" learned --simplify-merges, a milder variant of --full-history; "gitk --simplify-merges" is easier to view than with --full-history. * "git log" learned "--source" to show what ref each commit was reached from. * "git log" also learned "--simplify-by-decoration" to show the birds-eye-view of the topology of the history. * "git log --pretty=format:" learned "%d" format element that inserts names of tags that point at the commit. * "git merge --squash" and "git merge --no-ff" into an unborn branch are noticed as user errors. * "git merge -s $strategy" can use a custom built strategy if you have a command "git-merge-$strategy" on your $PATH. * "git pull" (and "git fetch") can be told to operate "-v"erbosely or "-q"uietly. * "git push" can be told to reject deletion of refs with receive.denyDeletes configuration. * "git rebase" honours pre-rebase hook; use --no-verify to bypass it. * "git rebase -p" uses interactive rebase machinery now to preserve the merges. * "git reflog expire branch" can be used in place of "git reflog expire refs/heads/branch". * "git remote show $remote" lists remote branches one-per-line now. * "git send-email" can be given revision range instead of files and maildirs on the command line, and automatically runs format-patch to generate patches for the given revision range. * "git submodule foreach" subcommand allows you to iterate over checked out submodules. * "git submodule sync" subcommands allows you to update the origin URL recorded in submodule directories from the toplevel .gitmodules file. * "git svn branch" can create new branches on the other end. * "gitweb" can use more saner PATH_INFO based URL. (internal) * "git hash-object" learned to lie about the path being hashed, so that correct gitattributes processing can be done while hashing contents stored in a temporary file. * various callers of git-merge-recursive avoid forking it as an external process. * Git class defined in "Git.pm" can be subclasses a bit more easily. * We used to link GNU regex library as a compatibility layer for some platforms, but it turns out it is not necessary on most of them. * Some path handling routines used fixed number of buffers used alternately but depending on the call depth, this arrangement led to hard to track bugs. This issue is being addressed. Fixes since v1.6.0 ------------------ All of the fixes in v1.6.0.X maintenance series are included in this release, unless otherwise noted. * Porcelains implemented as shell scripts were utterly confused when you entered to a subdirectory of a work tree from sideways, following a symbolic link (this may need to be backported to older releases later). * Tracking symbolic links would work better on filesystems whose lstat() returns incorrect st_size value for them. * "git add" and "git update-index" incorrectly allowed adding S/F when S is a tracked symlink that points at a directory D that has a path F in it (we still need to fix a similar nonsense when S is a submodule and F is a path in it). * "git am" after stopping at a broken patch lost --whitespace, -C, -p and --3way options given from the command line initially. * "git diff --stdin" used to take two trees on a line and compared them, but we dropped support for such a use case long time ago. This has been resurrected. * "git filter-branch" failed to rewrite a tag name with slashes in it. * "git http-push" did not understand URI scheme other than opaquelocktoken when acquiring a lock from the server (this may need to be backported to older releases later). * After "git rebase -p" stopped with conflicts while replaying a merge, "git rebase --continue" did not work (may need to be backported to older releases). * "git revert" records relative to which parent a revert was made when reverting a merge. Together with new documentation that explains issues around reverting a merge and merging from the updated branch later, this hopefully will reduce user confusion (this may need to be backported to older releases later). * "git rm --cached" used to allow an empty blob that was added earlier to be removed without --force, even when the file in the work tree has since been modified. * "git push --tags --all $there" failed with generic usage message without telling saying these two options are incompatible. * "git log --author/--committer" match used to potentially match the timestamp part, exposing internal implementation detail. Also these did not work with --fixed-strings match at all. * "gitweb" did not mark non-ASCII characters imported from external HTML fragments correctly. -- 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, This is just a small collections of hooks, scripts, and practices I developed while working on a not-distributed/corporate project. A quick list is: svn-like revision numbers (via tagging every commit) (don't flame me, please), combined ... [More] diff-enabled commit emails*, Hudson hooks, trac hooks, branch locking, same-repo-separate-DAG git server-side config storage and export-on-push, and developer-side push/pull scripts that "just work". http://github.com/stephenh/gc Hopefully others find it as useful. Thanks, Stephen -- 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]

This hopefully will be the last -rc before 1.6.1 becomes your Christmas present. Changes since v1.6.1-rc3 are minor and boring details. Alexander Gavrilov (2): git-gui: Fix handling of relative paths in blame. git-gui: Fix commit ... [More] encoding handling. Arjen Laarhoven (1): Enable threaded delta search on Mac OS X/Darwin Boyd Stephen Smith Jr (1): git-revert documentation: refer to new HOWTO on reverting faulty merges Christian Stimming (3): git-gui: Update German (completed) translation. gitk: Mark forgotten strings (header sentence parts in color chooser) for translation gitk: Update German translation David Aguilar (1): git-mergetool: properly handle "git mergetool -- filename" Fredrik Skolmli (1): git-gui: Starting translation for Norwegian Giuseppe Bilotta (1): gitk: Map / to focus the search box Johannes Schindelin (3): fast-import: close pack before unlinking it git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL fast-export: deal with tag objects that do not have a tagger Johannes Sixt (3): gitk: Use check-buttons' -text property instead of separate labels gitk: Ensure that "Reset branch" menu entry is enabled gitk: Force the focus to the main window on Windows Junio C Hamano (12): git-show: do not segfault when showing a bad tag pager: do not dup2 stderr if it is already redirected gitweb: do not run "git diff" that is Porcelain GIT 1.5.4.7 gitweb: do not run "git diff" that is Porcelain make_absolute_path(): check bounds when seeing an overlong symlink builtin-blame.c: use strbuf_readlink() combine-diff.c: use strbuf_readlink() fast-import: make tagger information optional Make sure lockfiles are unlocked when dying on SIGPIPE send-email: futureproof split_addrs() sub GIT 1.6.1-rc4 Kevin Ballard (1): gitk: Allow unbalanced quotes/braces in commit headers Kirill A. Korinskiy (1): Remove the requirement opaquelocktoken uri scheme Lee Marlow (2): bash completion: Sort config completion variables bash completion: Sync config variables with their man pages Linus Torvalds (5): Add generic 'strbuf_readlink()' helper function Make 'ce_compare_link()' use the new 'strbuf_readlink()' Make 'index_path()' use 'strbuf_readlink()' Make 'diff_populate_filespec()' use the new 'strbuf_readlink()' Make 'prepare_temp_file()' ignore st_size for symlinks Marcel M. Cary (1): git-sh-setup: Fix scripts whose PWD is a symlink into a git work-dir Markus Heidelberg (7): Documentation: fix description for enabling hooks doc/git-reset: add reference to git-stash Documentation: sync example output with git output Documentation: fix typos, grammar, asciidoc syntax Documentation: fix typos, grammar, asciidoc syntax Documentation/git-show-branch: work around "single quote" typesetting glitch doc/git-fsck: change the way for getting heads' SHA1s Michael J Gruber (1): test overlapping ignore patterns Michele Ballabio (1): git gui: update Italian translation Miklos Vajna (4): git-gui: Update Hungarian translation for 0.12 git-daemon documentation: use {tilde} githooks documentation: add a note about the x mode SubmittingPatches: mention the usage of real name in Signed-off-by: lines Nanako Shiraishi (3): git-gui: Update Japanese translation for 0.12 Clarify documentation of "git checkout paths" syntax Add a documentat on how to revert a faulty merge Paul Mackerras (1): gitk: Fix bugs in blaming code Peter Krefting (2): git-gui: Updated Swedish translation (515t0f0u). git-gui: Fixed typos in Swedish translation. René Scharfe (3): Fix type-mismatch compiler warning from diff_populate_filespec() connect.c: stricter port validation, silence compiler warning fast-import.c: stricter strtoul check, silence compiler warning Richard Hartmann (2): Make help entries alphabetical Always show which directory is not a git repository Robin Rosenberg (1): git-revert: record the parent against which a revert was made Shawn O. Pearce (2): git-gui: Update po template to include 'Mirroring %s' message git-gui 0.12 Wu Fengguang (1): git-send-email: handle email address with quoted comma -- 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.0.6 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.6.0.6.tar.{gz,bz2} (source tarball) git-htmldocs-1.6.0.6.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.6.0.6.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are also provided as courtesy. RPMS/$arch/git-*-1.6.0.6-1.fc9.$arch.rpm (RPM) Among miscellaneous fixes, this contains a local gitweb security fix. Maintenance releases for older versions (v1.5.4.7, v1.5.5.6 and v1.5.6.6) are also available at the same place. ---------------------------------------------------------------- Changes since v1.6.0.5 are as follows: David Aguilar (1): git-mergetool: properly handle "git mergetool -- filename" Deskin Miller (1): git-svn: Make following parents atomic Jim Meyering (1): git-config.txt: fix a typo Johannes Schindelin (2): fast-import: close pack before unlinking it fast-export: deal with tag objects that do not have a tagger Junio C Hamano (6): work around Python warnings from AsciiDoc git-show: do not segfault when showing a bad tag pager: do not dup2 stderr if it is already redirected gitweb: do not run "git diff" that is Porcelain GIT 1.5.4.7 fast-import: make tagger information optional Linus Torvalds (1): fsck: reduce stack footprint Markus Heidelberg (1): Documentation: fix typos, grammar, asciidoc syntax Miklos Vajna (1): SubmittingPatches: mention the usage of real name in Signed-off-by: lines Nicolas Pitre (1): make sure packs to be replaced are closed beforehand Wu Fengguang (1): git-send-email: handle email address with quoted comma -- 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]

This is a shameless announcement of my latest personal project; Git Extensions. Git Extensions is a Tortoise-like windows shell extension for git. Yesterday I finished version 0.9, the first stable release. I included about all git commands I know ... [More] about, so I think it is pretty complete but I'm open to suggestions. It is written mostly in C#, except for shell extension part which is written in C . The project is open source, the sources can be found on GitHub. In case there is someone interrested in the sources, be warned; the sources are not very well documented yet and the solution is a still bit messy, I will clean this up very soon. Main features - Shell extensions - Visual studio plugin - Seperate git application Features: - Browse repository (incl. visual graph) - Add files - Apply patch - Checkout branch/revision - Cherry pick - Create branch/tag - Delete branch/tag - Clone - Commit - Create (format) patch - Init new repository - Merge branches - Pull - Push - Run mergetool - Stash - View differences Information about the project and a installer package can be found here: http://sourceforge.net/projects/gitextensions/ The installation requires msysgit to be installed AND git.exe to in the system path. ps. I know there is a TortoiseGit project also, I just didn't know about that at the time I started. If I knew about TortoiseGit, I probably never started writing my own tool. -- View this message in context: http://n2.nabble.com/Announcement:-Git-Extensions-stable-(windows-shell-extensions)-tp1669264p1669264.html Sent from the git mailing list archive at Nabble.com. -- 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 fixed a few more smallish (old) bugs after I tagged this, which will be in 'master' shortly, but it seems that this cycle is stabilizing fairly nicely. Let's have a successful 1.6.1 tagged on 20th. Please hunt and fix bugs until then. ... [More] http://www.kernel.org/pub/software/scm/git/ git-1.6.1-rc3.tar.{gz,bz2} (source tarball) git-htmldocs-1.6.1-rc3.tar.{gz,bz2} (preformatted docs) git-manpages-1.6.1-rc3.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are also there. testing/git-*-1.6.1-rc3-1.fc9.$arch.rpm (RPM) ---------------------------------------------------------------- Changes since v1.6.1-rc2 are as follows: Alexander Gavrilov (1): Documentation: Describe git-gui Tools menu configuration options. Alexander Potashev (2): Fix typos in documentation Fix typo in comment in builtin-add.c Alexey Borzenkov (1): Define linkgit macro in [macros] section Brandon Casey (1): git-branch: display sha1 on branch deletion Deskin Miller (1): git-svn: Make following parents atomic Jakub Narebski (1): gitweb: Fix bug in insert_file() subroutine Jeff King (5): reorder ALLOW_TEXTCONV option setting diff: allow turning on textconv explicitly for plumbing diff: fix handling of binary rewrite diffs diff: respect textconv in rewrite diffs rebase: improve error messages about dirty state Jim Meyering (1): git-config.txt: fix a typo Johannes Schindelin (1): Get rid of the last remnants of GIT_CONFIG_LOCAL Junio C Hamano (4): builtin-checkout.c: check error return from read_cache() read-cache.c: typofix in comment work around Python warnings from AsciiDoc Fix t4031 Linus Torvalds (1): fsck: reduce stack footprint Markus Heidelberg (1): builtin-commit: remove unused message variable Nicolas Pitre (1): make sure packs to be replaced are closed beforehand Ralf Wildenhues (1): Improve language in git-merge.txt and related docs Tor Arvid Lund (1): git-p4: Fix regression in p4Where method. YONETANI Tomokazu (1): git-fast-import possible memory corruption problem -- 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 is porting from TortoiseSVN. It is explore extension. This version just finish a min set of TortoiseSVN porting 1.Context menu(subset of TortoiseSVN) 2.Icon Overlay(version controled\unversion controled at directory) 3.Unified DIFF ... [More] 4.Use third part diff tools (such as kdiff3) 5.Commit change 6.Show Log 7.Create Repository Project Home Page at: http://code.google.com/p/tortoisegit/ Source code at http://repo.or.cz/w/TortoiseGit.git It need msysgit 1.6.0.2. -- 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]

Another week, another rc. There are no outstanding features that should graduate from 'next' anymore until final. http://www.kernel.org/pub/software/scm/git/ git-1.6.1-rc2.tar.{gz,bz2} (source tarball) git-htmldocs-1.6.1-rc2.tar.{gz,bz2} ... [More] (preformatted docs) git-manpages-1.6.1-rc2.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are also there. testing/git-*-1.6.1-rc2-1.fc9.$arch.rpm (RPM) ---------------------------------------------------------------- Changes since v1.6.1-rc1 are as follows: Alex Riesen (3): Make some of fwrite/fclose/write/close failures visible Make chdir failures visible Report symlink failures in merge-recursive Alexander Gavrilov (2): gitk: Make line origin search update the busy status gitk: Add a menu option to start git gui Christian Couder (2): bisect: fix "git bisect skip " and add tests cases Documentation: describe how to "bisect skip" a range of commits Christian Stimming (1): gitk: Update German translation Davide Libenzi (1): xdiff: give up scanning similar lines early Deskin Miller (1): git-svn: Make branch use correct svn-remote Giuseppe Bilotta (2): gitweb: make gitweb_check_feature a boolean wrapper Update comment on gitweb_check/get_feature Jakub Narebski (2): gitweb: Fix handling of non-ASCII characters in inserted HTML files gitweb: Make project specific override for 'grep' feature work Jeff King (2): add stage to gitignore tag: delete TAG_EDITMSG only on successful tag Johannes Sixt (1): t4030-diff-textconv: Make octal escape sequence more portable Junio C Hamano (17): builtin-rm.c: explain and clarify the "local change" logic git add --intent-to-add: fix removal of cached emptiness git add --intent-to-add: do not let an empty blob be committed by accident gitweb: fix 'ctags' feature check and others gitweb: rename gitweb_check_feature to gitweb_get_feature Makefile: introduce NO_PTHREADS Install git-stage in exec-path git-am --whitespace: do not lose the command line option git-am: propagate -C, -p options as well git-am: propagate --3way options as well Test that git-am does not lose -C/-p/--whitespace options git-am: rename apply_opt_extra file to apply-opt Update draft release notes to 1.6.1 GIT 1.6.0.5 Update draft release notes for 1.6.1 Revert "git-stash: use git rev-parse -q" Point "stale" 1.6.0.5 documentation from the main git documentation page Linus Torvalds (1): Add backslash to list of 'crud' characters in real name Mark Burton (1): git-gui: Teach start_push_anywhere_action{} to notice when remote is a mirror. Matt McCutchen (1): "git diff {3,}": do not reverse order of arguments Miklos Vajna (8): User's Manual: remove duplicated url at the end of Appendix B git-stash: use git rev-parse -q filter-branch: use git rev-parse -q lost-found: use git rev-parse -q pull: use git rev-parse -q rebase: use git rev-parse -q submodule: use git rev-parse -q http.c: use 'git_config_string' to get 'curl_http_proxy' Nguyễn Thái Ngọc Duy (1): Extend index to save more flags Paul Mackerras (3): gitk: Fix context menu items for generating diffs when in tree mode gitk: Highlight only when search type is "containing:". gitk: Fix bug in accessing undefined "notflag" variable Scott Chacon (1): Add a built-in alias for 'stage' to the 'add' command Thomas Rast (1): fetch-pack: Avoid memcpy() with src==dst Tor Arvid Lund (1): git-p4: Fix bug in p4Where method. -- 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.0.5 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.6.0.5.tar.{gz,bz2} (source tarball) git-htmldocs-1.6.0.5.tar.{gz,bz2} (preformatted docs) ... [More] git-manpages-1.6.0.5.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are also provided as courtesy. RPMS/$arch/git-*-1.6.0.5-1.fc9.$arch.rpm (RPM) Although we are into 1.6.1-rc cycle, we have accumulated enough fixes to warrant a new maintenance release, so here it is. ---------------------------------------------------------------- GIT v1.6.0.5 Release Notes ========================== Fixes since v1.6.0.4 -------------------- * "git checkout" used to crash when your HEAD was pointing at a deleted branch. * "git checkout" from an un-checked-out state did not allow switching out of the current branch. * "git diff" always allowed GIT_EXTERNAL_DIFF and --no-ext-diff was no-op for the command. * Giving 3 or more tree-ish to "git diff" is supposed to show the combined diff from second and subsequent trees to the first one, but the order was screwed up. * "git fast-export" did not export all tags. * "git ls-files --with-tree=" did not work with options other than -c, most notably with -m. * "git pack-objects" did not make its best effort to honor --max-pack-size option when a single first object already busted the given limit and placed many objects in a single pack. * "git-p4" fast import frontend was too eager to trigger its keyword expansion logic, even on a keyword-looking string that does not have closing '$' on the same line. * "git push $there" when the remote $there is defined in $GIT_DIR/branches/$there behaves more like what cg-push from Cogito used to work. * when giving up resolving a conflicted merge, "git reset --hard" failed to remove new paths from the working tree. * "git tag" did not complain when given mutually incompatible set of options. * The message constructed in the internal editor was discarded when "git tag -s" failed to sign the message, which was often caused by the user not configuring GPG correctly. * "make check" cannot be run without sparse; people may have meant to say "make test" instead, so suggest that. * Internal diff machinery had a corner case performance bug that choked on a large file with many repeated contents. * "git repack" used to grab objects out of packs marked with .keep into a new pack. * Many unsafe call to sprintf() style varargs functions are corrected. * Also contains quite a few documentation updates. ---------------------------------------------------------------- Changes since v1.6.0.4 are as follows: Alexandre Julliard (2): checkout: Don't crash when switching away from an invalid branch. git-submodule: Avoid printing a spurious message. Brandon Casey (12): t7700: demonstrate mishandling of objects in packs with a .keep file packed_git: convert pack_local flag into a bitfield and add pack_keep pack-objects: new option --honor-pack-keep repack: don't repack local objects in packs with .keep file repack: do not fall back to incremental repacking with [-a|-A] builtin-gc.c: use new pack_keep bitfield to detect .keep file existence t7700: demonstrate mishandling of loose objects in an alternate ODB sha1_file.c: split has_loose_object() into local and non-local counterparts pack-objects: extend --local to mean ignore non-local loose objects too t7700: test that 'repack -a' packs alternate packed objects repack: only unpack-unreachable if we are deleting redundant packs revision.c: use proper data type in call to sizeof() within xrealloc Bryan Drewery (1): Fix misleading wording for git-cherry-pick Christian Couder (3): Documentation: rev-list: change a few instances of "git-cmd" to "git cmd" Documentation: bisect: change a few instances of "git-cmd" to "git cmd" Documentation: fix links to "everyday.html" Daniel Lowe (1): Fix non-literal format in printf-style calls Davide Libenzi (1): xdiff: give up scanning similar lines early Jakub Narebski (1): gitweb: Make project specific override for 'grep' feature work Jan Krüger (1): Documentation: git-svn: fix example for centralized SVN clone Jeff King (2): commit: Fix stripping of patch in verbose mode. tag: delete TAG_EDITMSG only on successful tag Joey Hess (1): sha1_file: avoid bogus "file exists" error message Johannes Schindelin (1): fast-export: use an unsorted string list for extra_refs Johannes Sixt (1): compat/mingw.c: Teach mingw_rename() to replace read-only files Junio C Hamano (8): Makefile: help people who run 'make check' by mistake checkout: Fix "initial checkout" detection Start 1.6.0.5 cycle builtin-ls-files.c: coding style fix. Teach ls-files --with-tree= to work with options other than -c Teach "git diff" to honour --[no-]ext-diff Update draft release notes to 1.6.0.5 GIT 1.6.0.5 Linus Torvalds (1): date/time: do not get confused by fractional seconds Martin Koegler (1): git push: Interpret $GIT_DIR/branches in a Cogito compatible way Matt Kraai (1): Remove the period after the git-check-attr summary Matt McCutchen (3): config.txt: alphabetize configuration sections git checkout: don't warn about unborn branch if -f is already passed "git diff {3,}": do not reverse order of arguments Miklos Vajna (3): Add new testcase to show fast-export does not always exports all tags User's Manual: remove duplicated url at the end of Appendix B http.c: use 'git_config_string' to get 'curl_http_proxy' Nguyễn Thái Ngọc Duy (1): generate-cmdlist.sh: avoid selecting synopsis at wrong place Nicolas Pitre (1): Fix pack.packSizeLimit and --max-pack-size handling Pete Wyckoff (1): git-p4: fix keyword-expansion regex Ralf Wildenhues (1): Fix typos in the documentation. SZEDER Gábor (2): bash: remove dashed command leftovers bash: offer refs instead of filenames for 'git revert' Sam Vilain (1): sha1_file.c: resolve confusion EACCES vs EPERM Samuel Tardieu (2): tag: Check that options are only allowed in the appropriate mode tag: Add more tests about mixing incompatible modes and options Stefan Naewe (2): git ls-remote: make usage string match manpage request-pull: make usage string match manpage Thomas Rast (1): fetch-pack: Avoid memcpy() with src==dst -- 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]

git-svn has some bugs where it won't create identical commits in different git-svn copies of the same svn history, despite all relevant configuration being identical; oftentimes, the copies will diverge from each other at some point. My theory for a ... [More] long time was that interrupting git svn fetch could cause this, and it turns out I was right in one case, but since it's not something I could easily interrupt my normal workflow with to do forensics when it occurred, I ended up writing a script to repeatedly fetch from a certain svn repository, and compare refs to a supposedly pristine fetch until the refs diverged or one fetched all the svn history; then, rinse and repeat the process from the beginning. It's available at git://git.deskinm.fdns.net/git-svn-bugfix.git Using this script, r3924 of SVN's svn repository flagged one bug repeatedly, for which I've posted a patch. I'm posting the repo because there are other places where history diverges that I've not had a chance to debug yet, so others should feel free to use the script to find and fix them. If anyone feels inclined, I'll gladly take patches to the script, but I don't really care to handle data or bug reports you generate with it (at least not at this point); I can generate plenty of data myself. Deskin Miller -- 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]