Permalink
Commits on Sep 30, 2012
  1. Git 1.7.12.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 30, 2012
  2. 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
  3. 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
  4. 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
Commits on Sep 27, 2012
  1. 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
  2. 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
  3. 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 25, 2012
  1. 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. Start preparation for 1.7.12.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 24, 2012
  2. Merge branch 'jc/maint-blame-no-such-path' into maint

    Even during a conflicted merge, "git blame $path" always meant to
    blame uncommitted changes to the "working tree" version; make it
    more useful by showing cleanly merged parts as coming from the other
    branch that is being merged.
    
    This incidentally fixes an unrelated problem on a case insensitive
    filesystem, where "git blame MAKEFILE" run in a history that has
    "Makefile" but not "MAKEFILE" did not say "No such file MAKEFILE in
    HEAD" but pretended as if "MAKEFILE" was a newly added file.
    
    * jc/maint-blame-no-such-path:
      blame: allow "blame file" in the middle of a conflicted merge
      blame $path: avoid getting fooled by case insensitive filesystems
    gitster committed Sep 24, 2012
  3. Merge branch 'dj/fetch-all-tags' into maint

    "git fetch --all", when passed "--no-tags", did not honor the
    "--no-tags" option while fetching from individual remotes (the same
    issue existed with "--tags", but combination "--all --tags" makes
    much less sense than "--all --no-tags").
    
    * dj/fetch-all-tags:
      fetch --all: pass --tags/--no-tags through to each remote
      submodule: use argv_array instead of hand-building arrays
      fetch: use argv_array instead of hand-building arrays
      argv-array: fix bogus cast when freeing array
      argv-array: add pop function
    gitster committed Sep 24, 2012
  4. Improve the description of GIT_PS1_SHOWUPSTREAM

    Describe what '=' means in the output of __git_ps1 when using
    GIT_PS1_SHOWUPSTREAM, which was not previously described.
    
    Signed-off-by: Jonathan "Duke" Leto <jonathan@leto.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    leto committed with gitster Sep 24, 2012
Commits on Sep 20, 2012
  1. Merge branch 'nd/maint-diffstat-summary' into maint

    * nd/maint-diffstat-summary:
      Revert diffstat back to English
    gitster committed Sep 20, 2012
  2. Merge branch 'jw/doc-commit-title' into maint

    * jw/doc-commit-title:
      Documentation: describe subject more precisely
    gitster committed Sep 20, 2012
  3. Merge branch 'dg/run-command-child-cleanup' into maint

    * dg/run-command-child-cleanup:
      run-command.c: fix broken list iteration in clear_child_for_cleanup
    gitster committed Sep 20, 2012
  4. Merge branch 'jc/mailinfo-RE' into maint

    * jc/mailinfo-RE:
      mailinfo: strip "RE: " prefix
    gitster committed Sep 20, 2012
  5. Merge branch 'sn/ls-remote-get-url-doc' into maint

    * sn/ls-remote-get-url-doc:
      ls-remote: document the '--get-url' option
    gitster committed Sep 20, 2012
  6. Merge branch 'nd/log-n-doc' into maint

    * nd/log-n-doc:
      doc: move rev-list option -<n> from git-log.txt to rev-list-options.txt
    gitster committed Sep 20, 2012
  7. Merge branch 'nd/maint-remote-remove' into maint

    * nd/maint-remote-remove:
      remote: prefer subcommand name 'remove' to 'rm'
    gitster committed Sep 20, 2012
  8. grep.c: make two symbols really file-scope static this time

    Adding a declaration at the beginning is not sufficient for obvious
    reasons. The definition has to be made static.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 20, 2012
  9. Documentation: Document signature showing options

    The pretty formats for GPG signatures were introduced but never
    documented. Use the documentation from the commit that introduced them.
    Do the same for the --show-signature option added to git log and
    friends.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bebarino committed with gitster Sep 20, 2012
  10. completion: fix shell expansion of items

    As reported by Jeroen Meijer[1]; the current code doesn't deal properly
    with items (tags, branches, etc.) that have ${} in them because they get
    expaned by bash while using compgen.
    
    A simple solution is to quote the items so they get expanded properly
    (\$\{\}).
    
    In order to achieve that I took bash-completion's quote() function,
    which is rather simple, and renamed it to __git_quote() as per Jeff
    King's suggestion.
    
    Solves the original problem for me.
    
    [1] http://article.gmane.org/gmane.comp.version-control.git/201596
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    felipec committed with gitster Sep 20, 2012
Commits on Sep 18, 2012
  1. Git 1.7.12.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 18, 2012
  2. Merge branch 'er/doc-fast-import-done' into maint

    * er/doc-fast-import-done:
      fast-import: document the --done option
    gitster committed Sep 18, 2012
  3. Merge branch 'jk/config-warn-on-inaccessible-paths' into maint

    The attribute system may be asked for a path that itself or its
    leading directories no longer exists in the working tree, and it is
    fine if we cannot open .gitattribute file in such a case.  Failure
    to open per-directory .gitattributes with error status other than
    ENOENT and ENOTDIR should be diagnosed.
    
    * jk/config-warn-on-inaccessible-paths:
      attr: failure to open a .gitattributes file is OK with ENOTDIR
      warn_on_inaccessible(): a helper to warn on inaccessible paths
      attr: warn on inaccessible attribute files
      gitignore: report access errors of exclude files
      config: warn on inaccessible files
    gitster committed Sep 18, 2012
  4. Doc: Improve shallow depth wording

    Avoid confusion in compound sentence about the start of the commit set
    and the depth measure. Use two sentences.
    
    Signed-off-by: Philip Oakley <philipoakley@iee.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    PhilipOakley committed with gitster Sep 16, 2012
  5. Documentation/git-filter-branch: Move note about effect of removing c…

    …ommits
    
    The note that explains that changes introduced by removed commits are
    preserved should be placed directly after the paragraph that describes
    such commits removal.  Otherwise the reference to "the commits" appears
    out of context.
    
    Also the big example that follows "Consider this history" is about
    rewriting part of the history DAG.  Move the paragraph that
    describes the operation close to it.
    
    Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    andreas-schwab committed with gitster Sep 18, 2012
