Commits on Jul 15, 2016
  1. @gitster

    archive-tar: huge offset and future timestamps would not work on 32-bit

    As we are not yet moving everything to size_t but still using ulong
    internally when talking about the size of object, platforms with
    32-bit long will not be able to produce tar archive with 4GB+ file,
    and cannot grok 077777777777UL as a constant.  Disable the extended
    header feature and do not test it on them.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 14, 2016
  2. @gitster

    Sync with 2.9.2

    * maint:
      Git 2.9.2
      t0006: skip "far in the future" test when unsigned long is not long enough
    gitster committed Jul 15, 2016
  3. @gitster

    Git 2.9.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 15, 2016
  4. @gitster

    Merge branch 'jk/tzoffset-fix' into maint

    Skip tests that are unrunnable on platforms without 64-bit long
    to avoid unnecessary test failures.
    
    * jk/tzoffset-fix:
      t0006: skip "far in the future" test when unsigned long is not long enough
    gitster committed Jul 15, 2016
  5. @peff @gitster

    t0006: skip "far in the future" test when unsigned long is not long e…

    …nough
    
    Git's source code refers to timestamps as unsigned longs.  On 32-bit
    platforms, as well as on Windows, unsigned long is not large enough
    to capture dates that are "absurdly far in the future".
    
    While we can fix this issue properly by replacing unsigned long with
    a larger type, we want to be a bit more conservative and just skip
    those tests on the maint track.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Helped-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Jul 11, 2016
Commits on Jul 14, 2016
  1. @gitster

    Merge branch 'jk/upload-pack-hook'

    A hot-fix to make a test working in mingw again.
    
    * jk/upload-pack-hook:
      mingw: fix regression in t1308-config-set
    gitster committed Jul 14, 2016
  2. @dscho @gitster

    mingw: fix regression in t1308-config-set

    When we tried to fix in 58461bd (t1308: do not get fooled by symbolic
    links to the source tree, 2016-06-02) an obscure case where the user
    cd's into Git's source code via a symbolic link, a regression was
    introduced that affects all test runs on Windows.
    
    The original patch introducing the test case in question was careful to
    use `$(pwd)` instead of `$PWD`.
    
    This was done to account for the fact that Git's test suite uses shell
    scripting even on Windows, where the shell's Unix-y paths are
    incompatible with the main Git executable's idea of paths: it only
    accepts Windows paths.
    
    It is an awkward but necessary thing, then, to use `$(pwd)` (which gives
    us a Windows path) when interacting with the Git executable and `$PWD`
    (which gives the shell's idea of the current working directory in Unix-y
    form) for shell scripts, including the test suite itself.
    
    Obviously this broke the use case of the Git maintainer when changing
    the working directory into Git's source code directory via a symlink,
    i.e. when `$(pwd)` does not agree with `$PWD`.
    
    However, we must not fix that use case at the expense of regressing
    another use case.
    
    Let's special-case Windows here, even if it is ugly, for lack of a more
    elegant solution.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dscho committed with gitster Jul 14, 2016
