Permalink
Commits on Oct 1, 2012
  1. Git 1.8.0-rc0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 1, 2012
  2. Merge branch 'jk/completion-tests'

    * jk/completion-tests:
      t9902: add completion tests for "odd" filenames
      t9902: add a few basic completion tests
    gitster committed Oct 1, 2012
  3. Merge branch 'ep/malloc-check-perturb'

    Fixes a brown-paper bag bug.
    
    * ep/malloc-check-perturb:
      MALLOC_CHECK: enable it, unless disabled explicitly
    gitster committed Oct 1, 2012
  4. Merge branch 'da/mergetool-custom'

    The actual external command to run for mergetool backend can be
    specified with difftool/mergetool.$name.cmd configuration
    variables, but this mechanism was ignored for the backends we
    natively support.
    
    * da/mergetool-custom:
      mergetool--lib: Allow custom commands to override built-ins
    gitster committed Oct 1, 2012
  5. Merge branch 'os/commit-submodule-ignore'

    "git status" honored the ignore=dirty settings in .gitmodules but
    "git commit" didn't.
    
    * os/commit-submodule-ignore:
      commit: pay attention to submodule.$name.ignore in .gitmodules
    gitster committed Oct 1, 2012
  6. Merge branch 'jc/blame-follows-renames'

    Clarify the "blame" documentation to tell the users that there is
    no need to ask for "--follow".
    
    * jc/blame-follows-renames:
      git blame: document that it always follows origin across whole-file renames
    gitster committed Oct 1, 2012
  7. Merge branch 'jk/receive-pack-unpack-error-to-pusher'

    Send errors from "unpack-objects" and "index-pack" back to the "git
    push" over the git and smart-http protocols, just like it is done
    for a push over the ssh protocol.
    
    * jk/receive-pack-unpack-error-to-pusher:
      receive-pack: drop "n/a" on unpacker errors
      receive-pack: send pack-processing stderr over sideband
      receive-pack: redirect unpack-objects stdout to /dev/null
    gitster committed Oct 1, 2012
  8. Merge branch 'rt/maint-clone-single'

    Running "git fetch" in a repository made with "git clone --single"
    slurps all the branches, defeating the point of "--single".
    
    * rt/maint-clone-single:
      clone --single: limit the fetch refspec to fetched branch
    gitster committed Oct 1, 2012
Commits on Sep 30, 2012
  1. 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 30, 2012
  2. Update draft release notes to 1.8.0

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

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

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 30, 2012
  5. 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 30, 2012
  6. 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 30, 2012
  7. 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 30, 2012
  8. 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 30, 2012
  9. 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 30, 2012
  10. 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 30, 2012
  11. 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 30, 2012
  12. 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 30, 2012
  13. 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 30, 2012
  14. 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 30, 2012
  15. 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 30, 2012
Commits on Sep 28, 2012
  1. t9902: add completion tests for "odd" filenames

    We correctly handle completion items with spaces just fine,
    since we pass the lists around with newline delimiters.
    However, we do not handle filenames with shell
    metacharacters, as "compgen -W" performs expansion on the
    list we give it.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Sep 26, 2012
  2. t9902: add a few basic completion tests

    We were not testing ref or tree completion at all. Let's
    give them even basic sanity checks to avoid regressions.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Sep 26, 2012
Commits on Sep 27, 2012
  1. 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 27, 2012
  2. 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 27, 2012
  3. 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 27, 2012
  4. 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 27, 2012
  5. 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
  6. MALLOC_CHECK: enable it, unless disabled explicitly

    The malloc checks in tests are currently disabled.  Actually evaluate
    the variable for turning them off and enable them if it's unset.
    
    Also use this opportunity to give it the more descriptive and
    consistent name TEST_NO_MALLOC_CHECK.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Sep 26, 2012
Commits on Sep 26, 2012
  1. 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. 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. Update draft release notes to 1.8.0

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