Permalink
Commits on Apr 24, 2010
  1. Git 1.7.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 24, 2010
  2. Merge branch 'maint'

    * maint:
      Documentation improvements for the description of short format.
    gitster committed Apr 24, 2010
Commits on Apr 23, 2010
  1. Documentation improvements for the description of short format.

    Incorporates the detailed explanation from Jeff King in
    <20100410040959.GA11977@coredump.intra.peff.net> and fixes
    the bug noted by Junio C Hamano in
    <7vmxxc1i8g.fsf@alter.siamese.dyndns.org>.
    
    Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Eric Raymond committed with gitster Apr 23, 2010
  2. Sync with 1.7.0.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 23, 2010
  3. Git 1.7.0.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 23, 2010
  4. Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maint

    * mg/use-default-abbrev-length-in-rev-list:
      rev-list: use default abbrev length when abbrev-commit is in effect
    gitster committed Apr 23, 2010
  5. Merge branch 'wp/doc-filter-direction' into maint

    * wp/doc-filter-direction:
      documentation: clarify direction of core.autocrlf
    gitster committed Apr 23, 2010
  6. Merge branch 'jk/maint-diffstat-overflow' into maint

    * jk/maint-diffstat-overflow:
      diff: use large integers for diffstat calculations
    gitster committed Apr 23, 2010
  7. Merge branch 'da/maint-python-startup' into maint

    * da/maint-python-startup:
      Makefile: Remove usage of deprecated Python "has_key" method
    gitster committed Apr 23, 2010
Commits on Apr 22, 2010
  1. Merge branch 'maint'

    * maint:
      Documentation/Makefile: fix interrupted builds of user-manual.xml
    gitster committed Apr 22, 2010
  2. Documentation/Makefile: fix interrupted builds of user-manual.xml

    Unlike gcc, asciidoc does not atomically write its output file or
    delete it when interrupted.  If it is interrupted in the middle of
    writing an XML file, the result will be truncated input for xsltproc.
    
    	XSLTPROC user-manual.html
    	user-manual.xml:998: parser error : Premature end of data in t
    
    Take care of this case by writing to a temporary and renaming it when
    finished.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Apr 22, 2010
Commits on Apr 20, 2010
  1. Merge branch 'maint'

    * maint:
      t7012: Mark missing tests as TODO
      reflog: remove 'show' from 'expire's usage string
      MSVC: Fix build by adding missing termios.h dummy
    gitster committed Apr 20, 2010
  2. t7012: Mark missing tests as TODO

    Currently, there are 6 tests which are not even written but are
    'test_expect_failure message false'.
    Do not abuse test_expect_failure as a to do marker, but mark them as
    '#TODO' instead.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Acked-by: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Apr 19, 2010
  3. reflog: remove 'show' from 'expire's usage string

    Most of 'expire's options are not recognized by the 'show' subcommand,
    hence it errors out.
    
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    SZEDER Gábor committed with gitster Apr 19, 2010
Commits on Apr 19, 2010
  1. Merge branch 'maint-1.6.6' into maint

    * maint-1.6.6:
      MSVC: Fix build by adding missing termios.h dummy
    gitster committed Apr 19, 2010
  2. MSVC: Fix build by adding missing termios.h dummy

    A use of this header file was introduced in eb80042 (Add missing #include
    to support TIOCGWINSZ on Solaris, 2010-01-11).
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    j6t committed with gitster Apr 19, 2010
  3. Git 1.7.1-rc2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 19, 2010
  4. Merge branch 'rr/remote-helper-doc'

    * rr/remote-helper-doc:
      Documentation/remote-helpers: Fix typos and improve language
      Fixup: Second argument may be any arbitrary string
      Documentation/remote-helpers: Add invocation section
      Documentation/urls: Rewrite to accomodate <transport>::<address>
      Documentation/remote-helpers: Rewrite description
    gitster committed Apr 19, 2010
  5. Merge branch 'wp/doc-filter-direction'

    * wp/doc-filter-direction:
      documentation: clarify direction of core.autocrlf
    gitster committed Apr 19, 2010
  6. Merge branch 'jk/maint-diffstat-overflow'

    * jk/maint-diffstat-overflow:
      diff: use large integers for diffstat calculations
    gitster committed Apr 19, 2010
  7. Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format'

    * jg/auto-initialize-notes-with-percent-n-in-format:
      t3301: add tests to use --format="%N"
      pretty: Initialize notes if %N is used
    gitster committed Apr 19, 2010
  8. Merge branch 'maint'

    * maint:
      Documentation: Describe other situations where -z affects git diff
    gitster committed Apr 19, 2010
  9. Merge git://git.kernel.org/pub/scm/gitk/gitk

    * git://git.kernel.org/pub/scm/gitk/gitk:
      gitk: Display dirty submodules correctly
      gitk: Fix display of copyright symbol
      gitk: Add emacs editor variable block
      gitk: Avoid calling tk_setPalette on Windows
      gitk: Don't clobber "Remember this view" setting
      gitk: Add comments to explain encode_view_opts and decode_view_opts
      gitk: Use consistent font for all text input fields
      gitk: Set the font for all listbox widgets
      gitk: Set the font for all spinbox widgets
      gitk: Remove forced use of sans-serif font
      gitk: Add Ctrl-W shortcut for closing the active window
    gitster committed Apr 19, 2010
