Skip to content
Commits on Jan 13, 2011
  1. @gitster

    Git 1.7.4-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 13, 2011
  2. @gitster

    Merge branch 'jn/gitweb-no-logo'

    * jn/gitweb-no-logo:
      gitweb: make logo optional
    gitster committed Jan 13, 2011
  3. @gitster

    Merge branch 'jn/perl-funcname'

    * jn/perl-funcname:
      userdiff/perl: catch BEGIN/END/... and POD as headers
      diff: funcname and word patterns for perl
    gitster committed Jan 13, 2011
  4. @gitster

    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
    gitster committed Jan 13, 2011
  5. @gitster

    Merge branch 'rj/svn-test'

    * rj/svn-test:
      lib-git-svn.sh: Move web-server handling code into separate function
    gitster committed Jan 13, 2011
  6. @gitster

    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
    gitster committed Jan 13, 2011
  7. @gitster

    Merge branch 'jk/diff-driver-binary-doc'

    * jk/diff-driver-binary-doc:
      docs: explain diff.*.binary option
    gitster committed Jan 13, 2011
  8. @gitster

    Merge branch 'jn/t9010-work-around-broken-svnadmin'

    * jn/t9010-work-around-broken-svnadmin:
      t9010: svnadmin can fail even if available
    gitster committed Jan 13, 2011
  9. @gitster

    Merge branch 'tr/submodule-relative-scp-url'

    * tr/submodule-relative-scp-url:
      submodule: fix relative url parsing for scp-style origin
    gitster committed Jan 13, 2011
  10. @mjg @gitster

    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>
    mjg committed with gitster Jan 13, 2011
  11. @trast @gitster

    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_OPTS=-v, or with
    prove ./t0000-basic.sh :: -v
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Jan 13, 2011
  12. @gitster

    Merge branch 'maint'

    * maint:
      commit: suggest --amend --reset-author to fix commiter identity
    gitster committed Jan 12, 2011
Commits on Jan 12, 2011
  1. @moy @gitster

    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>
    moy committed with gitster Jan 12, 2011
Commits on Jan 11, 2011
  1. @gitster

    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>
    Ramsay Jones committed with gitster Jan 10, 2011
