Permalink
Commits on Sep 25, 2012
  1. Update draft release notes to 1.8.0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 25, 2012
  2. 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
  3. Merge branch 'js/hp-nonstop'

    Port to HP NonStop aka Tandem.
    
    * js/hp-nonstop:
      Port to HP NonStop
    gitster committed Sep 25, 2012
  4. Merge branch 'js/poll-emu'

    * js/poll-emu:
      make poll() work on platforms that can't recv() on a non-socket
      poll() exits too early with EFAULT if 1st arg is NULL
      fix some win32 specific dependencies in poll.c
      make poll available for other platforms lacking it
    gitster committed Sep 25, 2012
  5. Merge branch 'ep/malloc-check-perturb'

    Run our test scripts with MALLOC_CHECK_ and MALLOC_PERTURB_, the
    built-in memory access checking facility GNU libc has.
    
    * ep/malloc-check-perturb:
      MALLOC_CHECK: various clean-ups
      Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detecting heap corruption
    gitster committed Sep 25, 2012
  6. Merge branch 'aj/xfuncname-ada'

    * aj/xfuncname-ada:
      Add userdiff patterns for Ada
    gitster committed Sep 25, 2012
  7. Merge branch 'jc/maint-mailinfo-mime-attr'

    When "git am" is fed an input that has multiple "Content-type: ..."
    header, it did not grok charset= attribute correctly.
    
    * jc/maint-mailinfo-mime-attr:
      mailinfo: do not concatenate charset= attribute values from mime headers
    gitster committed Sep 25, 2012
  8. Merge branch 'po/maint-docs'

    Various documentation fixups.
    
    * po/maint-docs:
      Doc branch: show -vv option and alternative
      Doc clean: add See Also link
      Doc add: link gitignore
      Doc: separate gitignore pattern sources
      Doc: shallow clone deepens _to_ new depth
    gitster committed Sep 25, 2012
  9. Merge branch 'db/doc-custom-xmlto'

    * db/doc-custom-xmlto:
      Documentation/Makefile: Allow custom XMLTO binary
    gitster committed Sep 25, 2012
  10. Merge branch 'maint'

    * maint:
      Revert "completion: fix shell expansion of items"
    gitster committed Sep 25, 2012
  11. 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. Sync with maint

    gitster committed Sep 24, 2012
  2. Start preparation for 1.7.12.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Sep 24, 2012
  3. 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
  4. 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
  5. 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 21, 2012
  1. Merge branch 'mh/fetch-filter-refs'

    Finishing touch to update documentation of string-list to make sure
    the earlier rewrite of ref-list match logic that depends on its sort
    order will not get broken.
    
    * mh/fetch-filter-refs:
      string_list API: document what "sorted" means
    gitster committed Sep 21, 2012
  2. Merge branch 'jc/maint-log-grep-all-match-1'

    A finishing touch to make two symbols that were meant to be file-scope
    static really so.
    
    * jc/maint-log-grep-all-match-1:
      grep.c: make two symbols really file-scope static this time
    gitster committed Sep 21, 2012
Commits on Sep 20, 2012
  1. Merge branch 'maint'

    * maint:
      Documentation: Document signature showing options
      completion: fix shell expansion of items
    gitster committed Sep 20, 2012
  2. Merge branch 'nd/maint-diffstat-summary' into maint

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

    * jw/doc-commit-title:
      Documentation: describe subject more precisely
    gitster committed Sep 20, 2012
  4. 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
  5. Merge branch 'jc/mailinfo-RE' into maint

    * jc/mailinfo-RE:
      mailinfo: strip "RE: " prefix
    gitster committed Sep 20, 2012
  6. 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
  7. 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
  8. Merge branch 'nd/maint-remote-remove' into maint

    * nd/maint-remote-remove:
      remote: prefer subcommand name 'remove' to 'rm'
    gitster committed Sep 20, 2012
  9. 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
  10. 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
  11. 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
  12. Port to HP NonStop

    Includes the addition of some new defines and their description for others to use.
    
    Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Jojo-Schmitz committed with gitster Sep 19, 2012
Commits on Sep 19, 2012
  1. Documentation/Makefile: Allow custom XMLTO binary

    Signed-off-by: Dave Borowitz <dborowitz@google.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    dborowitz committed with gitster Sep 19, 2012
  2. Doc branch: show -vv option and alternative

    Indicate that the -v option can be given twice in the short options.
    Without it users pass over the option. Also indicate the alternate
    'git remote show' method.
    
    Signed-off-by: Philip Oakley <philipoakley@iee.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    PhilipOakley committed with gitster Sep 18, 2012
  3. Doc clean: add See Also link

    'git clean' is controlled by gitignore. Provide See Also link for it.
    
    Use of core.excludesfile is implied.
    
    Signed-off-by: Philip Oakley <philipoakley@iee.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    PhilipOakley committed with gitster Sep 18, 2012
  4. Doc add: link gitignore

    Use a gitignore link rather than the gitrepository-
    layout link.
    
    Signed-off-by: Philip Oakley <philipoakley@iee.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    PhilipOakley committed with gitster Sep 18, 2012
  5. Doc: separate gitignore pattern sources

    Use separate bulleted paragraphs for the three different gitignore
    pattern sources.
    
    Signed-off-by: Philip Oakley <philipoakley@iee.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    PhilipOakley committed with gitster Sep 18, 2012