Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Jan 6, 2011
  1. Brandon Casey Junio C Hamano

    t3032: limit sed branch labels to 8 characters

    drafnel authored gitster committed
    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>
  2. Brandon Casey Junio C Hamano

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

    drafnel authored gitster committed
    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>
  3. Brandon Casey Junio C Hamano

    trace.c: ensure NULL is not passed to printf

    drafnel authored gitster committed
    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>
Commits on Jan 5, 2011
  1. Junio C Hamano

    Git 1.7.4-rc1

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Junio C Hamano
  3. Junio C Hamano

    Git 1.7.3.5

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Junio C Hamano

    Merge branch 'jn/svn-fe' (early part)

    gitster authored
    * 'jn/svn-fe' (early part):
      vcs-svn: Error out for v3 dumps
    
    Conflicts:
    	t/t9010-svn-fe.sh
  5. Junio C Hamano

    Merge branch 'ao/t9001-fix'

    gitster authored
    * ao/t9001-fix:
      t/t9001-send-email.sh: fix '&&' chain in some tests
  6. Junio C Hamano

    Merge branch 'pw/convert-pathname-substitution'

    gitster authored
    * pw/convert-pathname-substitution:
      t0021: avoid getting filter killed with SIGPIPE
      convert filter: supply path to external driver
  7. Junio C Hamano

    Merge branch 'mg/cvsimport'

    gitster authored
    * mg/cvsimport:
      cvsimport: handle the parsing of uppercase config options
      cvsimport: partial whitespace cleanup
