Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Oct 1, 2012
  1. @gitster

    Git 1.8.0-rc0

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

    Merge branch 'jk/completion-tests'

    gitster authored
    * jk/completion-tests:
      t9902: add completion tests for "odd" filenames
      t9902: add a few basic completion tests
  3. @gitster

    Merge branch 'ep/malloc-check-perturb'

    gitster authored
    Fixes a brown-paper bag bug.
    
    * ep/malloc-check-perturb:
      MALLOC_CHECK: enable it, unless disabled explicitly
  4. @gitster

    Merge branch 'da/mergetool-custom'

    gitster authored
    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
  5. @gitster

    Merge branch 'os/commit-submodule-ignore'

    gitster authored
    "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
  6. @gitster

    Merge branch 'jc/blame-follows-renames'

    gitster authored
    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
  7. @gitster

    Merge branch 'jk/receive-pack-unpack-error-to-pusher'

    gitster authored
    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
  8. @gitster

    Merge branch 'rt/maint-clone-single'

    gitster authored
    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
Commits on Sep 30, 2012
  1. @gitster

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

    gitster authored
    * '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)
  2. @gitster

    Update draft release notes to 1.8.0

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

    Sync with 1.7.12.2

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

    Git 1.7.12.2

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

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

    gitster authored
    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'
  6. @gitster

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

    gitster authored
    * 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
  7. @gitster

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

    gitster authored
    * jc/maint-mailinfo-mime-attr:
      mailinfo: do not concatenate charset= attribute values from mime headers
  8. @gitster

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

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

    Merge branch 'rs/archive-zip-utf8'

    gitster authored
    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
  10. @gitster

    Merge branch 'jk/smart-http-switch'

    gitster authored
    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
  11. @gitster

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

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

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

    gitster authored
    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"
  13. @gitster

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

    gitster authored
    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
  14. @gitster

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

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

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

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

    t9902: add completion tests for "odd" filenames

    peff authored gitster committed
    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>
  2. @peff @gitster

    t9902: add a few basic completion tests

    peff authored gitster committed
    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>
Commits on Sep 27, 2012
  1. @jiangxin

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

    jiangxin authored
    * git://github.com/gotgit/git-po-zh_CN:
      l10n: zh.CN.po: msgmerge git.pot (1142t195f630u)
  2. @jiangxin

    Merge branch 'maint'

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

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

    jiangxin authored
    …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'
  4. @jiangxin

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

    jiangxin authored
    * 'maint' of https://github.com/ralfth/git-po-de:
      l10n: de.po: correct translation of a 'rebase' message
  5. l10n: de.po: correct translation of a 'rebase' message

    Ralf Thielow authored
    Noticed-by: Sascha Cunz <sascha-ml@babbelbox.org>
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
  6. @gitster

    MALLOC_CHECK: enable it, unless disabled explicitly

    René Scharfe authored gitster committed
    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>
Commits on Sep 26, 2012
  1. @nafmo

    l10n: Fixes to Swedish translation

    nafmo authored
    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>
Commits on Sep 25, 2012
  1. @artagnon @gitster

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

    artagnon authored gitster committed
    "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>
  2. @gitster

    Update draft release notes to 1.8.0

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

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

    gitster authored
    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
Something went wrong with that request. Please try again.