Commits on Apr 18, 2010
  1. Documentation/remote-helpers: Fix typos and improve language

    Fix some typos and errors in grammar and tense.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Apr 18, 2010
  2. Fixup: Second argument may be any arbitrary string

    This is intended to be a fixup for commit ad466d1 in pu. As Jonathan
    Neider pointed out, the second argument may be any arbitrary string,
    and need not conform to any URL-like shape.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Apr 18, 2010
  3. Documentation/remote-helpers: Add invocation section

    Add an 'Invocation' section to specify what the command line arguments
    mean. Also include a link to git-remote in the 'See Also' section.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Apr 7, 2010
  4. Documentation/urls: Rewrite to accomodate <transport>::<address>

    Rewrite the first part of the document to explicitly show differences
    between the URLs that can be used with different transport
    protocols. Mention <transport>::<address> format to explicitly invoke
    a remote helper.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Apr 6, 2010
  5. Documentation/remote-helpers: Rewrite description

    Rewrite the description section to describe what exactly remote
    helpers are and the need for them. Also mention the curl family of
    remote helpers as an example.
    
    [jc: with readability fixes from Jonathan squashed in]
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    artagnon committed with gitster Mar 28, 2010
  6. Documentation: Describe other situations where -z affects git diff

    -z also alters the behaviour of --name-only and --name-status.
    
    Signed-off-by: Charles Bailey <charles@hashpling.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    hashpling committed with gitster Apr 18, 2010
  7. rebase-interactive: silence warning when no commits rewritten

    If you do a "rebase -i" and don't change any commits,
    nothing is rewritten, and we have no REWRITTEN_LIST. The
    shell prints out an ugly message:
    
      $ GIT_EDITOR=true git rebase -i HEAD^
      /path/to/git-rebase--interactive: 1: cannot open
        /path/to/repo/.git/rebase-merge/rewritten-list: No such file
      Successfully rebased and updated refs/heads/master.
    
    We can fix it by not running "notes copy" at all if nothing
    was rewritten.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Apr 18, 2010
  8. t3301: add tests to use --format="%N"

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 18, 2010
Commits on Apr 17, 2010
  1. Merge branch 'maint'

    * maint:
      t1010-mktree: Adjust expected result to code and documentation
      combined diff: correctly handle truncated file
      Document new "already-merged" rule for branch -d
    gitster committed Apr 17, 2010
  2. t6006: do not write to /tmp

    Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Matthew Ogilvie committed with gitster Apr 17, 2010
  3. git-instaweb: pass through invoking user's path to gitweb CGI scripts

    When used with lighttpd or mongoose, git-instaweb previously passed a
    hard-coded, default value of PATH to the gitweb CGI script. Use the invoking
    user's value for PATH for this instead. (This is already implicitly the
    behaviour for other web servers supported by git-instaweb.)
    
    Signed-off-by: Chris Webb <chris@arachsys.com>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    arachsys committed with gitster Apr 15, 2010
  4. gitweb: simplify gitweb.min.* generation and clean-up rules

    GITWEB_CSS and GITWEB_JS are meant to be "what URI should the installed
    cgi script use to refer to the stylesheet and JavaScript", never "this
    is the name of the file we are building".  Don't use them to decide what
    file to build minified versions in.
    
    While we are at it, lose FILES that is used only for "clean" target in a
    misguided way.  "make clean" should try to remove all the potential
    build artifacts regardless of a minor configuration change. Instead of
    trying to remove only the build product "make clean" would have created
    if it were run without "clean", explicitly list the three potential build
    products for removal.
    
    Tested-by: Mark Rada <marada@uwaterloo.co>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Apr 15, 2010