Commits on Jul 13, 2016
  1. @gitster

    Fifth batch of topics for 2.10

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

    Merge branch 'jk/big-and-future-archive-tar'

    "git archive" learned to handle files that are larger than 8GB and
    commits far in the future than expressible by the traditional US-TAR
    format.
    
    * jk/big-and-future-archive-tar:
      archive-tar: drop return value
      archive-tar: write extended headers for far-future mtime
      archive-tar: write extended headers for file sizes >= 8GB
      t5000: test tar files that overflow ustar headers
      t9300: factor out portable "head -c" replacement
    gitster committed Jul 13, 2016
  3. @gitster

    Merge branch 'nd/ita-cleanup'

    Git does not know what the contents in the index should be for a
    path added with "git add -N" yet, so "git grep --cached" should not
    show hits (or show lack of hits, with -L) in such a path, but that
    logic does not apply to "git grep", i.e. searching in the working
    tree files.  But we did so by mistake, which has been corrected.
    
    * nd/ita-cleanup:
      grep: fix grepping for "intent to add" files
      t7810-grep.sh: fix a whitespace inconsistency
      t7810-grep.sh: fix duplicated test name
    gitster committed Jul 13, 2016
  4. @gitster

    Merge branch 'ps/rebase-i-auto-unstash-upon-abort'

    "git rebase -i --autostash" did not restore the auto-stashed change
    when the operation was aborted.
    
    * ps/rebase-i-auto-unstash-upon-abort:
      rebase -i: restore autostash on abort
    gitster committed Jul 13, 2016
  5. @gitster

    Merge branch 'js/t3404-grammo-fix'

    Grammofix.
    
    * js/t3404-grammo-fix:
      t3404: fix a grammo (commands are ran -> commands are run)
    gitster committed Jul 13, 2016
  6. @gitster

    Merge branch 'js/sign-empty-commit-fix'

    "git commit --amend --allow-empty-message -S" for a commit without
    any message body could have misidentified where the header of the
    commit object ends.
    
    * js/sign-empty-commit-fix:
      commit -S: avoid invalid pointer with empty message
    gitster committed Jul 13, 2016
  7. @gitster

    Merge branch 'mm/doc-tt'

    More mark-up updates to typeset strings that are expected to
    literally typed by the end user in fixed-width font.
    
    * mm/doc-tt:
      doc: typeset HEAD and variants as literal
      CodingGuidelines: formatting HEAD in documentation
      doc: typeset long options with argument as literal
      doc: typeset '--' as literal
      doc: typeset long command-line options as literal
      doc: typeset short command-line options as literal
      Documentation/git-mv.txt: fix whitespace indentation
    gitster committed Jul 13, 2016
  8. @gitster

    Merge branch 'dg/subtree-rebase-test'

    Add a test to specify the desired behaviour that currently is not
    available in "git rebase -Xsubtree=...".
    
    * dg/subtree-rebase-test:
      contrib/subtree: Add a test for subtree rebase that loses commits
    gitster committed Jul 13, 2016
  9. @gitster

    Merge branch 'nd/doc-new-command'

    Typofix in a doc.
    
    * nd/doc-new-command:
      new-command.txt: correct the command description file
    gitster committed Jul 13, 2016
  10. @gitster

    Merge branch 'ew/gc-auto-pack-limit-fix'

    "gc.autoPackLimit" when set to 1 should not trigger a repacking
    when there is only one pack, but the code counted poorly and did
    so.
    
    * ew/gc-auto-pack-limit-fix:
      gc: fix off-by-one error with gc.autoPackLimit
    gitster committed Jul 13, 2016
  11. @gitster

    Merge branch 'ah/unpack-trees-advice-messages'

    Grammofix.
    
    * ah/unpack-trees-advice-messages:
      unpack-trees: fix English grammar in do-this-before-that messages
    gitster committed Jul 13, 2016
  12. @gitster

    Merge branch 'va/i18n-even-more'

    More markings of messages for i18n, with updates to various tests
    to pass GETTEXT_POISON tests.
    
    One patch from the original submission dropped due to conflicts
    with jk/upload-pack-hook, which is still in flux.
    
    * va/i18n-even-more: (38 commits)
      t5541: become resilient to GETTEXT_POISON
      i18n: branch: mark comment when editing branch description for translation
      i18n: unmark die messages for translation
      i18n: submodule: escape shell variables inside eval_gettext
      i18n: submodule: join strings marked for translation
      i18n: init-db: join message pieces
      i18n: remote: allow translations to reorder message
      i18n: remote: mark URL fallback text for translation
      i18n: standardise messages
      i18n: sequencer: add period to error message
      i18n: merge: change command option help to lowercase
      i18n: merge: mark messages for translation
      i18n: notes: mark options for translation
      i18n: notes: mark strings for translation
      i18n: transport-helper.c: change N_() call to _()
      i18n: bisect: mark strings for translation
      t5523: use test_i18ngrep for negation
      t4153: fix negated test_i18ngrep call
      t9003: become resilient to GETTEXT_POISON
      tests: unpack-trees: update to use test_i18n* functions
      ...
    gitster committed Jul 13, 2016
