Skip to content
Commits on Sep 30, 2012
  1. @gitster

    Merge git://github.com/git-l10n/git-po

    * 'master' of git://github.com/git-l10n/git-po:
      l10n: Fixes to Swedish translation
      Update Swedish translation (1967t0f0u)
      l10n: zh.CN.po: msgmerge git.pot (1142t195f630u)
      l10n: Update git.pot (825 new, 24 removed messages)
    gitster committed Sep 29, 2012
  2. @gitster

    Update draft release notes to 1.8.0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 29, 2012
  3. @gitster

    Sync with 1.7.12.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 29, 2012
  4. @gitster

    Git 1.7.12.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 29, 2012
  5. @gitster

    Merge branch 'maint' of git://github.com/git-l10n/git-po into maint

    Update German and Simplified Chinese translations.
    
    * 'maint' of git://github.com/git-l10n/git-po:
      l10n: de.po: correct translation of a 'rebase' message
      l10n: Improve many translation for zh_CN
      l10n: Unify the translation for '(un)expected'
    gitster committed Sep 29, 2012
  6. @gitster

    Merge branch 'jc/maint-log-grep-all-match-1' into maint

    * jc/maint-log-grep-all-match-1:
      grep.c: make two symbols really file-scope static this time
      t7810-grep: test --all-match with multiple --grep and --author options
      t7810-grep: test interaction of multiple --grep and --author options
      t7810-grep: test multiple --author with --all-match
      t7810-grep: test multiple --grep with and without --all-match
      t7810-grep: bring log --grep tests in common form
      grep.c: mark private file-scope symbols as static
      log: document use of multiple commit limiting options
      log --grep/--author: honor --all-match honored for multiple --grep patterns
      grep: show --debug output only once
      grep: teach --debug option to dump the parse tree
    gitster committed Sep 29, 2012
  7. @gitster

    Merge branch 'jc/maint-mailinfo-mime-attr' into maint

    * jc/maint-mailinfo-mime-attr:
      mailinfo: do not concatenate charset= attribute values from mime headers
    gitster committed Sep 29, 2012
  8. @gitster

    Merge branch 'rr/maint-submodule-unknown-cmd'

    * rr/maint-submodule-unknown-cmd:
      submodule: if $command was not matched, don't parse other args
    gitster committed Sep 29, 2012
  9. @gitster

    Merge branch 'rs/archive-zip-utf8'

    With another reroll, it looks like the series is as polished as it
    could be.
    
    * rs/archive-zip-utf8:
      archive-zip: write extended timestamp
      archive-zip: support UTF-8 paths
      Revert "archive-zip: support UTF-8 paths"
      archive-zip: support UTF-8 paths
    gitster committed Sep 29, 2012
  10. @gitster

    Merge branch 'jk/smart-http-switch'

    Allows users to turn off smart-http when talking to dumb-only
    servers.
    
    * jk/smart-http-switch:
      remote-curl: let users turn off smart http
      remote-curl: rename is_http variable
    gitster committed Sep 29, 2012
  11. @gitster

    Merge branch 'sp/maint-http-enable-gzip'

    Allows a more common 'gzip' Accept-Encoding to be used.
    
    * sp/maint-http-enable-gzip:
      Enable info/refs gzip decompression in HTTP client
    gitster committed Sep 29, 2012
  12. @gitster

    Merge branch 'sp/maint-http-info-refs-no-retry'

    Kills an old workaround for a unlikely server misconfiguration that
    hurts debuggability.
    
    * sp/maint-http-info-refs-no-retry:
      Revert "retry request without query when info/refs?query fails"
    gitster committed Sep 29, 2012
  13. @gitster

    Merge branch 'aw/rebase-i-edit-todo'

    Teach an option to edit the insn sheet to "git rebase -i".
    
    * aw/rebase-i-edit-todo:
      rebase -i: suggest using --edit-todo to fix an unknown instruction
      rebase -i: Add tests for "--edit-todo"
      rebase -i: Teach "--edit-todo" action
      rebase -i: Refactor help messages for todo file
      rebase usage: subcommands can not be combined with -i
    gitster committed Sep 29, 2012
  14. @gitster

    Merge branch 'js/rebase-exec-command-not-found'

    * js/rebase-exec-command-not-found:
      rebase -i: fix misleading error message after 'exec no-such' instruction
    gitster committed Sep 29, 2012
  15. @gitster

    Merge branch 'rr/test-use-shell-path-not-shell'

    Fixes a brown-paper bag bug.
    
    * rr/test-use-shell-path-not-shell:
      test-lib: use $SHELL_PATH, not $SHELL
    gitster committed Sep 29, 2012
