1. Stefan Saasen
  2. git

Commits

Author Commit Message Date Builds
Jonathan Nieder
remote-ext: do not segfault for blank lines Instead of stripping space characters past the beginning of the line and overflowing a buffer, stop at the beginning of the line (mimicking the corresponding fix in remote-fd). The argument to isspace does not need to be cast explicitly because git isspace takes care of that already. Noticed-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by:…
Jonathan Nieder
Documentation/fast-import: capitalize beginning of sentence Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder
ll-merge: simplify opts == NULL case As long as sizeof(struct ll_merge_options) is small, there is not much reason not to keep a copy of the default merge options in the BSS section. In return, we get clearer code and one less stack frame in the opts == NULL case. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Git 1.7.4-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.4-rc2
Junio C Hamano
Merge branch 'jn/gitweb-no-logo' * jn/gitweb-no-logo: gitweb: make logo optional
Junio C Hamano
Merge branch 'jn/perl-funcname' * jn/perl-funcname: userdiff/perl: catch BEGIN/END/... and POD as headers diff: funcname and word patterns for perl
Junio C Hamano
Merge branch 'sr/gitweb-hilite-more' * sr/gitweb-hilite-more: gitweb: remove unnecessary test when closing file descriptor gitweb: add extensions to highlight feature map
Junio C Hamano
Merge branch 'rj/svn-test' * rj/svn-test: lib-git-svn.sh: Move web-server handling code into separate function
Junio C Hamano
Merge branch 'rj/test-fixes' * rj/test-fixes: t4135-*.sh: Skip the "backslash" tests on cygwin t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW t3032-*.sh: Pass the -b (--binary) option to sed on cygwin t6038-*.sh: Pass the -b (--binary) option to sed on cygwin Conflicts: t/t3032-merge-recursive-options.sh
Junio C Hamano
Merge branch 'jk/diff-driver-binary-doc' * jk/diff-driver-binary-doc: docs: explain diff.*.binary option
Junio C Hamano
Merge branch 'jn/t9010-work-around-broken-svnadmin' * jn/t9010-work-around-broken-svnadmin: t9010: svnadmin can fail even if available
Junio C Hamano
Merge branch 'tr/submodule-relative-scp-url' * tr/submodule-relative-scp-url: submodule: fix relative url parsing for scp-style origin
Michael J Gruber
RelNotes/1.7.4: minor fixes Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast
t0000: quote TAP snippets in test code t0000 contains two snippets of actual test output. This causes problems when passing -v to the test[*]: the test infrastructure echoes the tests before running them, and the TAP parser then sees this test output and concludes that two tests failed and that the TAP output was badly formatted. Guard against this by quoting the output in the source. [*] either by running 'make smoke' with GIT_TEST…
Junio C Hamano
Merge branch 'maint' * maint: commit: suggest --amend --reset-author to fix commiter identity
Matthieu Moy
commit: suggest --amend --reset-author to fix commiter identity Since the message advises to fix the configuration first, the advantage of using this command is that it is cut-and-paste ready, while using --author='...' requires the user to type his name and email again. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones
t9157-*.sh: Make the svn version check more precise These tests require an svn version 1.5 or newer to run correctly. In particular, all 1.4.x versions and earlier are too old, so fix up the case label regex to cover this range exactly. [Fix provided by Anders Kaseorg <andersk@MIT.EDU>] Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alexey Shumkin
userdiff: match Pascal class methods Class declarations were already covered by the second pattern, but class methods have the 'class' keyword in front too. Account for it. Signed-off-by: Alexey Shumkin <zapped@mail.ru> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt
t/README: hint about using $(pwd) rather than $PWD in tests This adds just a "do it this way" instruction without a lot of explanation, because the details are too complex to be explained at this point. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Sixt
Fix expected values of setup tests on Windows On Windows, bash stores absolute path names in shell variables in POSIX format that begins with a slash, rather than in drive-letter format; such a value is converted to the latter format when it is passed to a non-MSYS program such as git. When an expected test value is constructed, it must contain the value that will be produced by git, which will be in the drive-letter format. But TRASH_DIRECT…
Junio C Hamano
Merge branch 'maint' * maint: Documentation/githooks: post-rewrite-copy-notes never existed Documentation/git-archive: spell --worktree-attributes correctly
Junio C Hamano
Merge branch 'maint-1.7.2' into maint * maint-1.7.2: Documentation/githooks: post-rewrite-copy-notes never existed Documentation/git-archive: spell --worktree-attributes correctly
Junio C Hamano
Merge branch 'maint-1.7.1' into maint-1.7.2 * maint-1.7.1: Documentation/githooks: post-rewrite-copy-notes never existed Documentation/git-archive: spell --worktree-attributes correctly
Junio C Hamano
Merge branch 'maint-1.7.0' into maint-1.7.1 * maint-1.7.0: Documentation/git-archive: spell --worktree-attributes correctly
Jeff King
docs: explain diff.*.binary option This was added long ago as part of the userdiff refactoring for textconv, as internally it made the code simpler and cleaner. However, there was never a concrete use case for actually using the config variable. Now that Matthieu Moy has provided such a use case, it's easy to explain it using his example. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.f…
Jonathan Nieder
t9010: svnadmin can fail even if available If svn is built against one version of SQLite and run against another, libsvn_subr needlessly errors out in operations that need to make a commit. That is clearly not a bug in git but let us consider the ramifications for the test suite. git-svn uses libsvn directly and is probably broken by that bug; it is right for git-svn tests to fail. The vcs-svn lib, on the other hand, does not use libsvn…
Thomas Rast
submodule: fix relative url parsing for scp-style origin The function resolve_relative_url was not prepared to deal with an scp-style origin 'user@host:path' in the case where 'path' is only a single component. Fix this by extending the logic that strips one path component from the $remoteurl. Also add tests for both styles of URLs. Noticed-by: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch> …
Thomas Rast
Documentation/githooks: post-rewrite-copy-notes never existed The documentation for the post-rewrite hook contains a paragraph from its early development, where the automatic notes copying facilities were not part of the series and thus this had to be a hook. Later versions of the series implemented notes copying as a core feature. Thus mentioning post-rewrite-copy-notes was never correct. As the other hooks do not have a "there is no default hook, but...…
Thomas Rast
Documentation/git-archive: spell --worktree-attributes correctly The --worktree-attributes option was correctly documented in ba053ea (archive: do not read .gitattributes in working directory, 2009-04-18). However, later in 9b4c8b0 (archive documentation: attributes are taken from the tree by default, 2010-02-10) the misspelling "--work-tree-attributes" was used to refer to it. Fix this. Noticed-by: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com> Sig…
Junio C Hamano
Merge branch 'maint' * maint: Mark gitk script executable
  1. Prev
  2. Next