Commits on Sep 17, 2012
  1. mailinfo: do not concatenate charset= attribute values from mime headers

    "Content-type: text/plain; charset=UTF-8" header should not appear
    twice in the input, but it is always better to gracefully deal with
    such a case.  The current code concatenates the value to the values
    we have seen previously, producing nonsense such as "utf8UTF-8".
    
    Instead of concatenating, forget the previous value and use the last
    value we see.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 17, 2012
  2. t/perf: add "trash directory" to .gitignore

    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Sep 17, 2012
  3. Add missing -z to git check-attr usage text for consistency with man …

    …page
    
    Signed-off-by: Adam Spiers <git@adamspiers.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Adam Spiers committed with gitster Sep 17, 2012
  4. git-jump: ignore (custom) prefix in diff mode

    Matching the default file prefix b/ does not yield any results if config
    option diff.noprefix or diff.mnemonicprefix is enabled.
    
    Signed-off-by: Mischa POSLAWSKY <git@shiar.nl>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Mischa POSLAWSKY committed with gitster Sep 17, 2012
  5. Documentation: indent-with-non-tab uses "equivalent tabs" not 8

    Update the documentation of the core.whitespace option
    "indent-with-non-tab" to correctly reflect that it catches the use of
    spaces instead of the equivalent tabs, rather than a fixed number.
    
    Signed-off-by: Wesley J. Landaker <wjl@icecavern.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    wjl committed with gitster Sep 17, 2012
  6. completion: add --no-edit to git-commit

    Signed-off-by: Yacine Belkadi <yacine.belkadi.1@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ybelkadi committed with gitster Sep 16, 2012
Commits on Sep 16, 2012
  1. t7810-grep: test --all-match with multiple --grep and --author options

    The code used to have a bug that ignores "--all-match", that requires
    all "--grep" to have matched, when "--author" or "--committer" was used.
    
    Make sure the bug will not be reintroduced.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Sep 14, 2012
  2. t7810-grep: test interaction of multiple --grep and --author options

    There are tests for this interaction already. Restructure slightly and
    avoid any claims about --all-match.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Sep 14, 2012