Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Dec 3, 2012
  1. @gitster

    Git 1.8.1-rc0

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

    Merge branch 'mm/status-push-pull-advise'

    gitster authored
    Finishing touch to allow the new advice message squelched
    with an advice.* configuration variable.
    
    * mm/status-push-pull-advise:
      status: respect advice.statusHints for ahead/behind advice
  3. @peff @gitster

    status: respect advice.statusHints for ahead/behind advice

    peff authored gitster committed
    If the user has unset advice.statusHints, we already
    suppress the "use git reset to..." hints in each stanza. The
    new "use git push to publish..." hint is the same type of
    hint. Let's respect statusHints for it, rather than making
    the user set yet another advice flag.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Acked-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 29, 2012
  1. @gitster
  2. @gitster

    Merge branch 'pw/p4-various-fixes'

    gitster authored
    * pw/p4-various-fixes:
      git p4: remove unneeded cmd initialization
      git p4: fix labelDetails typo in exception
      git p4 test: display unresolvable host error
      git p4: catch p4 errors when streaming file contents
      git p4: handle servers without move support
      git p4: catch p4 describe errors
  3. @gitster

    Merge branch 'lt/diff-stat-show-0-lines'

    gitster authored
    "git diff --stat" miscounted the total number of changed lines when
    binary files were involved and hidden beyond --stat-count.  It also
    miscounted the total number of changed files when there were
    unmerged paths.
    
    * lt/diff-stat-show-0-lines:
      t4049: refocus tests
      diff --shortstat: do not count "unmerged" entries
      diff --stat: do not count "unmerged" entries
      diff --stat: move the "total count" logic to the last loop
      diff --stat: use "file" temporary variable to refer to data->files[i]
      diff --stat: status of unmodified pair in diff-q is not zero
      test: add failing tests for "diff --stat" to t4049
  4. @gitster

    Merge branch 'fc/remote-hg'

    gitster authored
    New remote helper for hg.
    
    * fc/remote-hg: (22 commits)
      remote-hg: fix for older versions of python
      remote-hg: fix for files with spaces
      remote-hg: avoid bad refs
      remote-hg: try the 'tip' if no checkout present
      remote-hg: fix compatibility with older versions of hg
      remote-hg: add missing config for basic tests
      remote-hg: the author email can be null
      remote-hg: add option to not track branches
      remote-hg: add extra author test
      remote-hg: add tests to compare with hg-git
      remote-hg: add bidirectional tests
      test-lib: avoid full path to store test results
      remote-hg: add basic tests
      remote-hg: fake bookmark when there's none
      remote-hg: add compat for hg-git author fixes
      remote-hg: add support for hg-git compat mode
      remote-hg: match hg merge behavior
      remote-hg: make sure the encoding is correct
      remote-hg: add support to push URLs
      remote-hg: add support for remote pushing
      ...
  5. @gitster

    Merge branch 'mk/complete-tcsh'

    gitster authored
    Finishing touches for tcsh completion.
    
    * mk/complete-tcsh:
      Support for git aliasing for tcsh completion
  6. @gitster

    Merge branch 'jc/doc-push-satellite'

    gitster authored
    * jc/doc-push-satellite:
      Documentation/git-push.txt: clarify the "push from satellite" workflow
  7. @gitster

    Merge branch 'km/send-email-remove-cruft-in-address'

    gitster authored
    * km/send-email-remove-cruft-in-address:
      git-send-email: allow edit invalid email address
      git-send-email: ask what to do with an invalid email address
      git-send-email: remove invalid addresses earlier
      git-send-email: fix fallback code in extract_valid_address()
      git-send-email: remove garbage after email address
  8. @gitster

    Merge branch 'jk/send-email-sender-prompt'

    gitster authored
    General clean-ups in various areas, originally written to support a
    patch that later turned out to be unneeded.
    
    * jk/send-email-sender-prompt:
      t9001: check send-email behavior with implicit sender
      t: add tests for "git var"
      ident: keep separate "explicit" flags for author and committer
      ident: make user_ident_explicitly_given static
      t7502: factor out autoident prerequisite
      test-lib: allow negation of prerequisites
  9. @gitster

    Merge branch 'fc/send-email-no-sender-prompt'

    gitster authored
    * fc/send-email-no-sender-prompt:
      send-email: avoid questions when user has an ident
  10. @gitster

    Merge branch 'er/doc-add-new-commands'

    gitster authored
    * er/doc-add-new-commands:
      Documentation: how to add a new command
  11. @gitster

    Merge branch 'jl/submodule-rm'

    gitster authored
    Finishing touches to "git rm $submodule" that removes the working
    tree of a submodule.
    
    * jl/submodule-rm:
      Teach rm to remove submodules when given with a trailing '/'
  12. @gitster

    Merge branch 'pp/gitweb-config-underscore'

    gitster authored
    The key "gitweb.remote_heads" is not legal git config; this maps it to
    "gitweb.remoteheads".
    
    * pp/gitweb-config-underscore:
      gitweb: make remote_heads config setting work
  13. @gitster

    Merge branch 'fc/completion-test-simplification'

    gitster authored
    Clean up completion tests.  Use of conslidated helper may make
    instrumenting one particular test during debugging of the test
    itself, but I think that issue should be addressed in some other
    way (e.g. making sure individual tests in 9902 can be skipped).
    
    * fc/completion-test-simplification:
      completion: simplify __gitcomp() test helper
      completion: refactor __gitcomp related tests
      completion: consolidate test_completion*() tests
      completion: simplify tests using test_completion_long()
      completion: standardize final space marker in tests
      completion: add comment for test_completion()
  14. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      git-fast-import.txt: improve documentation for quoted paths
      git-remote-mediawiki: escape ", \, and LF in file names
  15. @moy @gitster

    git-fast-import.txt: improve documentation for quoted paths

    moy authored gitster committed
    The documentation mentioned only newlines and double quotes as
    characters needing escaping, but the backslash also needs it. Also, the
    documentation was not clearly saying that double quotes around the file
    name were required (double quotes in the examples could be interpreted as
    part of the sentence, not part of the actual string).
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  16. @moy @gitster

    git-remote-mediawiki: escape ", \, and LF in file names

    moy authored gitster committed
    A mediawiki page can contain, and even start with a " character, we have
    to escape it when generating the fast-export stream, as well as \
    character. While we're there, also escape newlines, but I don't think we
    can get them from MediaWiki pages.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  17. @gitster

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

    gitster authored
    Further l10n updates.
    
    * 'master' of git://github.com/git-l10n/git-po:
      l10n: vi.po: Update follow git-v1.8.0-273-g2d242
  18. @gitster

    t4049: refocus tests

    gitster authored
    The primary thing Linus's patch wanted to change was to make sure
    that 0-line change appears for a mode-only change.  Update the
    first test to chmod a file that we can see in the output (limited
    by --stat-count) to demonstrate it.  Also make sure to use test_chmod
    and compare the index and the tree, so that we can run this test
    even on a filesystem without permission bits.
    
    Later two tests are about fixes to separate issues that were
    introduced and/or uncovered by Linus's patch as a side effect, but
    the issues are not related to mode-only changes.  Remove chmod from
    the tests.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  19. @felipec @gitster

    completion: fix warning for zsh

    felipec authored gitster committed
    Otherwise the user might get something like:
    
      git-completion.sh:2466: command not found: compdef
    
    If this script is loaded before compinit. The script would work either
    way, but let's not be more annoying to the user.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  20. @jiangxin

    Merge git://github.com/vnwildman/git

    jiangxin authored
    * git://github.com/vnwildman/git:
      l10n: vi.po: Update follow git-v1.8.0-273-g2d242
  21. @gitster

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

    gitster authored
    Update the localization string up to 2d242fb (Update draft release
    notes for 1.8.1, 2012-11-21)
    
    * 'master' of git://github.com/git-l10n/git-po:
      l10n: Update Swedish translation (1975t0f0u)
      l10n: vi.po: update to git-v1.7.12-437-g1084f
      l10n: Update git.pot (14 new, 3 removed messages)
