Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.10-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.10-rc2
Junio C Hamano
.mailmap: unify various old mail addresses of gitster "git shortlog -s -e" should show a single current address with this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'am/completion-zsh-fix' * am/completion-zsh-fix: contrib/completion: "local var=()" is misinterpreted as func-decl by zsh
Junio C Hamano
Merge branch 'dw/gitweb-doc-grammo' Typofix. * dw/gitweb-doc-grammo: Documentation/gitweb: trivial English fixes
D Waitzman
Documentation/gitweb: trivial English fixes Change "it's" to "its" where a possessive is intended. Also add two missing "the" that were noticed by Ben Walton. Signed-off-by: David Waitzman <djw@bbn.com>
Alex Merry
contrib/completion: "local var=()" is misinterpreted as func-decl by zsh Certain versions of zsh seems to treat local var=() as a function declaration, rather than an assignment of an empty array, although its documentation does not suggest that this should be the case. With zsh 4.3.15 on Fedora Core 15, this causes __git_ps1 " (%s)" to trigger an error message: local:2: command not found: svn_url_pattern when GIT_PS1_SHOWUPSTREAM="auto". Signed-off-by:…
Junio C Hamano
Merge branch 'maint' * maint:
Junio C Hamano
Merge branch 'maint-1.7.8' into maint * maint-1.7.8: t/Makefile: Use $(sort ...) explicitly where needed gitweb: Fix actionless dispatch for non-existent objects i18n of multi-line advice messages
Junio C Hamano
Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8 * ks/sort-wildcard-in-makefile: t/Makefile: Use $(sort ...) explicitly where needed
Junio C Hamano
Merge branch 'jc/advise-i18n' into maint-1.7.8 * jc/advise-i18n: i18n of multi-line advice messages
Junio C Hamano
Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8 * jn/gitweb-unspecified-action: gitweb: Fix actionless dispatch for non-existent objects
Junio C Hamano
Merge branch 'ab/perl-i18n' * ab/perl-i18n: perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER Git::I18N: compatibility with perl <5.8.3
Ævar Arnfjörð Bjarmason
perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER When I added the i18n infrastructure in v1.7.8-rc2-1-g5e9637c I forgot to install Git::I18N also when NO_PERL_MAKEMAKER=YesPlease was set. Change the generation of the fallback perl.mak file to do that. Now Git/I18N.pm is installed alongside Git.pm in such a way that anything that uses GITPERLLIB will find it. Reported-by: Tom G. Christensen <tgc@statsbiblioteket.dk> Signed-off-by: Ævar Arnfjörð…
Junio C Hamano
Update draft release notes to 1.7.10 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'th/mergetools-deltawalker' * th/mergetools-deltawalker: Documentation/difftool: add deltawalker to list of valid diff tools
Junio C Hamano
Merge branch 'jc/maint-verify-objects-remove-pessimism' The code to validate the history connectivity between old refs and new refs used by fetch and receive-pack, introduced in 1.7.8, was grossly inefficient and unnecessarily tried to re-validate integrity of individual objects. This essentially reverts that performance regression. * jc/maint-verify-objects-remove-pessimism: fetch/receive: remove over-pessimistic connectivity check
Junio C Hamano
Merge branch 'sl/customize-sane-tool-path' * sl/customize-sane-tool-path: configure: allow user to prevent $PATH "sanitization" on Solaris
Junio C Hamano
Merge "two fixes for fast-import's 'ls' command" from Jonathan Andrew Sayers noticed that the svn-fe | git fast-import pipeline mishandles a subversion history that copies the root directory to a sub-directory (e.g. doing `svn cp . trunk` to standardise your layout). As David Barr explained, the bug arises when the following command is sent to git fast-import: 'ls' SP ':1' SP LF Instead of reading back what is at the root of r1, it unconditionally report…
Junio C Hamano
Merge branch 'th/git-diffall' * th/git-diffall: contrib/diffall: fix cleanup trap on Windows contrib/diffall: eliminate duplicate while loops contrib/diffall: eliminate use of tar contrib/diffall: create tmp dirs without mktemp contrib/diffall: comment actual reason for 'cdup'
Junio C Hamano
Merge branch 'th/doc-diff-submodule-option' * th/doc-diff-submodule-option: Documentation/diff-options: reword description of --submodule option
Junio C Hamano
fetch/receive: remove over-pessimistic connectivity check Git 1.7.8 introduced an object and history re-validation step after "fetch" or "push" causes new history to be added to a receiving repository. This is to protect a malicious server or pushing client from corrupting the repository by taking advantage of an existing corrupt object that is unconnected to existing history. But this check is way over-pessimistic. During "fetch" or "receive-pack" (th…
Tim Henigan
Documentation/difftool: add deltawalker to list of valid diff tools deltawalker has been supported since 284a126c3ef3, but was not added to the list of valid diff tools reported by 'git difftool --help'. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.10-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.10-rc1
Tim Henigan
contrib/diffall: fix cleanup trap on Windows Prior to this commit, the cleanup trap that removes the tmp dir created by the script would fail on Windows. The error was silently ignored by the script. On Windows, a directory cannot be removed while it is the working directory of the process (thanks to Johannes Sixt on the Git list for this info [1]). This commit eliminates the 'cd' into the tmp directory that caused the error. [1]: http://…
Tim Henigan
contrib/diffall: eliminate duplicate while loops There were 3 instances of a 'while read; do' that used identical logic to populate '/tmp/right_dir'. This commit groups them into a single loop. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tim Henigan
contrib/diffall: eliminate use of tar The 'tar' utility is not available on all platforms (some only support 'gnutar'). An earlier commit created a work-around for this problem, but a better solution is to eliminate the use of 'tar' completely. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tim Henigan
contrib/diffall: create tmp dirs without mktemp mktemp is not available on all platforms. Instead of littering the code with a work-around, this commit replaces mktemp with a one-line Perl script. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tim Henigan
contrib/diffall: comment actual reason for 'cdup' The comment from an earlier commit did not reflect the actual reason this operation is needed. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tim Henigan
Documentation/diff-options: reword description of --submodule option The previous description was confusing. This rewrite makes it easier to understand. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/i18n-shell-script-gettext' The auto detection was testing if a fixed string that is known to be non-empty is empty by mistake. * jc/i18n-shell-script-gettext: i18n: fix auto detection of gettext scheme for shell scripts
  1. Prev
  2. Next