Commits on Jul 11, 2016
  1. @gitster

    Sync with v2.9.1

    * maint:
      Git 2.9.1
    gitster committed Jul 11, 2016
  2. @gitster

    Git 2.9.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 11, 2016
  3. @gitster

    Merge branch 'jc/t2300-setup' into maint

    Portability fix for Windows.
    
    * jc/t2300-setup:
      t2300: "git --exec-path" is not usable in $PATH on Windows as-is
    gitster committed Jul 11, 2016
  4. @gitster

    Merge branch 'cb/t7810-test-label-fix' into maint

    Test clean-up.
    
    * cb/t7810-test-label-fix:
      t7810: fix duplicated test title
    gitster committed Jul 11, 2016
  5. @gitster

    Merge branch 'sb/t5614-modernize' into maint

    Test clean-up.
    
    * sb/t5614-modernize:
      t5614: don't use subshells
    gitster committed Jul 11, 2016
  6. @gitster

    Merge branch 'jn/preformatted-doc-url' into maint

    The top level documentation "git help git" still pointed at the
    documentation set hosted at now-defunct google-code repository.
    Update it to point to https://git.github.io/htmldocs/git.html
    instead.
    
    * jn/preformatted-doc-url:
      doc: git-htmldocs.googlecode.com is no more
    gitster committed Jul 11, 2016
  7. @gitster

    Merge branch 'ao/p4-has-branch-prefix-fix' into maint

    A bug, which caused "git p4" while running under verbose mode to
    report paths that are omitted due to branch prefix incorrectly, has
    been fixed; the command said "Ignoring file outside of prefix" for
    paths that are _inside_.
    
    * ao/p4-has-branch-prefix-fix:
      git-p4: correct hasBranchPrefix verbose output
    gitster committed Jul 11, 2016
  8. @gitster

    Merge branch 'js/perf-on-apple' into maint

    t/perf needs /usr/bin/time with GNU extension; the invocation of it
    is updated to "gtime" on Darwin.
    
    * js/perf-on-apple:
      perf: accommodate for MacOSX
    gitster committed Jul 11, 2016
  9. @gitster

    Merge branch 'ak/t7800-wo-readlink' into maint

    One among four invocations of readlink(1) in our test suite has
    been rewritten so that the test can run on systems without the
    command (others are in valgrind test framework and t9802).
    
    * ak/t7800-wo-readlink:
      t7800: readlink may not be available
    gitster committed Jul 11, 2016
  10. @gitster

    Merge branch 'jk/tzoffset-fix' into maint

    The internal code used to show local timezone offset is not
    prepared to handle timestamps beyond year 2100, and gave a
    bogus offset value to the caller.  Use a more benign looking
    +0000 instead and let "git log" going in such a case, instead
    of aborting.
    
    * jk/tzoffset-fix:
      local_tzoffset: detect errors from tm_to_time_t
      t0006: test various date formats
      t0006: rename test-date's "show" to "relative"
    gitster committed Jul 11, 2016
  11. @gitster

    Merge branch 'js/mingw-parameter-less-c-functions' into maint

    Some platform-specific code had non-ANSI strict declarations of C
    functions that do not take any parameters, which has been
    corrected.
    
    * js/mingw-parameter-less-c-functions:
      mingw: let the build succeed with DEVELOPER=1
    gitster committed Jul 11, 2016
  12. @gitster

    Merge branch 'lc/shell-default-value-noexpand' into maint

    Fix unnecessarily waste in the idiomatic use of ': ${VAR=default}'
    to set the default value, without enclosing it in double quotes.
    
    * lc/shell-default-value-noexpand:
      sh-setup: enclose setting of ${VAR=default} in double-quotes
    gitster committed Jul 11, 2016
  13. @gitster

    Merge branch 'sb/clone-shallow-passthru' into maint

    Fix an unintended regression in v2.9 that breaks "clone --depth"
    that recurses down to submodules by forcing the submodules to also
    be cloned shallowly, which many server instances that host upstream
    of the submodules are not prepared for.
    
    * sb/clone-shallow-passthru:
      clone: do not let --depth imply --shallow-submodules
    gitster committed Jul 11, 2016
  14. @gitster

    Merge branch 'mg/signature-doc' into maint

    Formats of the various data (and how to validate them) where we use
    GPG signature have been documented.
    
    * mg/signature-doc:
      Documentation/technical: signed merge tag format
      Documentation/technical: signed commit format
      Documentation/technical: signed tag format
      Documentation/technical: describe signature formats
    gitster committed Jul 11, 2016
  15. @gitster

    Merge branch 'jk/bisect-show-tree' into maint

    "git bisect" makes an internal call to "git diff-tree" when
    bisection finds the culprit, but this call did not initialize the
    data structure to pass to the diff-tree API correctly.
    
    * jk/bisect-show-tree:
      bisect: always call setup_revisions after init_revisions
    gitster committed Jul 11, 2016
  16. @gitster

    Merge branch 'km/fetch-do-not-free-remote-name' into maint

    The ownership rule for the piece of memory that hold references to
    be fetched in "git fetch" was screwy, which has been cleaned up.
    
    * km/fetch-do-not-free-remote-name:
      builtin/fetch.c: don't free remote->name after fetch
    gitster committed Jul 11, 2016