Skip to content
Commits on Jul 7, 2010
  1. @gitster

    Git 1.7.2-rc2

    gitster committed Jul 7, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'ab/tap'

    gitster committed Jul 7, 2010
    * ab/tap:
      t/README: document more test helpers
      t/README: proposed rewording...
      t/README: Document the do's and don'ts of tests
      t/README: Add a section about skipping tests
      t/README: Document test_expect_code
      t/README: Document test_external*
      t/README: Document the prereq functions, and 3-arg test_*
      t/README: Typo: paralell -> parallel
      t/README: The trash is in 't/trash directory.$name'
      t/t9700/test.pl: don't access private object members, use public access methods
      t9700: Use Test::More->builder, not $Test::Builder::Test
      tests: Say "pass" rather than "ok" on empty lines for TAP
      tests: Skip tests in a way that makes sense under TAP
      test-lib: output a newline before "ok" under a TAP harness
      test-lib: Make the test_external_* functions TAP-aware
      test-lib: Adjust output to be valid TAP format
  3. @gitster

    Merge branch 'maint'

    gitster committed Jul 7, 2010
    * maint:
      backmerge a few more fixes to 1.7.1.X series
      rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
      fix git branch -m in presence of cross devices
    
    Conflicts:
    	RelNotes
    	builtin/rev-parse.c
  4. @gitster

    backmerge a few more fixes to 1.7.1.X series

    gitster committed Jul 7, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @gitster

    Merge branch 'maint-1.6.4' into maint

    gitster committed Jul 7, 2010
    * maint-1.6.4:
      rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
  6. @gitster

    rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option

    Uwe Kleine-König committed with gitster Jul 6, 2010
    The ?: operator has a lower priority than |, so the implicit associativity
    made the 6th argument of parse_options be PARSE_OPT_KEEP_DASHDASH if
    keep_dashdash was true discarding PARSE_OPT_STOP_AT_NON_OPTION and
    PARSE_OPT_SHELL_EVAL.
    
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @gitster

    Merge branch 'mg/doc-rev-parse-treepath-syntax' into maint

    gitster committed Jul 7, 2010
    * mg/doc-rev-parse-treepath-syntax:
      git-rev-parse.txt: Add more examples for caret and colon
      git-rev-parse.txt: Document ":path" specifier
  8. @gitster

    Merge branch 'tr/receive-pack-aliased-update-fix' into maint

    gitster committed Jul 7, 2010
    * tr/receive-pack-aliased-update-fix:
      check_aliased_update: strcpy() instead of strcat() to copy
      receive-pack: detect aliased updates which can occur with symrefs
      receive-pack: switch global variable 'commands' to a parameter
    
    Conflicts:
    	t/t5516-fetch-push.sh
  9. @gitster

    fix git branch -m in presence of cross devices

    Pierre Habouzit committed with gitster Jul 7, 2010
    When you have for example a bare repository stored on NFS, and that you
    create new workdirs locally (using contrib's git-new-workdir), logs/refs
    is a symlink to a different device. Hence when the reflogs are renamed,
    all must happen below logs/refs or one gets cross device rename errors
    like:
    
      git branch -m foo
      error: unable to move logfile logs/refs/heads/master to tmp-renamed-log: Invalid cross-device link
      fatal: Branch rename failed
    
    The fix is hence to use logs/refs/.tmp-renamed-log as a temporary log
    name, instead of just tmp-renamed-log.
    
    Signed-off-by: Pierre Habouzit <madcoder@debian.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. @drafnel @gitster

    t/t0006: specify timezone as EST5 not EST to comply with POSIX

    drafnel committed with gitster Jul 6, 2010
    POSIX requires that both the timezone "standard" and "offset" be specified
    in the TZ environment variable.  This causes a problem on IRIX which does
    not understand the timezone 'EST'.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. @gitster

    Merge branch 'maint'

    gitster committed Jul 6, 2010
    * maint:
      add missing && to submodule-merge testcase
      test-date: fix sscanf type conversion
  12. @gitster

    add missing && to submodule-merge testcase

    Heiko Voigt committed with gitster Jul 6, 2010
    Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. @jrn @gitster

    t/README: document more test helpers

    jrn committed with gitster Jul 6, 2010
    There is no documentation in t/README for test_must_fail,
    test_might_fail, test_cmp, or test_when_finished.
    
    Reported-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 6, 2010
  1. @peff @gitster

    test-date: fix sscanf type conversion

    peff committed with gitster Jul 6, 2010
    Reading into a time_t isn't portable, since we don't know
    the exact type. Instead, use an unsigned long, which is what
    show_date wants, anyway.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'maint'

    gitster committed Jul 5, 2010
    * maint:
      xdiff: optimise for no whitespace difference when ignoring whitespace.
  3. @dgreid @gitster

    xdiff: optimise for no whitespace difference when ignoring whitespace.

    dgreid committed with gitster Jul 5, 2010
    In xdl_recmatch, do the memcmp to check if the two lines are equal before
    checking if whitespace flags are set.  If the lines are identical, then
    there is no need to check if they differ only in whitespace.
    This makes the common case (there is no whitespace difference) faster.
    It costs the case where lines are the same length and contain
    whitespace differences, but the common case is more than 20% faster.
    
    Signed-off-by: Dylan Reid <dgreid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 5, 2010
  1. @jnareb @gitster

    gitweb: Move evaluate_gitweb_config out of run_request

    jnareb committed with gitster Jul 5, 2010
    Move evaluate_gitweb_config() and evaluate_git_version() out of
    run_request() to run(), making them not run one for each request.
    This changes how git behaves in FastCGI case.
    
    This change makes it impossible to have config which changes with
    request, but I don't think anyone relied on such (hidden action)
    behavior.
    
    While at it, reset timer and number of git commands at beginning of
    run_request() in new reset_timer() subroutine.  This fixes case when
    gitweb was run using FastCGI interface: time is reported for request,
    and not for single run of gitweb script.  This changes slightly
    behavior in non-FastCGI case: the number of git commands reported is
    1 less (running `git --version` one per gitweb is not counted now).
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @peff @gitster

    parse_date: fix signedness in timezone calculation

    peff committed with gitster Jul 4, 2010
    When no timezone is specified, we deduce the offset by
    subtracting the result of mktime from our calculated
    timestamp.
    
    However, our timestamp is stored as an unsigned integer,
    meaning we perform the subtraction as unsigned. For a
    negative offset, this means we wrap to a very high number,
    and our numeric timezone is in the millions of hours. You
    can see this bug by doing:
    
       $ TZ=EST \
         GIT_AUTHOR_DATE='2010-06-01 10:00' \
         git commit -a -m foo
       $ git cat-file -p HEAD | grep author
       author Jeff King <peff@peff.net> 1275404416 +119304128
    
    Instead, we should perform this subtraction as a time_t, the
    same type that mktime returns.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'maint'

    gitster committed Jul 5, 2010
    * maint:
      t0006: test timezone parsing
      rerere.txt: Document forget subcommand
      Documentation/git-gc.txt: add reference to githooks
  4. @peff @gitster

    t0006: test timezone parsing

    peff committed with gitster Jul 4, 2010
    Previously, test-date simply ignored the parsed timezone and
    told show_date() to use UTC. Instead, let's print out what
    we actually parsed.
    
    While we're at it, let's make it easy for tests to work in a specific
    timezone.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. @mjg @gitster

    rerere.txt: Document forget subcommand

    mjg committed with gitster Jul 5, 2010
    dea4562 (rerere forget path: forget recorded resolution, 2009-12-25)
    introduced the forget subcommand for rerere.
    
    Document it.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. @gitster

    t/README: proposed rewording...

    gitster committed Jul 5, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. @avar @gitster

    t/README: Document the do's and don'ts of tests

    avar committed with gitster Jul 2, 2010
    Add a "Do's, don'ts & things to keep in mind" subsection to the
    "Writing Tests" documentation. Much of this is based on Junio C
    Hamano's "Test your stuff" section in
    <7vhbkj2kcr.fsf@alter.siamese.dyndns.org>.
    
    I turned it into a list of do's and don'ts to make it easier to skim
    it, and integrated my note that a TAP harness will get confused if you
    print "ok" or "not ok" at the beginning of a line.
    
    Thad had to be fixed in 335f878 when
    TAP support was introduced.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @avar @gitster

    t/README: Add a section about skipping tests

    avar committed with gitster Jul 2, 2010
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @avar @gitster

    t/README: Document test_expect_code

    avar committed with gitster Jul 2, 2010
    test_expect_code (which was introduced in d3bfdb7) never had any
    documentation.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. @avar @gitster

    t/README: Document test_external*

    avar committed with gitster Jul 2, 2010
    There was do documentation for the test_external_without_stderr and
    test_external functions.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. @avar @gitster

    t/README: Document the prereq functions, and 3-arg test_*

    avar committed with gitster Jul 2, 2010
    There was no documentation for the test_set_prereq and
    test_have_prereq functions, or the three-arg form of
    test_expect_success and test_expect_failure.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. @avar @gitster

    t/README: Typo: paralell -> parallel

    avar committed with gitster Jul 2, 2010
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. @avar @gitster

    t/README: The trash is in 't/trash directory.$name'

    avar committed with gitster Jul 2, 2010
    There's a unique trash directory for each test, not a single directory
    as the previous documentation suggested.
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 2, 2010
  1. @cpackham @gitster

    Documentation/git-gc.txt: add reference to githooks

    cpackham committed with gitster Jun 30, 2010
    This advertises the existence of the 'pre-auto-gc' hook and adds a cross
    reference to where the hook is documented.
    
    Signed-off-by: Chris Packham <judge.packham@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Updates from the list to 1.7.2 Release Notes

    gitster committed Jul 2, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 30, 2010
  1. @gitster

    Git 1.7.2-rc1

    gitster committed Jun 30, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    git.spec.in: Add gitweb subpackage

    gitster committed Jun 30, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    Merge branch 'ar/decorate-color'

    gitster committed Jun 30, 2010
    * ar/decorate-color:
      Add test for correct coloring of git log --decoration
      Allow customizable commit decorations colors
      log --decorate: Colorize commit decorations
      log-tree.c: Use struct name_decoration's type for classifying decoration
      commit.h: add 'type' to struct name_decoration
  4. @gitster

    Merge branch 'mg/doc-rev-parse-treepath-syntax'

    gitster committed Jun 30, 2010
    * mg/doc-rev-parse-treepath-syntax:
      git-rev-parse.txt: Add more examples for caret and colon
      git-rev-parse.txt: Document ":path" specifier
Something went wrong with that request. Please try again.