Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Nov 23, 2009
  1. @gitster

    Git v1.6.6-rc0

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

    Merge branch 'maint'

    gitster authored
    * maint:
      Documentation: undocument gc'd function graph_release()
  3. @gitster

    Merge git://git.bogomips.org/git-svn

    gitster authored
    * git://git.bogomips.org/git-svn:
      git svn: strip leading path when making empty dirs
      git svn: always reuse existing remotes on fetch
  4. git svn: strip leading path when making empty dirs

    Eric Wong authored
    Since unhandled.log stores paths relative to the repository
    root, we need to strip out leading path components if the
    directories we're tracking are not the repository root.
    
    Reported-by: Björn Steinbrink
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
  5. @gitster

    Merge branch 'th/maint-remote-update-help-string'

    gitster authored
    * th/maint-remote-update-help-string:
      Update 'git remote update' usage string to match man page.
  6. @gitster

    Merge branch 'jn/faster-completion-startup'

    gitster authored
    * jn/faster-completion-startup:
      Speed up bash completion loading
  7. @gitster

    Merge branch 'rj/maint-t9700'

    gitster authored
    * rj/maint-t9700:
      t9700-perl-git.sh: Fix a test failure on Cygwin
  8. @gitster

    Merge branch 'ls/maint-mailinfo-no-inbody'

    gitster authored
    * ls/maint-mailinfo-no-inbody:
      git am/mailinfo: Don't look at in-body headers when rebasing
  9. @gitster

    Merge branch 'mo/maint-crlf-doc'

    gitster authored
    * mo/maint-crlf-doc:
      core.autocrlf documentation: mention the crlf attribute
  10. @gitster

    Merge branch 'th/remote-usage'

    gitster authored
    * th/remote-usage:
      git remote: Separate usage strings for subcommands
  11. @gitster

    Merge branch 'pb/maint-use-custom-perl'

    gitster authored
    * pb/maint-use-custom-perl:
      Make sure $PERL_PATH is defined when the test suite is run.
  12. @gitster

    Merge branch 'mm/config-pathname-tilde-expand'

    gitster authored
    * mm/config-pathname-tilde-expand:
      Documentation: avoid xmlto input error
      expand_user_path: expand ~ to $HOME, not to the actual homedir.
      Expand ~ and ~user in core.excludesfile, commit.template
  13. @gitster

    Merge branch 'bc/grep-i-F'

    gitster authored
    * bc/grep-i-F:
      grep: Allow case insensitive search of fixed-strings
  14. @gitster

    Merge branch 'jk/maint-break-rename-reduce-memory'

    gitster authored
    * jk/maint-break-rename-reduce-memory:
      diffcore-rename: reduce memory footprint by freeing blob data early
      diffcore-break: save cnt_data for other phases
      diffcore-break: free filespec data as we go
  15. @gitster

    Merge branch 'tc/format-attribute'

    gitster authored
    * tc/format-attribute:
      Check the format of more printf-type functions
  16. @gitster

    Merge branch 'tr/maint-merge-ours-clarification' (early part)

    gitster authored
    * 'tr/maint-merge-ours-clarification' (early part):
      rebase docs: clarify --merge and --strategy
      Documentation: clarify 'ours' merge strategy
  17. @gitster

    log --format: document %w

    René Scharfe authored gitster committed
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  18. @gitster

    strbuf_add_wrapped_text(): factor out strbuf_add_indented_text()

    René Scharfe authored gitster committed
    Add a new helper function, strbuf_add_indented_text(), to indent text
    without a width limit, and call it from strbuf_add_wrapped_text().  It
    respects both indent (applied to the first line) and indent2 (applied to
    the rest of the lines); indent2 was ignored by the indent-only path of
    strbuf_add_wrapped_text() before the patch.
    
    Two simple test cases are added, one exercising strbuf_add_wrapped_text()
    and the other strbuf_add_indented_text().
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  19. @gitster

    grep: unset GREP_OPTIONS before spawning external grep

    René Scharfe authored gitster committed
    While we're at it, also unset GREP_COLOR and GREP_COLORS in case colouring
    is not enabled, to be on the safe side.  The presence of these variables
    alone is not sufficient to trigger coloured output with GNU grep, but
    other implementations may behave differently.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  20. @bjorng @gitster

    User Manual: Write "Git" instead of "GIT"

    bjorng authored gitster committed
    In the Table of Contents, there is a notable inconsistency:
    first there is "GIT Glossary", followed by "Git Quick Reference"
    on the very next line.
    
    Running "grep -c" on user-manual.txt, I find 780 occurrrences of
    "git", 37 occurrences of "Git", and 9 occurrences of "GIT".
    In general, "git" is the preferred spelling, except at the
    beginning of a sentence.
    
    Therefore, change "GIT Glossary" to "Git Glossary" for consistency
    with the rest of the document.
    
    Looking at the other eight occurrences of "GIT" I found one other
    occurrence that should be changed:
    
    * The mention of "StGIT". Looking at the web pages for "Stacked Git"
      at http://www.procode.org/stgit, I only saw the spelling "StGit",
      except in http://wiki.procode.org/cgi-bin/wiki.cgi/StGIT_Tutorial,
      but that page was last updated in 2006.
    
    The other seven occurrences should not be changed:
    
    * Three occurrences were in the output of 'git show-branch' run
      on the git.git repository.
    
    * One occurrence was in the output of 'git cat-file'.
    
    * One occurrence was as part of the file name "GIT-VERSION-GEN".
    
    * Two occurrences were in comments in scripts quoted in a description
      of Tony Luck's workflow.
    
    Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  21. @bjorng @gitster

    Fix truncated usage messages

    bjorng authored gitster committed
    The usage messages for some commands (such as 'git diff-tree')
    are truncated because they don't fit in a fixed buffer of
    1024 bytes.
    
    It would be tempting to eliminate the buffer and the problem once
    and for all by doing the output in three steps, but doing so could
    (according to commit d048a96) increase the likelyhood of messing
    up the display.
    
    So we just increase the size of the buffer.
    
    Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 22, 2009
  1. git svn: always reuse existing remotes on fetch

    Eric Wong authored
    The internal no_reuse_existing flag is set to allow initializing
    multiple remotes with the same URL, common with SVM users.
    
    Unfortunately, this flag caused misbehavior when used
    with the -R command-line flag for fetching.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