Commits on Jan 4, 2011
  1. Sylvain Rabot Junio C Hamano

    gitweb: remove unnecessary test when closing file descriptor

    sylr authored gitster committed
    It happens that closing file descriptor fails whereas the blob is
    perfectly readable.  According to perlman the reasons could be:
    
       If the file handle came from a piped open, "close" will additionally
       return false if one of the other system calls involved fails, or if the
       program exits with non-zero status.  (If the only problem was that the
       program exited non-zero, $! will be set to 0.)  Closing a pipe also waits
       for the process executing on the pipe to complete, in case you want to
       look at the output of the pipe afterwards, and implicitly puts the exit
       status value of that command into $?.
    
       Prematurely closing the read end of a pipe (i.e. before the process writ-
       ing to it at the other end has closed it) will result in a SIGPIPE being
       delivered to the writer.  If the other end can't handle that, be sure to
       read all the data before closing the pipe.
    
    In this case we don't mind that close fails.
    
    Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Sylvain Rabot Junio C Hamano

    gitweb: add extensions to highlight feature map

    sylr authored gitster committed
    added: sql, php5, phps, bash, zsh, ksh, mk, make
    
    Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Antonio Ospite Junio C Hamano

    t/t9001-send-email.sh: fix '&&' chain in some tests

    ao2 authored gitster committed
    t/README recommends chaining test assertions.
    
    Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Junio C Hamano

    lib-git-svn.sh: Move web-server handling code into separate function

    Ramsay Jones authored gitster committed
    This library file is currently sourced by 57 test files, of which
    only four may (optionally) start a web-server in order to access
    the svn repo via an http url, rather than a file url.
    
    In addition to isolating the current web-server handling code from
    the majority of tests, in a new prepare_httpd function, we also
    add some more error checking and reporting code to validate the
    apache installation. Only those tests which attempt to start the
    web-server, by calling start_httpd, will execute this code.
    
    Note that it is important for start_httpd to return an error
    indication, if prepare_httpd fails, so that the failure to use
    the web-server, as requested by the user, should not go unnoticed.
    (Unless the svnrepo variable is set to an http url at the end of
    start_httpd, the remaining tests will use file urls, without
    comment.)
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Michael J Gruber Junio C Hamano

    cvsimport: handle the parsing of uppercase config options

    mjg authored gitster committed
    The current code leads to
    
      fatal: bad config value for 'cvsimport.r' in .git/config
    
    for a standard use case with cvsimport.r set.
    
    cvsimport sets internal variables by checking the config for each
    possible command line option. The problem is that config items are case
    insensitive, so config.r and config.R are the same. The ugly error is
    due to that fact that cvsimport expects a bool for -R (and thus
    config.R) but a remote name for -r (and thus config.r).
    
    Fix this by making cvsimport expect long names for uppercase options.
    
    config options for cvsimport have been undocumented so far, though
    present in the code and advertised in several tutorials. So one may read
    "enhance" for "fix". Similarly, the names for the options are
    "documented" in the code, waitiing for their lowercase equivalents to be
    transformed into long config options, as well.
    
    Helped-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Junio C Hamano

    Merge branch 'maint'

    gitster authored
    * maint:
      gitweb: skip logo in atom feed when there is none
      t9001: Fix test prerequisites
  7. jrn Junio C Hamano

    daemon: support <directory> arguments again

    jrn authored gitster committed
    Ever since v1.7.4-rc0~125^2~8 (daemon: use run-command api for async
    serving, 2010-11-04), git daemon spawns child processes instead of
    forking to serve requests.  The child processes learn that they are
    being run for this purpose from the presence of the --serve command
    line flag.
    
    When running with <ok_path> arguments, the --serve flag is treated
    as one of the path arguments and the special child behavior does
    not kick in.  So the child becomes an ordinary git daemon process,
    notices that all the addresses it needs are in use, and exits with
    the message "fatal: unable to allocate any listen sockets on port
    9418".
    
    Fix it by putting --serve at the beginning of the command line,
    where the flag cannot be mistaken for a path argument.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Erik Faye-Lund <kusmabite@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Junio C Hamano

    Fix typos in the documentation

    Ralf Wildenhues authored gitster committed
    Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. jrn Junio C Hamano

    gitweb: make logo optional

    jrn authored gitster committed
    Some sites may not want to have a logo at all.
    
    While at it, use $cgi->img to simplify this code.  (CGI.pm learned
    most HTML4 tags by version 2.79, so this should be portable to perl
    5.8, though I haven't tested.)
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. jrn Junio C Hamano

    gitweb: skip logo in atom feed when there is none

    jrn authored gitster committed
    With v1.5.0-rc0~169 (gitweb: Fix Atom feed <logo>: it is $logo,
    not $logo_url, 2006-12-04), the logo URI to be written to Atom
    feeds was corrected but the case of no logo forgotten.
    
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 29, 2010
  1. Robin H. Johnson Junio C Hamano

    t9001: Fix test prerequisites

    robbat2 authored gitster committed
    Add in missing Perl prerequisites for new tests of send-email.
    
    Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 28, 2010
  1. Junio C Hamano

    Git 1.7.4-rc0

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Junio C Hamano

    Merge branch 'maint'

    gitster authored
    * maint:
      Prepare for 1.7.3.5
      Fix false positives in t3404 due to SHELL=/bin/false
      close file on error in read_mmfile()
    
    Conflicts:
    	RelNotes
  3. Junio C Hamano

    Prepare for 1.7.3.5

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Junio C Hamano

    Merge branch 'jk/commit-die-on-bogus-ident' into maint

    gitster authored
    * jk/commit-die-on-bogus-ident:
      commit: die before asking to edit the log message
      ident: die on bogus date format
  5. Junio C Hamano

    Merge branch 'ks/blame-worktree-textconv-cached' into maint

    gitster authored
    * ks/blame-worktree-textconv-cached:
      fill_textconv(): Don't get/put cache if sha1 is not valid
      t/t8006: Demonstrate blame is broken when cachetextconv is on
  6. Junio C Hamano

    Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint

    gitster authored
    * jc/maint-rebase-rewrite-last-skip:
      rebase --skip: correctly wrap-up when skipping the last patch
  7. Junio C Hamano

    Merge branch 'jc/maint-am-abort-safely' into maint

    gitster authored
    * jc/maint-am-abort-safely:
      am --abort: keep unrelated commits since the last failure and warn
  8. Junio C Hamano

    Merge branch 'kb/maint-status-cquote' into maint

    gitster authored
    * kb/maint-status-cquote:
      status: Quote paths with spaces in short format
  9. Brandon Casey Junio C Hamano

    t9001: use older Getopt::Long boolean prefix '--no' rather than '--no-'

    drafnel authored gitster committed
    The '--no-chain-reply-to' option is a Getopt::Long boolean option. The
    '--no-' prefix (as in --no-chain-reply-to) for boolean options is not
    supported in Getopt::Long version 2.32 which was released with Perl 5.8.0.
    This version only supports '--no' as in '--nochain-reply-to'.  More recent
    versions of Getopt::Long, such as version 2.34, support either prefix. So
    use the older form in the tests.
    
    See also:
    
    907a0b1
    84eeb68
    3fee1fe
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. Junio C Hamano

    Merge branch 'jc/maint-rebase-rewrite-last-skip'

    gitster authored
    * jc/maint-rebase-rewrite-last-skip:
      rebase --skip: correctly wrap-up when skipping the last patch
  11. Junio C Hamano

    Merge branch 'nd/setup'

    gitster authored
    * nd/setup: (47 commits)
      setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd
      git.txt: correct where --work-tree path is relative to
      Revert "Documentation: always respect core.worktree if set"
      t0001: test git init when run via an alias
      Remove all logic from get_git_work_tree()
      setup: rework setup_explicit_git_dir()
      setup: clean up setup_discovered_git_dir()
      t1020-subdirectory: test alias expansion in a subdirectory
      setup: clean up setup_bare_git_dir()
      setup: limit get_git_work_tree()'s to explicit setup case only
      Use git_config_early() instead of git_config() during repo setup
      Add git_config_early()
      git-rev-parse.txt: clarify --git-dir
      t1510: setup case #31
      t1510: setup case #30
      t1510: setup case #29
      t1510: setup case #28
      t1510: setup case #27
      t1510: setup case #26
      t1510: setup case #25
      ...
  12. Robin H. Johnson Junio C Hamano

    Fix false positives in t3404 due to SHELL=/bin/false

    robbat2 authored gitster committed
    If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's
    package building), the git-rebase exec tests will fail, because they call
    $SHELL around the command, and in the existing testcase, $SHELL was not being
    cleared sufficently.
    
    This lead to false positive failures of t3404 on systems where the package
    build user was locked down as noted above.
    
    Signed-off-by: "Robin H. Johnson" <robbat2@gentoo.org>
    X-Gentoo-Bug: 349083
    X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=349083
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 27, 2010
  1. Junio C Hamano

    userdiff/perl: catch BEGIN/END/... and POD as headers

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. jrn Junio C Hamano

    diff: funcname and word patterns for perl

    jrn authored gitster committed
    The default function name discovery already works quite well for Perl
    code... with the exception of here-documents (or rather their ending).
    
     sub foo {
    	print <<END
     here-document
     END
    	return 1;
     }
    
    The default funcname pattern treats the unindented END line as a
    function declaration and puts it in the @@ line of diff and "grep
    --show-function" output.
    
    With a little knowledge of perl syntax, we can do better.  You can
    try it out by adding "*.perl diff=perl" to the gitattributes file.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.