Commits on Jan 10, 2011
  1. @gitster

    Merge branch 'maint'

    * maint:
      Documentation/githooks: post-rewrite-copy-notes never existed
      Documentation/git-archive: spell --worktree-attributes correctly
    gitster committed Jan 10, 2011
  2. @gitster

    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
    gitster committed Jan 10, 2011
  3. @gitster

    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
    gitster committed Jan 10, 2011
  4. @gitster

    Merge branch 'maint-1.7.0' into maint-1.7.1

    * maint-1.7.0:
      Documentation/git-archive: spell --worktree-attributes correctly
    gitster committed Jan 10, 2011
  5. @peff @gitster

    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.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Jan 9, 2011
  6. @jrn @gitster

    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 and the test t9010 only uses svn to check
    its work.  This points to two possible improvements:
    
     - do not disable most vcs-svn tests if svn is missing.
     - skip validation rather than failing it when svn fails.
    
    Bring about both by putting the svn invocations into a single test that
    builds a repo to compare the test-svn-fe result against.  The test will
    always pass but only will set the new SVNREPO test prereq if svn succeeds;
    and validation using that repo gets an SVNREPO prerequisite so it only
    runs with working svn installations.
    
    Works-around: http://bugs.debian.org/608925
    Noticed-by: A Large Angry SCM <gitzilla@gmail.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    jrn committed with gitster Jan 6, 2011
  7. @trast @gitster

    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>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Jan 10, 2011
  8. @trast @gitster

    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..." sentence
    unless they ship a sample hook in either templates or contrib, we
    simply remove the whole paragraph.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Jan 10, 2011
  9. @trast @gitster

    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>
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    trast committed with gitster Jan 10, 2011
Commits on Jan 9, 2011
  1. @gitster

    Merge branch 'maint'

    * maint:
      Mark gitk script executable
    gitster committed Jan 8, 2011
  2. @gitster

    t4135-*.sh: Skip the "backslash" tests on cygwin

    The BSLASHPSPEC tests (11-13) fail on cygwin, since you can't
    create files containing an backslash character in the name.
    In order to skip these tests, we simply stop (incorrectly)
    asserting the BSLASHPSPEC prerequisite in test-lib.sh.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ramsay Jones committed with gitster Dec 14, 2010
  3. @gitster

    t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW

    By default grep reads in text mode and converts CRLF into LF line
    endings, which causes tests 4, 6 and 8 to fail. In a similar manner
    to commit a94114a  (Do not strip CR when grepping HTTP headers,
    2010-09-12), we set (and export) the GREP_OPTIONS variable to -U so
    that grep will use binary mode.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ramsay Jones committed with gitster Dec 14, 2010
  4. @gitster

    t3032-*.sh: Pass the -b (--binary) option to sed on cygwin

    The test using the conflict_hunks helper function (test 9) fails
    on cygwin, since sed (by default) throws away the CR from CRLF
    line endings. This behaviour is undesirable, since the validation
    code expects the CRLF line-ending to be present. In order to fix
    the problem we pass the -b (--binary) option to sed, using the
    SED_OPTIONS variable. We use the SED_STRIPS_CR prerequisite in the
    conditional initialisation of SED_OPTIONS.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ramsay Jones committed with gitster Dec 14, 2010
  5. @gitster

    t6038-*.sh: Pass the -b (--binary) option to sed on cygwin

    The tests using the fuzz_conflict helper function (tests 5-6)
    fail on cygwin in the same way they used to on MinGW, prior
    to commit ca02ad3. The solution is also the same; passing the
    -b (--binary) option to sed, using the SED_OPTIONS variable.
    We introduce a new prerequisite SED_STRIPS_CR to use in the
    conditional initialisation of SED_OPTIONS, rather than MINGW.
    The new prerequisite is set in test-lib.sh for both MinGW and
    Cygwin.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ramsay Jones committed with gitster Dec 14, 2010
  6. @andersk @gitster

    Mark gitk script executable

    The executable bit on gitk-git/gitk was lost (accidentally it seems) by
    commit 62ba514.  Put it back, so that
    gitk can be run directly from a git.git checkout.
    
    Note that the script is already executable in gitk.git, just not in
    git.git.
    
    Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    andersk committed with gitster Jan 6, 2011
Commits on Jan 7, 2011
  1. t9157-*.sh: Add an svn version check

    Acked-by: Eric Wong <normalperson@yhbt.net>
    Acked-by: Steven Walter <stevenrwalter@gmail.com>
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Ramsay Jones committed with Eric Wong Jan 6, 2011
  2. @stepb

    git svn: fix the final example in man page

    'git-remote add' creates a remote.origin.fetch entry in the config, we
    want to replace this entry rather than add another one (which will
    cause 'git fetch' to error).
    
    This adds 'git config --remove-section remote.origin' after the fetch
    for encouraging users to only use "git svn" for future updates.
    
    [ew: rewording of commit message for present tense]
    
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: StephenB <mail4stb@gmail.com>
    stepb committed with Eric Wong Jan 6, 2011
Commits on Jan 6, 2011
  1. @drafnel @gitster

    t3032: limit sed branch labels to 8 characters

    POSIX leaves as unspecified the handling of labels greater than 8
    characters.  Apparently, Sun decided to treat them as errors.  Make sed on
    Solaris happy by trimming the length of labels to 8 characters.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Jan 5, 2011
  2. @drafnel @gitster

    t0001,t1510,t3301: use sane_unset which always returns with status 0

    On some shells (like /usr/xpg4/bin/sh on Solaris), unset will exit
    non-zero when passed the name of a variable that has not been set.  Use
    sane_unset instead so that the return value of unset can be ignored while
    the && linkage of the test script can be preserved.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Jan 5, 2011
  3. @drafnel @gitster

    trace.c: ensure NULL is not passed to printf

    GNU printf, and many others, will print the string "(null)" if a NULL
    pointer is passed as the argument to a "%s" format specifier.  Some
    implementations (like on Solaris) do not detect a NULL pointer and will
    produce a segfault in this case.
    
    So, fix this by ensuring that pointer variables do not contain the value
    NULL.  Assign the string "(null)" to the variables are NULL.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Jan 5, 2011
Commits on Jan 5, 2011
  1. @gitster

    Git 1.7.4-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jan 5, 2011
Something went wrong with that request. Please try again.