Commits on Nov 21, 2009
  1. @gitster

    Documentation: avoid xmlto input error

    gitster authored
    Do not write literal "~/" or "~user" but use "{tilde}/" and "{tilde}user";
    otherwise the text between them gets enclosed in
    "<subscript>...</subscript>".
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'jc/fix-tree-walk' (early part)

    gitster authored
    * 'jc/fix-tree-walk' (early part):
      unpack_callback(): use unpack_failed() consistently
      unpack-trees: typofix
      diff-lib.c: fix misleading comments on oneway_diff()
  3. @gitster

    Merge branch 'jh/notes' (early part)

    gitster authored
    * 'jh/notes' (early part):
      Add selftests verifying concatenation of multiple notes for the same commit
      Refactor notes code to concatenate multiple notes annotating the same object
      Add selftests verifying that we can parse notes trees with various fanouts
      Teach the notes lookup code to parse notes trees with various fanout schemes
      Teach notes code to free its internal data structures on request
      Add '%N'-format for pretty-printing commit notes
      Add flags to get_commit_notes() to control the format of the note string
      t3302-notes-index-expensive: Speed up create_repo()
      fast-import: Add support for importing commit notes
      Teach "-m <msg>" and "-F <file>" to "git notes edit"
      Add an expensive test for git-notes
      Speed up git notes lookup
      Add a script to edit/inspect notes
      Introduce commit notes
    
    Conflicts:
    	.gitignore
    	Documentation/pretty-formats.txt
    	pretty.c
  4. @gitster

    Merge branch 'sp/smart-http'

    gitster authored
    * sp/smart-http: (37 commits)
      http-backend: Let gcc check the format of more printf-type functions.
      http-backend: Fix access beyond end of string.
      http-backend: Fix bad treatment of uintmax_t in Content-Length
      t5551-http-fetch: Work around broken Accept header in libcurl
      t5551-http-fetch: Work around some libcurl versions
      http-backend: Protect GIT_PROJECT_ROOT from /../ requests
      Git-aware CGI to provide dumb HTTP transport
      http-backend: Test configuration options
      http-backend: Use http.getanyfile to disable dumb HTTP serving
      test smart http fetch and push
      http tests: use /dumb/ URL prefix
      set httpd port before sourcing lib-httpd
      t5540-http-push: remove redundant fetches
      Smart HTTP fetch: gzip requests
      Smart fetch over HTTP: client side
      Smart push over HTTP: client side
      Discover refs via smart HTTP server when available
      http-backend: more explict LocationMatch
      http-backend: add example for gitweb on same URL
      http-backend: use mod_alias instead of mod_rewrite
      ...
    
    Conflicts:
    	.gitignore
    	remote-curl.c
  5. @gitster

    Merge branch 'bw/autoconf-more'

    gitster authored
    * bw/autoconf-more:
      configure: add settings for gitconfig, editor and pager
      configure: add macro to set arbitrary make variables
  6. @gitster

    Merge branch 'jn/editor-pager'

    gitster authored
    * jn/editor-pager:
      Provide a build time default-pager setting
      Provide a build time default-editor setting
      am -i, git-svn: use "git var GIT_PAGER"
      add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
      Teach git var about GIT_PAGER
      Teach git var about GIT_EDITOR
      Suppress warnings from "git var -l"
      Do not use VISUAL editor on dumb terminals
      Handle more shell metacharacters in editor names
  7. @gitster

    Merge branch 'rj/cygwin-msvc'

    gitster authored
    * rj/cygwin-msvc:
      MSVC: Add support for building with NO_MMAP
      Makefile: keep MSVC and Cygwin configuration separate
  8. @gitster

    Merge branch 'rj/maint-simplify-cygwin-makefile'

    gitster authored
    * rj/maint-simplify-cygwin-makefile:
      Makefile: merge two Cygwin configuration sections into one
  9. @gitster

    Merge branch 'bg/format-patch-doc-update'

    gitster authored
    * bg/format-patch-doc-update:
      format-patch: Add "--no-stat" as a synonym for "-p"
      format-patch documentation: Fix formatting
      format-patch documentation: Remove diff options that are not useful
      format-patch: Always generate a patch
  10. @gitster

    Merge branch 'tr/filter-branch'

    gitster authored
    * tr/filter-branch:
      filter-branch: nearest-ancestor rewriting outside subdir filter
      filter-branch: stop special-casing $filter_subdir argument
  11. @gitster

    Merge branch 'sc/protocol-doc'

    gitster authored
    * sc/protocol-doc:
      Update packfile transfer protocol documentation
  12. @gitster

    Merge branch 'jl/submodule-add-noname'

    gitster authored
    * jl/submodule-add-noname:
      git submodule add: make the <path> parameter optional
  13. @gitster

    Merge branch 'sb/ls-tree-parseopt'

    gitster authored
    * sb/ls-tree-parseopt:
      ls-tree: migrate to parse-options
      t3101: test more ls-tree options
Something went wrong with that request. Please try again.