Git

The latest maintenance release Git 1.7.9.6 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 71c5a5acdef77cd8d29a4ae5d4fe7f2889f495b5 ... [More] git-1.7.9.6.tar.gz e744796212ac536ac1b9b1d84e750cb02775ac0f git-htmldocs-1.7.9.6.tar.gz 43441aaa208b1f948f5a006e818a1a34dcda6740 git-manpages-1.7.9.6.tar.gz Also the following public repositories all have a copy of the v1.7.9.6 tag and the maint branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.7.9.6 Release Notes ========================== Fixes since v1.7.9.5 -------------------- * "git merge $tag" to merge an annotated tag always opens the editor during an interactive edit session. v1.7.10 series introduced an environment variable GIT_MERGE_AUTOEDIT to help older scripts decline this behaviour, but the maintenance track should also support it. Also contains minor fixes and documentation updates. ---------------------------------------------------------------- Changes since v1.7.9.5 are as follows: Heiko Voigt (1): string-list: document that string_list_insert() inserts unique strings Junio C Hamano (2): merge: backport GIT_MERGE_AUTOEDIT support Git 1.7.9.6 -- 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 release candidate Git 1.7.10-rc3 is now available for testing at the usual places. New translations and gitk updates are included in this update. Otherwise things are calm. *B* *U* *T* This one has the updates to the "git merge" that was ... [More] discussed a few weeks ago (cf. http://git-blame.blogspot.com/2012/02/anticipating-git-1710.html). You can try this version to make sure you have enough time updating your scripts (and debug your updates to your scripts if needed) before the release happens. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 9d940b9616dc37b06d76d500d59e2bf8c7c4ef8f git-1.7.10.rc3.tar.gz 810d7cdca63c9fa73fdbbfe1e6ab17bfa41b2c0b git-htmldocs-1.7.10.rc3.tar.gz 18962a2078d28d5955a04e79d838e3264d646539 git-manpages-1.7.10.rc3.tar.gz Also the following public repositories all have a copy of the v1.7.10.rc3 tag and the master branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git -------------------------------- Git v1.7.10 Release Notes (draft) ========================= Compatibility Notes ------------------- * From this release on, the "git merge" command in an interactive session will start an editor when it automatically resolves the merge for the user to explain the resulting commit, just like the "git commit" command does when it wasn't given a commit message. If you have a script that runs "git merge" and keeps its standard input and output attached to the user's terminal, and if you do not want the user to explain the resulting merge commits, you can export GIT_MERGE_AUTOEDIT environment variable set to "no", like this: #!/bin/sh GIT_MERGE_AUTOEDIT=no export GIT_MERGE_AUTOEDIT to disable this behaviour (if you want your users to explain their merge commits, you do not have to do anything). Alternatively, you can give the "--no-edit" option to individual invocations of the "git merge" command if you know everybody who uses your script has Git v1.7.8 or newer. * The "--binary/-b" options to "git am" have been a no-op for quite a while and were deprecated in mid 2008 (v1.6.0). When you give these options to "git am", it will now warn and ask you not to use them. * When you do not tell which branches and tags to push to the "git push" command in any way, the command used "matching refs" rule to update remote branches and tags with branches and tags with the same name you locally have. In future versions of Git, this will change to use the "upstream" rule to update the branch at the remote you would "pull" from into your current branch with your local current branch. The release after 1.7.10 will start issuing a warning about this change, to encourage you to tell the command what to push out, e.g. by setting push.default configuration. Updates since v1.7.9 -------------------- UI, Workflows & Features * various "gitk" updates. - show the path to the top level directory in the window title - update preference edit dialog - display file list correctly when directories are given on command line - make "git-describe" output in the log message into a clickable link - avoid matching the UNIX timestamp part when searching all fields - give preference to symbolic font names like sans & monospace - allow comparing two commits using a mark - "gitk" honors log.showroot configuration. * Teams for localizing the messages from the Porcelain layer of commands are starting to form, thanks to Jiang Xin who volunteered to be the localization coordinator. Translated messages for simplified Chinese and Swedish are available. * The configuration mechanism learned an "include" facility; an assignment to the include.path pseudo-variable causes the named file to be included in-place when Git looks up configuration variables. * A content filter (clean/smudge) used to be just a way to make the recorded contents "more useful", and allowed to fail; a filter can now optionally be marked as "required". * Options whose names begin with "--no-" (e.g. the "--no-verify" option of the "git commit" command) can be negated by omitting "no-" from its name, e.g. "git commit --verify". * "git am" learned to pass "-b" option to underlying "git mailinfo", so that a bracketed string other than "PATCH" at the beginning can be kept. * "git clone" learned "--single-branch" option to limit cloning to a single branch (surprise!); tags that do not point into the history of the branch are not fetched. * "git clone" learned to detach the HEAD in the resulting repository when the user specifies a tag with "--branch" (e.g., "--branch=v1.0"). Clone also learned to print the usual "detached HEAD" advice in such a case, similar to "git checkout v1.0". * When showing a patch while ignoring whitespace changes, the context lines are taken from the postimage, in order to make it easier to view the output. * "git diff --stat" learned to adjust the width of the output on wider terminals, and give more columns to pathnames as needed. * "diff-highlight" filter (in contrib/) was updated to produce more aesthetically pleasing output. * "fsck" learned "--no-dangling" option to omit dangling object information. * "git log -G" and "git log -S" learned to pay attention to the "-i" option. With "-i", "log -G" ignores the case when finding patch hunks that introduce or remove a string that matches the given pattern. Similarly with "-i", "log -S" ignores the case when finding the commit the given block of text appears or disappears from the file. * "git merge" in an interactive session learned to spawn the editor by default to let the user edit the auto-generated merge message, to encourage people to explain their merges better. Legacy scripts can export GIT_MERGE_AUTOEDIT=no to retain the historical behavior. Both "git merge" and "git pull" can be given --no-edit from the command line to accept the auto-generated merge message. * The advice message given when the user didn't give enough clue on what to merge to "git pull" and "git merge" has been updated to be more concise and easier to understand. * "git push" learned the "--prune" option, similar to "git fetch". * The whole directory that houses a top-level superproject managed by "git submodule" can be moved to another place. * "git symbolic-ref" learned the "--short" option to abbreviate the refname it shows unambiguously. * "git tag --list" can be given "--points-at " to limit its output to those that point at the given object. * "gitweb" allows intermediate entries in the directory hierarchy that leads to a project to be clicked, which in turn shows the list of projects inside that directory. * "gitweb" learned to read various pieces of information for the repositories lazily, instead of reading everything that could be needed (including the ones that are not necessary for a specific task). * Project search in "gitweb" shows the substring that matched in the project name and description highlighted. * A new script "diffall" is added to contrib/; it drives an external tool to perform a directory diff of two Git revisions in one go, unlike "difftool" that compares one file at a time. Foreign Interface * Improved handling of views, labels and branches in "git-p4" (in contrib). * "git-p4" (in contrib) suffered from unnecessary merge conflicts when p4 expanded the embedded $RCS$-like keywords; it can be now told to unexpand them. * Some "git-svn" updates. * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and support incremental imports. * "git difftool/mergetool" learned to drive DeltaWalker. Performance * Unnecessary calls to parse_object() "git upload-pack" makes in response to "git fetch", have been eliminated, to help performance in repositories with excessive number of refs. Internal Implementation (please report possible regressions) * Recursive call chains in "git index-pack" to deal with long delta chains have been flattened, to reduce the stack footprint. * Use of add_extra_ref() API is now gone, to make it possible to cleanly restructure the overall refs API. * The command line parser of "git pack-objects" now uses parse-options API. * The test suite supports the new "test_pause" helper function. * Parallel to the test suite, there is a beginning of performance benchmarking framework. * t/Makefile is adjusted to prevent newer versions of GNU make from running tests in seemingly random order. * The code to check if a path points at a file beyond a symbolic link has been restructured to be thread-safe. * When pruning directories that has become empty during "git prune" and "git prune-packed", call closedir() that iterates over a directory before rmdir() it. Also contains minor documentation updates and code clean-ups. Fixes since v1.7.9 ------------------ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance releases are contained in this release (see release notes to them for details). * Build with NO_PERL_MAKEMAKER was broken and Git::I18N did not work with versions of Perl older than 5.8.3. (merge 5eb660e ab/perl-i18n later to maint). * "git tag -s" honored "gpg.program" configuration variable since 1.7.9, but "git tag -v" and "git verify-tag" didn't. (merge a2c2506 az/verify-tag-use-gpg-config later to maint). * "configure" script learned to take "--with-sane-tool-path" from the command line to record SANE_TOOL_PATH (used to avoid broken platform tools in /usr/bin) in config.mak.autogen. This may be useful for people on Solaris who have saner tools outside /usr/xpg[46]/bin. * zsh port of bash completion script needed another workaround. -- 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.7.9.5 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 33f5a5b0b6c8f8addbbec0b042731c44fd79f90c ... [More] git-1.7.9.5.tar.gz a88baa35440033263a4f52b258f2f76cb6f87731 git-htmldocs-1.7.9.5.tar.gz 37a162c22127adc82ce9fb75aacddb6428c565da git-manpages-1.7.9.5.tar.gz Also the following public repositories all have a copy of the v1.7.9.5 tag and the maint branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.7.9.5 Release Notes ========================== Fixes since v1.7.9.4 -------------------- * When "git config" diagnoses an error in a configuration file and shows the line number for the offending line, it miscounted if the error was at the end of line. * "git fast-import" accepted "ls" command with an empty path by mistake. * Various new-ish output decoration modes of "git grep" were not documented in the manual's synopsis section. * The "remaining" subcommand to "git rerere" was not documented. * "gitweb" used to drop warnings in the log file when "heads" view is accessed in a repository whose HEAD does not point at a valid branch. Also contains minor fixes and documentation updates. ---------------------------------------------------------------- Changes since v1.7.9.4 are as follows: Jakub Narebski (1): gitweb: Fix actionless dispatch for non-existent objects Jonathan Nieder (2): fast-import: leakfix for 'ls' of dirty trees fast-import: don't allow 'ls' of path with empty components Junio C Hamano (2): i18n of multi-line advice messages Git 1.7.9.5 Kirill Smelkov (1): t/Makefile: Use $(sort ...) explicitly where needed Mark Lodato (1): grep doc: add --break / --heading / -W to synopsis Martin Stenberg (1): config: report errors at the EOL with correct line number Nelson Benitez Leon (1): documentation: fix alphabetic ordered list for git-rebase man page Phil Hord (1): rerere: Document 'rerere remaining' Rodrigo Silva (MestreLion) (1): Documentation: improve description of GIT_EDITOR and preference order -- 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 release candidate Git 1.7.10-rc2 is now available for testing at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: b32514ad69bb3100b6b5038bc88798d56ebe1e1d ... [More] git-1.7.10.rc2.tar.gz f66bc63ed3e98df6c7ad205e06878e9cfc9084fc git-htmldocs-1.7.10.rc2.tar.gz 130601149f97e9414467bb3d6a722aa37b8205af git-manpages-1.7.10.rc2.tar.gz Also the following public repositories all have a copy of the v1.7.10.rc2 tag and the master branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git Git v1.7.10 Release Notes (draft) ========================= Compatibility Notes ------------------- * From this release on, the "git merge" command in an interactive session will start an editor when it automatically resolves the merge for the user to explain the resulting commit, just like the "git commit" command does when it wasn't given a commit message. If you have a script that runs "git merge" and keeps its standard input and output attached to the user's terminal, and if you do not want the user to explain the resulting merge commits, you can export GIT_MERGE_AUTOEDIT environment variable set to "no", like this: #!/bin/sh GIT_MERGE_AUTOEDIT=no export GIT_MERGE_AUTOEDIT to disable this behaviour (if you want your users to explain their merge commits, you do not have to do anything). Alternatively, you can give the "--no-edit" option to individual invocations of the "git merge" command if you know everybody who uses your script has Git v1.7.8 or newer. * The "--binary/-b" options to "git am" have been a no-op for quite a while and were deprecated in mid 2008 (v1.6.0). When you give these options to "git am", it will now warn and ask you not to use them. * When you do not tell which branches and tags to push to the "git push" command in any way, the command used "matching refs" rule to update remote branches and tags with branches and tags with the same name you locally have. In future versions of Git, this will change to use the "upstream" rule to update the branch at the remote you would "pull" from into your current branch with your local current branch. The release after 1.7.10 will start issuing a warning about this change, to encourage you to tell the command what to push out, e.g. by setting push.default configuration. Updates since v1.7.9 -------------------- UI, Workflows & Features * Teams for localizing the messages from the Porcelain layer of commands are starting to form, thanks to Jiang Xin who volunteered to be the localization coordinator. An initial set of translated messages for simplified chinese is available. * The configuration mechanism learned an "include" facility; an assignment to the include.path pseudo-variable causes the named file to be included in-place when Git looks up configuration variables. * A content filter (clean/smudge) used to be just a way to make the recorded contents "more useful", and allowed to fail; a filter can now optionally be marked as "required". * Options whose names begin with "--no-" (e.g. the "--no-verify" option of the "git commit" command) can be negated by omitting "no-" from its name, e.g. "git commit --verify". * "git am" learned to pass "-b" option to underlying "git mailinfo", so that a bracketed string other than "PATCH" at the beginning can be kept. * "git clone" learned "--single-branch" option to limit cloning to a single branch (surprise!); tags that do not point into the history of the branch are not fetched. * "git clone" learned to detach the HEAD in the resulting repository when the user specifies a tag with "--branch" (e.g., "--branch=v1.0"). Clone also learned to print the usual "detached HEAD" advice in such a case, similar to "git checkout v1.0". * When showing a patch while ignoring whitespace changes, the context lines are taken from the postimage, in order to make it easier to view the output. * "git diff --stat" learned to adjust the width of the output on wider terminals, and give more columns to pathnames as needed. * "diff-highlight" filter (in contrib/) was updated to produce more aesthetically pleasing output. * "fsck" learned "--no-dangling" option to omit dangling object information. * "git log -G" and "git log -S" learned to pay attention to the "-i" option. With "-i", "log -G" ignores the case when finding patch hunks that introduce or remove a string that matches the given pattern. Similarly with "-i", "log -S" ignores the case when finding the commit the given block of text appears or disappears from the file. * "git merge" in an interactive session learned to spawn the editor by default to let the user edit the auto-generated merge message, to encourage people to explain their merges better. Legacy scripts can export GIT_MERGE_AUTOEDIT=no to retain the historical behavior. Both "git merge" and "git pull" can be given --no-edit from the command line to accept the auto-generated merge message. * The advice message given when the user didn't give enough clue on what to merge to "git pull" and "git merge" has been updated to be more concise and easier to understand. * "git push" learned the "--prune" option, similar to "git fetch". * The whole directory that houses a top-level superproject managed by "git submodule" can be moved to another place. * "git symbolic-ref" learned the "--short" option to abbreviate the refname it shows unambiguously. * "git tag --list" can be given "--points-at " to limit its output to those that point at the given object. * "gitweb" allows intermediate entries in the directory hierarchy that leads to a project to be clicked, which in turn shows the list of projects inside that directory. * "gitweb" learned to read various pieces of information for the repositories lazily, instead of reading everything that could be needed (including the ones that are not necessary for a specific task). * Project search in "gitweb" shows the substring that matched in the project name and description highlighted. * A new script "diffall" is added to contrib/; it drives an external tool to perform a directory diff of two Git revisions in one go, unlike "difftool" that compares one file at a time. Foreign Interface * Improved handling of views, labels and branches in "git-p4" (in contrib). * "git-p4" (in contrib) suffered from unnecessary merge conflicts when p4 expanded the embedded $RCS$-like keywords; it can be now told to unexpand them. * Some "git-svn" updates. * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and support incremental imports. * "git difftool/mergetool" learned to drive DeltaWalker. Performance * Unnecessary calls to parse_object() "git upload-pack" makes in response to "git fetch", have been eliminated, to help performance in repositories with excessive number of refs. Internal Implementation (please report possible regressions) * Recursive call chains in "git index-pack" to deal with long delta chains have been flattened, to reduce the stack footprint. * Use of add_extra_ref() API is now gone, to make it possible to cleanly restructure the overall refs API. * The command line parser of "git pack-objects" now uses parse-options API. * The test suite supports the new "test_pause" helper function. * Parallel to the test suite, there is a beginning of performance benchmarking framework. * t/Makefile is adjusted to prevent newer versions of GNU make from running tests in seemingly random order. * The code to check if a path points at a file beyond a symbolic link has been restructured to be thread-safe. * When pruning directories that has become empty during "git prune" and "git prune-packed", call closedir() that iterates over a directory before rmdir() it. Also contains minor documentation updates and code clean-ups. Fixes since v1.7.9 ------------------ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance releases are contained in this release (see release notes to them for details). * Build with NO_PERL_MAKEMAKER was broken and Git::I18N did not work with versions of Perl older than 5.8.3. (merge 5eb660e ab/perl-i18n later to maint). * "git fast-import" accepted "ls" command with an empty path by mistake. (merge 178e1de jn/maint-fast-import-empty-ls later to maint). * The "remaining" subcommand to "git rerere" was not documented. (merge 3e7a1df ph/rerere-doc later to maint). * "git tag -s" honored "gpg.program" configuration variable since 1.7.9, but "git tag -v" and "git verify-tag" didn't. (merge a2c2506 az/verify-tag-use-gpg-config later to maint). * When "git config" diagnoses an error in a configuration file and shows the line number for the offending line, it miscounted if the error was at the end of line. (merge 4b34059 ms/maint-config-error-at-eol-linecount later to maint). * "configure" script learned to take "--sane-tool-path" from the command line to record SANE_TOOL_PATH (used to avoid broken platform tools in /usr/bin) in config.mak-autogen. This may be useful for people on Solaris who have saner tools outside /usr/xpg[46]/bin. * zsh port of bash completion script needed another workaround. * "gitweb" used to drop warnings in the log file when "heads" view is accessed in a repository whose HEAD does not point at a valid branch. ---------------------------------------------------------------- Changes since v1.7.10-rc1 are as follows: Alex Merry (1): contrib/completion: "local var=()" is misinterpreted as func-decl by zsh D Waitzman (1): Documentation/gitweb: trivial English fixes Jonathan Nieder (2): fast-import: leakfix for 'ls' of dirty trees fast-import: don't allow 'ls' of path with empty components Junio C Hamano (4): fetch/receive: remove over-pessimistic connectivity check Update draft release notes to 1.7.10 .mailmap: unify various old mail addresses of gitster Git 1.7.10-rc2 Stefano Lattarini (1): configure: allow user to prevent $PATH "sanitization" on Solaris Tim Henigan (7): Documentation/diff-options: reword description of --submodule option contrib/diffall: comment actual reason for 'cdup' contrib/diffall: create tmp dirs without mktemp contrib/diffall: eliminate use of tar contrib/diffall: eliminate duplicate while loops contrib/diffall: fix cleanup trap on Windows Documentation/difftool: add deltawalker to list of valid diff tools Ævar Arnfjörð Bjarmason (2): Git::I18N: compatibility with perl <5.8.3 perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER -- 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 bugfix release of cgit (a web interface to git repositories) is now available from http://hjemli.net/git/cgit. Thanks to everyone who contributed! $ git shortlog v0.9.0.2..v0.9.0.3 Eric Wong (2): ui-ssdiff.c: correct length check for LCS ... [More] table segfault fix on some bogus requests Georg Müller (1): ui-log.c: do not show remote heads if enable-remote-branches=0 Jamie Couture (2): ui-ssdiff: move LCS table away from the stack use correct type for sizeof John Keeping (1): Fix segmentation fault in empty repository Lars Hjemli (2): Makefile: fetch git tarballs from http://hjemli.net/git/git/ CGIT-0.9.0.3 Lukas Fleischer (2): Remove dead initialization in cgit_parse_commit() Fix potential XSS vulnerability in rename hint Norberto Lopes (1): fix css color value and vertical-align value Tim Chen (1): Fix diff mode switching when side-by-side-diffs=1 Tobias Grimm (1): Add sort parameter to pager of repo list [Less]

A release candidate Git 1.7.10-rc1 is now available for testing at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 6080456a4410c65d43e79f22b5ea1b1c200b6823 ... [More] git-1.7.10.rc1.tar.gz 6f5106ee2bfb6d813a8b5a20d9caf069ea0110b4 git-htmldocs-1.7.10.rc1.tar.gz 617a1d178c9736365ef5451d45c6f0a469c071cc git-manpages-1.7.10.rc1.tar.gz Also the following public repositories all have a copy of the v1.7.10.rc1 tag and the master branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git ---------------------------------------------------------------- Changes since v1.7.10-rc0 are as follows: Alex Zepeda (1): verify-tag: Parse GPG configuration options. Jakub Narebski (1): gitweb: Fix fixed string (non-regexp) project search Jens Lehmann (3): submodules: always use a relative path to gitdir submodules: always use a relative path from gitdir to work tree submodules: refactor computation of relative gitdir path Jiang Xin (3): l10n: Update zh_CN translation for 1.7.9.2 l10n: Update git.pot (1 new message) l10n: Update zh_CN translation for 1.7.10-rc0 Johannes Sixt (1): submodules: fix ambiguous absolute paths under Windows Junio C Hamano (7): Update draft release notes to 1.7.10 t0204: clarify the "observe undefined behaviour" test i18n: fix auto detection of gettext scheme for shell scripts Git 1.7.9.4 Update draft release notes to 1.7.10 before -rc1 am: officially deprecate -b/--binary option Git 1.7.10-rc1 Karsten Blees (1): fix deletion of .git/objects sub-directories in git-prune/repack Martin Stenberg (1): config: report errors at the EOL with correct line number Peter Krefting (2): po/sv.po: add Swedish translation Update Swedish translation (732t0f0u). Phil Hord (1): rerere: Document 'rerere remaining' Thomas Rast (4): perf: load test-lib-functions from the correct directory perf: export some important test-lib variables p4000: use -3000 when promising -3000 git-am: error out when seeing -b/--binary Thynson (7): l10n: Improve zh_CN translation for lines insertion and deletion. l10n: Improve zh_CN translation for msg about branch deletion deny l10n: Improve zh_CN translation for empty cherry-pick msg. l10n: Improve zh_CN translation for msg that make empty commit when amend. l10n: Improve commit msg for zh_CN translation l10n: Improve zh_CN trans for msg that cannot fast-forward l10n: Improve zh_CN translation for msg "not something we can merge" Vincent van Ravesteijn (3): Documentation/git-branch: cleanups Documentation/git-branch: fix a typo Documentation/git-branch: add default for --contains -- 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 wrote a Web Application called Git::Webby. This project is a Smart-HTTP server handler and has developed using Sinatra and aims replace the original "git-http-backend" including new features. The main goal of the Git-Webby is ... [More] implement the following useful features. * Smart-HTTP, based on git-http-backend. * Authentication flexible based on database or configuration file like .htpasswd and .htgroup. * API to get information about repository. If you have interest, please, see the repository hosted on Github (http://github.com/codigorama/git-webby). Feedback is welcome. Thanks, Hallison Batista -- 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.7.9.4 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 05d2ff75ffd3356516d096f992b4fb3b8b6c0079 ... [More] git-1.7.9.4.tar.gz 4d8b27a244969a707e83f6699fd00c322ff0ad5e git-htmldocs-1.7.9.4.tar.gz 833dc143d2d296754d681c57b41a008ff433b225 git-manpages-1.7.9.4.tar.gz Also the following public repositories all have a copy of the v1.7.9.4 tag and the maint branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git ---------------------------------------------------------------- Changes since v1.7.9.3 are as follows: Jakub Narebski (1): gitweb: Fix fixed string (non-regexp) project search Junio C Hamano (6): am -3: allow nonstandard -p option test: "am -3" can accept non-standard -p t4011: modernise style t4011: illustrate "diff-index -p" on stat-dirty paths diff -p: squelch "diff --git" header for stat-dirty paths Git 1.7.9.4 Thomas Rast (5): t5510: refactor bundle->pack conversion t5510: ensure we stay in the toplevel test dir bundle: keep around names passed to add_pending_object() Document the --histogram diff option t5704: fix nonportable sed/grep usages -- 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]

L10n team leaders, It time to update your locale files to the new git.pot for Git 1.7.10-rc0. A new "po/git.pot" file is generated in the l10 coordinator repository: https://github.com/git-l10n/git-po/ Updates for this new revision since ... [More] last update: * Add 1 new l10n string in the new generated "git.pot" file at line: 191 In order to update your locale files, l10n team leaders should pull from the l10 coordinator repository: https://github.com/git-l10n/git-po/ And then update your locale files, make a commit and push to the forked repository for your l10n team. Update locale file use this command: msgmerge --add-location --backup=off -U XX.po git.pot (A upcoming helper program will wrap the gettext commands, and make this step easy.) HELPER_SCRIPT XX.po After pushed the commits with new translations to your forked repository of your l10n team, please send a pull request to the 10n coordinator repository on GitHub. But before that it is helpful to check your locale file and new commits as follows: * Do a syntax check on XX.po msgfmt -o /dev/null --check --statistics XX.po or HELPER_SCRIPT check[XX.po] * Check your commit log, to prevent non-ascii characters in the commit log without a valid embed encoding setting. The upcoming HELPER script can help: HELPER_SCRIPT commits[origin/master,HEAD] -- Jiang Xin -- 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 release candidate Git 1.7.10-rc0 is now available for testing at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 96d1d25fd4f681246009b24fcaa4e41d88223f5b ... [More] git-1.7.10.rc0.tar.gz a8c76f12980a287e0f6a0f285768ab492caaed98 git-htmldocs-1.7.10.rc0.tar.gz 8f5f8aa4f692eb3d6e3549f6eb0fb0b5419c2f57 git-manpages-1.7.10.rc0.tar.gz Also the following public repositories all have a copy of the v1.7.10.rc0 tag and the master branch that the tag points at: url = git://repo.or.cz/alt-git.git url = https://code.google.com/p/git-core/ url = git://git.sourceforge.jp/gitroot/git-core/git.git url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core url = https://github.com/gitster/git The other day, soon after announcement of the 1.7.9.3 maintenance release, there was a report that some tests did not pass on one platform. Even though it is better than not seeing one, such a late report saddens us, especially because the exact test breakage has been in the master and next branches for quite some time for people to catch before it goes to any released versions. Please test this and later pre-releases to make sure no such late report has to come for the upcoming 1.7.10 final. Thanks. Git v1.7.10 Release Notes (draft) ========================= Compatibility Notes ------------------- * From this release on, the "git merge" command in an interactive session will start an editor when it automatically resolves the merge for the user to explain the resulting commit, just like the "git commit" command does when it wasn't given a commit message. If you have a script that runs "git merge" and keeps its standard input and output attached to the user's terminal, and if you do not want the user to explain the resulting merge commits, you can export GIT_MERGE_AUTOEDIT environment variable set to "no", like this: #!/bin/sh GIT_MERGE_AUTOEDIT=no export GIT_MERGE_AUTOEDIT to disable this behaviour (if you want your users to explain their merge commits, you do not have to do anything). Alternatively, you can give the "--no-edit" option to individual invocations of the "git merge" command if you know everybody who uses your script has Git v1.7.8 or newer. Updates since v1.7.9 -------------------- UI, Workflows & Features * Teams for localizing the messages from the Porcelain layer of commands are starting to form, thanks to Jiang Xin who volunteered to be the localization coordinator. An initial set of translated messages for simplified chinese is available. * The configuration mechanism learned an "include" facility; an assignment to the include.path pseudo-variable causes the named file to be included in-place when Git looks up configuration variables. * A content filter (clean/smudge) used to be just a way to make the recorded contents "more useful", and allowed to fail; a filter can new optionally be marked as "required". * Options whose names begin with "--no-" (e.g. the "--no-verify" option of the "git commit" command) can be negated by omitting "no-" from its name, e.g. "git commit --verify". * "git am" learned to pass "-b" option to underlying "git mailinfo", so that bracketed string other than "PATCH" at the beginning can be kept. * "git clone" learned "--single-branch" option to limit cloning to a single branch (surprise!). * "git clone" learned to detach the HEAD in the resulting repository when the source repository's HEAD does not point to a branch. * When showing a patch while ignoring whitespace changes, the context lines are taken from the postimage, in order to make it easier to view the output. * "git diff --stat" learned to adjust the width of the output on wider terminals, and give more columns to pathnames as needed. * "diff-highlight" filter (in contrib/) was updated to produce more aesthetically pleasing output. * "fsck" learned "--no-dangling" option to omit dangling object information. * "git log -G" learned to pay attention to the "-i" option and can find patch hunks that introduce or remove a string that matches the given pattern ignoring the case. * "git merge" in an interactive session learned to spawn the editor by default to let the user edit the auto-generated merge message, to encourage people to explain their merges better. Legacy scripts can export GIT_MERGE_AUTOEDIT=no to retain the historical behavior. Both "git merge" and "git pull" can be given --no-edit from the command line to accept the auto-generated merge message. * The advise message given when the user didn't give enough clue on what to merge to "git pull" and "git merge" has been updated to be more concise and easier to understand. * "git push" learned the "--prune" option, similar to "git fetch". * "git symbolic-ref" learned the "--short" option to abbreviate the refname it shows unambiguously. * "git tag --list" can be given "--points-at " to limit its output to those that point at the given object. * "gitweb" allows intermediate entries in the directory hierarchy that leads to a projects to be clicked, which in turn shows the list of projects inside that directory. * "gitweb" learned to read various pieces of information for the repositories lazily, instead of reading everything that could be needed (including the ones that are not necessary for a specific task). * Project search in "gitweb" shows the substring that matched in the project name and description highlighted. Foreign Interface * Improved handling of views, labels and branches in "git-p4" (in contrib). * "git-p4" (in contrib) suffered from unnecessary merge conflicts when p4 expanded the embedded $RCS$-like keywords; it can be now told to unexpand them. * Some "git-svn" updates. * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and support incremental imports. * "git difftool/mergetool" learned to drive DeltaWalker. Performance * Unnecessary calls to parse_object() "git upload-pack" makes in response to "git fetch", have been eliminated, to help performance in repositories with excessive number of refs. Internal Implementation (please report possible regressions) * Recursive call chains in "git index-pack" to deal with long delta chains have been flattened, to reduce the stack footprint. * Use of add_extra_ref() API is now gone, to make it possible to cleanly restructure the overall refs API. * The command line parser of "git pack-objects" now uses parse-options API. * The test suite supports the new "test_pause" helper function. * Parallel to the test suite, there is a beginning of performance benchmarking framework. * t/Makefile is adjusted to prevent newer versions of GNU make from running tests in seemingly random order. * The code to check if a path points at a file beyond a symbolic link has been restructured to be thread-safe. Also contains minor documentation updates and code clean-ups. Fixes since v1.7.9 ------------------ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance releases are contained in this release (see release notes to them for details). * "git bundle" did not record boundary commits correctly when there are many of them. (merge efe4be1 tr/maint-bundle-boundary later to maint). * "git diff-index" and its friends at the plumbing level showed the "diff --git" header and nothing else for a path whose cached stat info is dirty without actual difference when asked to produce a patch. This was a longstanding bug that we could have fixed long time ago. (merge b3f01ff jc/maint-diff-patch-header later to maint). * The code to synthesize the fake ancestor tree used by 3-way merge fallback in "git am" was not prepared to read a patch created with a non-standard -p value. (merge a61ba26 jc/am-3-nonstandard-popt later to maint). * "gitweb" used to drop warnings in the log file when "heads" view is accessed in a repository whose HEAD does not point at a valid branch. -- 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]