Commits on Nov 28, 2012
  1. @gitster

    Merge branch 'maint'

    gitster authored
  2. @gitster

    Update draft release notes to 1.8.1

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

    Merge branch 'fc/zsh-completion'

    gitster authored
    * fc/zsh-completion:
      completion: start moving to the new zsh completion
      completion: add new zsh completion
  4. @gitster

    Merge branch 'mm/status-push-pull-advise'

    gitster authored
    * mm/status-push-pull-advise:
      status: add advice on how to push/pull to tracking branch
  5. @gitster

    Merge branch 'jk/pickaxe-textconv'

    gitster authored
    Use textconv filters when searching with "log -S".
    
    * jk/pickaxe-textconv:
      pickaxe: use textconv for -S counting
      pickaxe: hoist empty needle check
  6. @gitster

    Start preparing for 1.8.0.2

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

    t9001: check send-email behavior with implicit sender

    peff authored gitster committed
    We allow send-email to use an implicitly-defined identity
    for the sender (because there is still a confirmation step),
    but we abort when we cannot generate such an identity. Let's
    make sure that we test this.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. @gitster

    Merge branch 'rh/maint-gitweb-highlight-ext' into maint

    gitster authored
    Syntax highlighting in "gitweb" was not quite working.
    
    * rh/maint-gitweb-highlight-ext:
      gitweb.perl: fix %highlight_ext mappings
  9. @gitster

    Merge branch 'pw/maint-p4-rcs-expansion-newline' into maint

    gitster authored
    "git p4" used to try expanding malformed "$keyword$" that spans
    across multiple lines.
    
    * pw/maint-p4-rcs-expansion-newline:
      git p4: RCS expansion should not span newlines
  10. @gitster

    completion: add options --single-branch and --branch to "git clone"

    Ralf Thielow authored gitster committed
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. @gitster

    Merge branch 'fc/send-email-no-sender-prompt' into jk/send-email-send…

    gitster authored
    …er-prompt
    
    * fc/send-email-no-sender-prompt:
      send-email: avoid questions when user has an ident
Something went wrong with that request. Please try again.