Commits on Sep 27, 2012
  1. @jiangxin

    Merge git://github.com/gotgit/git-po-zh_CN

    * git://github.com/gotgit/git-po-zh_CN:
      l10n: zh.CN.po: msgmerge git.pot (1142t195f630u)
    jiangxin committed Sep 28, 2012
  2. @jiangxin

    Merge branch 'maint'

    * maint:
      l10n: de.po: correct translation of a 'rebase' message
      l10n: Improve many translation for zh_CN
      l10n: Unify the translation for '(un)expected'
    jiangxin committed Sep 28, 2012
  3. @jiangxin

    Merge branch 'l10n-thynson' of git://github.com/thynson/git-po-zh_CN …

    …into maint
    
    * 'l10n-thynson' of git://github.com/thynson/git-po-zh_CN:
      l10n: Improve many translation for zh_CN
      l10n: Unify the translation for '(un)expected'
    jiangxin committed Sep 28, 2012
  4. @jiangxin

    Merge branch 'maint' of https://github.com/ralfth/git-po-de into maint

    * 'maint' of https://github.com/ralfth/git-po-de:
      l10n: de.po: correct translation of a 'rebase' message
    jiangxin committed Sep 28, 2012
  5. @ralfth

    l10n: de.po: correct translation of a 'rebase' message

    Noticed-by: Sascha Cunz <sascha-ml@babbelbox.org>
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    ralfth committed Sep 24, 2012
Commits on Sep 26, 2012
  1. @nafmo

    l10n: Fixes to Swedish translation

    Fix bad translation of "Receiving objects".
    Make translation of push.default message narrower, to make it fit 80
    columns even when prefixed.
    
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    nafmo committed Sep 26, 2012
Commits on Sep 25, 2012
  1. @artagnon @gitster

    submodule: if $command was not matched, don't parse other args

    "git submodule" command DWIMs the command line and assumes a
    unspecified action word for 'status' action.  This is a UI mistake
    that leads to a confusing behaviour.  A mistyped command name is
    instead treated as a request for 'status' of the submodule with that
    name, e.g.
    
        $ git submodule show
        error: pathspec 'show' did not match any file(s) known to git.
        Did you forget to 'git add'?
    
    Stop DWIMming an unknown or mistyped subcommand name as pathspec
    given to unspelled "status" subcommand.  "git submodule" without any
    argument is still interpreted as "git submodule status", but its
    value is questionable.
    
    Adjust t7400 to match, and stop advertising the default subcommand
    being 'status' which does not help much in practice, other than
    promoting laziness and confusion.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Sep 22, 2012
  2. @gitster

    Update draft release notes to 1.8.0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 25, 2012
  3. @gitster

    Merge branch 'rr/test-make-sure-we-have-git'

    Only the first test t0000 in the test suite made sure we have built
    Git to be tested; move the check to test-lib so that it applies to
    all tests equally.
    
    * rr/test-make-sure-we-have-git:
      t/test-lib: make sure Git has already been built
    gitster committed Sep 25, 2012
  4. @gitster

    Merge branch 'js/hp-nonstop'

    Port to HP NonStop aka Tandem.
    
    * js/hp-nonstop:
      Port to HP NonStop
    gitster committed Sep 25, 2012
  5. @gitster

    Merge branch 'js/poll-emu'

    * js/poll-emu:
      make poll() work on platforms that can't recv() on a non-socket
      poll() exits too early with EFAULT if 1st arg is NULL
      fix some win32 specific dependencies in poll.c
      make poll available for other platforms lacking it
    gitster committed Sep 25, 2012
  6. @gitster

    Merge branch 'ep/malloc-check-perturb'

    Run our test scripts with MALLOC_CHECK_ and MALLOC_PERTURB_, the
    built-in memory access checking facility GNU libc has.
    
    * ep/malloc-check-perturb:
      MALLOC_CHECK: various clean-ups
      Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption
    gitster committed Sep 25, 2012
  7. @gitster

    Merge branch 'aj/xfuncname-ada'

    * aj/xfuncname-ada:
      Add userdiff patterns for Ada
    gitster committed Sep 25, 2012
  8. @gitster

    Merge branch 'jc/maint-mailinfo-mime-attr'

    When "git am" is fed an input that has multiple "Content-type: ..."
    header, it did not grok charset= attribute correctly.
    
    * jc/maint-mailinfo-mime-attr:
      mailinfo: do not concatenate charset= attribute values from mime headers
    gitster committed Sep 25, 2012
  9. @gitster

    Merge branch 'po/maint-docs'

    Various documentation fixups.
    
    * po/maint-docs:
      Doc branch: show -vv option and alternative
      Doc clean: add See Also link
      Doc add: link gitignore
      Doc: separate gitignore pattern sources
      Doc: shallow clone deepens _to_ new depth
    gitster committed Sep 25, 2012
  10. @gitster

    Merge branch 'db/doc-custom-xmlto'

    * db/doc-custom-xmlto:
      Documentation/Makefile: Allow custom XMLTO binary
    gitster committed Sep 25, 2012
  11. @gitster

    Merge branch 'maint'

    * maint:
      Revert "completion: fix shell expansion of items"
    gitster committed Sep 25, 2012
  12. @artagnon @gitster

    test-lib: use $SHELL_PATH, not $SHELL

    The codepath for handling "--tee" ends up relaunching the test
    script under a shell, and that one has to be a Bourne.  But we
    incorrectly used $SHELL, which could be a non-Bourne (e.g. zsh or
    csh); we have the Makefile variable $SHELL_PATH for exactly that,
    so use it instead.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Sep 22, 2012
  13. @peff @gitster

    Revert "completion: fix shell expansion of items"

    This reverts commit 25ae7cf.
    
    That patch does fix expansion of weird variables in some
    simple tests, but it also seems to break other things, like
    expansion of refs by "git checkout".
    
    While we're sorting out the correct solution, we are much
    better with the original bug (people with metacharacters in
    their completions occasionally see an error message) than
    the current bug (ref completion does not work at all).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Sep 25, 2012
Commits on Sep 24, 2012
  1. @gitster

    Sync with maint

    gitster committed Sep 24, 2012
Something went wrong with that request. Please try again.