Skip to content
Commits on Oct 3, 2012
  1. @gitster

    Update draft release notes to 1.8.0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 2, 2012
  2. @gitster

    Merge branch 'nd/grep-reflog'

    Teach the commands from the "log" family the "--grep-reflog" option
    to limit output by string that appears in the reflog entry when the
    "--walk-reflogs" option is in effect.
    
    * nd/grep-reflog:
      revision: make --grep search in notes too if shown
      log --grep-reflog: reject the option without -g
      revision: add --grep-reflog to filter commits by reflog messages
      grep: prepare for new header field filter
    gitster committed Oct 2, 2012
  3. @gitster

    Merge branch 'lt/mailinfo-handle-attachment-more-sanely'

    A patch attached as application/octet-stream (e.g. not text/*) were
    mishandled, not correctly honoring Content-Transfer-Encoding
    (e.g. base64).
    
    * lt/mailinfo-handle-attachment-more-sanely:
      mailinfo: don't require "text" mime type for attachments
    gitster committed Oct 2, 2012
  4. @gitster

    Merge branch 'tu/gc-auto-quiet'

    "gc --auto" notified the user that auto-packing has triggered even
    under the "--quiet" option.
    
    * tu/gc-auto-quiet:
      silence git gc --auto --quiet output
    gitster committed Oct 2, 2012
Commits on Oct 2, 2012
  1. @gitster

    Merge branch 'maint'

    gitster committed Oct 2, 2012
  2. @gitster

    Start preparing for 1.7.12.3

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

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

    "git submodule frotz" was not diagnosed as "frotz" being an unknown
    subcommand to "git submodule"; the user instead got a complaint that
    "git submodule status" was run with an unknown path "frotz".
    
    * rr/maint-submodule-unknown-cmd:
      submodule: if $command was not matched, don't parse other args
    gitster committed Oct 2, 2012
  4. @gitster

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

    "git fetch" over http advertised that it supports "deflate", which
    is much less common, and did not advertise more common "gzip" on its
    Accept-Encoding header.
    
    * sp/maint-http-enable-gzip:
      Enable info/refs gzip decompression in HTTP client
    gitster committed Oct 2, 2012
  5. @gitster

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

    "git fetch" over http had an old workaround for an unlikely server
    misconfiguration; it turns out that this hurts debuggability of the
    configuration in general, and has been reverted.
    
    * sp/maint-http-info-refs-no-retry:
      Revert "retry request without query when info/refs?query fails"
    gitster committed Oct 2, 2012
  6. @nafmo @gitster

    l10n: Fix to Swedish translation

    Fix bad translation of "Receiving objects".
    
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    nafmo committed with gitster Oct 2, 2012
  7. @artagnon @gitster

    Documentation: mention `push.default` in git-push.txt

    It already is listed in the "git config" documentation, but people
    interested in pushing would first look at "git push" documentation.
    
    Noticed-by: David Glasser
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Acked-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
    Fixed-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Oct 2, 2012
  8. @mjg @gitster

    RelNotes/1.8.0: various typo and style fixes

    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Oct 2, 2012
Commits on Oct 1, 2012
  1. @gitster

    Git 1.8.0-rc0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Oct 1, 2012
  2. @gitster

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

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

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

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

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

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

    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
  9. @torvalds @gitster

    mailinfo: don't require "text" mime type for attachments

    Currently "git am" does insane things if the mbox it is given contains
    attachments with a MIME type that aren't "text/*".
    
    In particular, it will still decode them, and pass them "one line at a
    time" to the mail body filter, but because it has determined that they
    aren't text (without actually looking at the contents, just at the mime
    type) the "line" will be the encoding line (eg 'base64') rather than a
    line of *content*.
    
    Which then will cause the text filtering to fail, because we won't
    correctly notice when the attachment text switches from the commit message
    to the actual patch. Resulting in a patch failure, even if patch may be a
    perfectly well-formed attachment, it's just that the message type may be
    (for example) "application/octet-stream" instead of "text/plain".
    
    Just remove all the bogus games with the message_type. The only difference
    that code creates is how the data is passed to the filter function
    (chunked per-pred-code line or per post-decode line), and that difference
    is *wrong*, since chunking things per pre-decode line can never be a
    sensible operation, and cannot possibly matter for binary data anyway.
    
    This code goes all the way back to March of 2007, in commit 87ab799
    ("builtin-mailinfo.c infrastrcture changes"), and apparently Don used to
    pass random mbox contents to git. However, the pre-decode vs post-decode
    logic really shouldn't matter even for that case, and more importantly, "I
    fed git am crap" is not a valid reason to break *real* patch attachments.
    
    If somebody really cares, and determines that some attachment is binary
    data (by looking at the data, not the MIME-type), the whole attachment
    should be dismissed, rather than fed in random-sized chunks to
    "handle_filter()".
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Don Zickus <dzickus@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    torvalds committed with gitster Sep 30, 2012
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
Something went wrong with that request. Please try again.