Permalink
Commits on Jul 9, 2009
  1. Makefile: install 'git' in execdir

    When a git command executes a subcommand, it uses the "git
    foo" form, which relies on finding "git" in the PATH.
    Normally this should not be a problem, since the same "git"
    that was used to invoke git in the first place will be
    found.  And if somebody invokes a "git" outside of the PATH
    (e.g., by giving its absolute path), this case is already
    covered: we put that absolute path onto the front of PATH.
    
    However, if one is using "sudo", then sudo will execute the
    "git" from the PATH, but pass along a restricted PATH that
    may not contain the original "git" directory. In this case,
    executing a subcommand will fail.
    
    To solve this, we put the "git" wrapper itself into the
    execdir; this directory is prepended to the PATH when git
    starts, so the wrapper will always be found.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Jul 9, 2009
  2. Merge branch 'ld/push-porcelain-output-format'

    * ld/push-porcelain-output-format:
      add --porcelain option to git-push
    gitster committed Jul 9, 2009
  3. Merge branch 'gb/gitweb-avatar'

    * gb/gitweb-avatar:
      gitweb: add empty alt text to avatar img
      gitweb: picon avatar provider
      gitweb: gravatar url cache
      gitweb: (gr)avatar support
      gitweb: use git_print_authorship_rows in 'tag' view too
      gitweb: uniform author info for commit and commitdiff
      gitweb: refactor author name insertion
    gitster committed Jul 9, 2009
  4. Merge branch 'ml/http'

    * ml/http:
      http.c: add http.sslCertPasswordProtected option
      http.c: prompt for SSL client certificate password
    
    Conflicts:
    	http.c
    gitster committed Jul 9, 2009
  5. Merge branch 'rs/grep-p'

    * rs/grep-p:
      grep: simplify -p output
      grep -p: support user defined regular expressions
      grep: add option -p/--show-function
      grep: handle pre context lines on demand
      grep: print context hunk marks between files
      grep: move context hunk mark handling into show_line()
      userdiff: add xdiff_clear_find_func()
    gitster committed Jul 9, 2009
  6. Merge branch 'js/run-command-updates' (early part)

    * 'js/run-command-updates' (early part):
      MinGW: truncate exit()'s argument to lowest 8 bits
    gitster committed Jul 9, 2009
Commits on Jul 8, 2009
  1. git-svn.txt: fix description of fetch flags accepted by clone.

    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ydirson committed with gitster Jul 7, 2009
  2. git-svn.txt: fix fetch flags incorrectly documented as init flags.

    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ydirson committed with gitster Jul 7, 2009
  3. git-svn.txt: make formatting more consistent.

    - correctly link paragraphs within list items
    - consistently format examples
    - put option alernatives on separate lines
    - always use [verse] for config items
    - always indent 1st paragraph of a list item, with a tab
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ydirson committed with gitster Jul 7, 2009
  4. git-svn.txt: stop using dash-form of commands.

    Also consistently use single quotes around git commands to make things clear
    (was only needed at a couple of places).
    
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    ydirson committed with gitster Jul 7, 2009
  5. Merge branch 'maint'

    * maint:
      Documentation: update description of shell aliases
    gitster committed Jul 8, 2009
  6. Merge branch 'cb/maint-fetch-refspec-wo-dst' into maint

    * cb/maint-fetch-refspec-wo-dst:
      fetch: do not create ref from empty name
    gitster committed Jul 8, 2009
  7. Merge branch 'cf/maint-remote-uploadpack-useconfig-fix' into maint

    * cf/maint-remote-uploadpack-useconfig-fix:
      git-remote: fix missing .uploadpack usage for show command
    gitster committed Jul 8, 2009
  8. Documentation: update description of shell aliases

    Aliases that invoke shell commands start from the top-level directory,
    but this was not documented.
    
    Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    sitaramc committed with gitster Jul 1, 2009
Commits on Jul 6, 2009
  1. completion: __git_config_get_set_variables() handle values with spaces

    Commit 0065236 (bash completion: complete variable names for "git
    config" with options 2009-05-08) implemented its config variable search
    wrong. When a config contains a value with a space and a period (.) in
    it, completion erroneously thinks that line in the configuration is
    multiple config variables.
    
    For example
    
     $ cat .git/config
       format.cc = Junio C Hamano <gitster@pobox.com>
    
     $ git config --unset <TAB>
       format.cc
       <gitster@pobox.com>
    
    Instead of using a for loop splitting across spaces, pipe each line to a
    while read loop and beef up the case statement to match only
    'config.variable=value'.
    
    Signed-off-by: Stephen Boyd <bebarino@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    bebarino committed with gitster Jun 30, 2009
  2. Merge branch 'tr/die_errno'

    * tr/die_errno:
      Use die_errno() instead of die() when checking syscalls
      Convert existing die(..., strerror(errno)) to die_errno()
      die_errno(): double % in strerror() output just in case
      Introduce die_errno() that appends strerror(errno) to die()
    gitster committed Jul 6, 2009
  3. Merge branch 'cb/maint-fetch-refspec-wo-dst'

    * cb/maint-fetch-refspec-wo-dst:
      fetch: do not create ref from empty name
    gitster committed Jul 6, 2009
  4. Merge branch 'sb/show-ref-parse-options'

    * sb/show-ref-parse-options:
      show-ref: migrate to parse-options
    gitster committed Jul 6, 2009
  5. Merge branch 'gb/am-foreign'

    * gb/am-foreign:
      git-am: refactor 'cleaning up and aborting'
      git-am foreign patch support: StGIT support
      git-am foreign patch support: autodetect some patch formats
      git-am foreign patch support: introduce patch_format
    gitster committed Jul 6, 2009
  6. Merge branch 'jk/use-our-regexp'

    * jk/use-our-regexp:
      Makefile: Solaris needs HAVE_ALLOCA_H for alloca()
      Makefile: use compat regex on Solaris
      Makefile: refactor regex compat support
    gitster committed Jul 6, 2009
  7. Merge branch 'uk/rev-parse-parse-opt'

    * uk/rev-parse-parse-opt:
      parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev-parse
      more tests for git rev-parse --parse-opt
    gitster committed Jul 6, 2009
  8. Avoid generating a warning if $fullname{$file} is undefined

    Signed-off-by: Nick Woolley <git.wu-lee@noodlefactory.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Nick Woolley committed with gitster Jul 6, 2009
  9. Remove archaic use of regex capture \1 in favour of $1

    Using it will generate a perl warning "\1 better written as $1".
    
    Signed-off-by: Nick Woolley <git.wu-lee@noodlefactory.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Nick Woolley committed with gitster Jul 6, 2009
  10. completion: Add --full-diff to log options

    Signed-off-by: Todd Zullinger <tmz@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    tmzullinger committed with gitster Jun 3, 2009
  11. Allow the Unix epoch to be a valid commit date

    It is common practice to use the Unix epoch as a fallback date
    when a suitable date is not available.  This is true of git svn
    and possibly other importing tools that import non-git history
    into git.
    
    Instead of clobbering established strtoul() error reporting
    semantics with our own, preserve the strtoul() error value
    of ULONG_MAX for fsck.c to handle.
    
    Signed-off-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Eric Wong committed with gitster Jul 3, 2009
  12. http-push: fix xml_entities() string parsing overrun

    xml_entities() in http-push.c did not properly stop at the end of the
    string being examined, which would occasionally cause nonsense to be
    appended to escaped URL strings and result in failed DAV XML queries
    
    Signed-off-by: Seth Hunter <hunter@ll.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Hunter, D. Seth committed with gitster Jul 1, 2009
Commits on Jul 5, 2009
  1. MinGW: truncate exit()'s argument to lowest 8 bits

    For some reason, MinGW's bash cannot reliably detect failure of the child
    process if a negative value is passed to exit(). This fixes it by
    truncating the exit code in all calls of exit().
    
    This issue was worked around in run_builtin() of git.c (2488df8 builtin
    run_command: do not exit with -1, 2007-11-15). This workaround is no longer
    necessary and is reverted.
    
    Suggested-by: Junio C Hamano <gitster@pobox.com>
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    j6t committed with gitster Jul 5, 2009
Commits on Jul 3, 2009
  1. grep: simplify -p output

    It was found a bit too loud to show == separators between the function
    headers.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe committed with gitster Jul 1, 2009
Commits on Jul 2, 2009
  1. Remove filename from conflict markers

    Put filenames into the conflict markers only when they are different.
    Otherwise they are redundant information clutter.
    
    Print the filename explicitely when warning about a binary conflict.
    
    Signed-off-by: Martin Renold <martinxyz@gmx.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Martin Renold committed with gitster Jul 1, 2009
  2. Merge branch 'cc/bisect'

    * cc/bisect:
      Documentation: remove warning saying that "git bisect skip" may slow bisection
      bisect: use a PRNG with a bias when skipping away from untestable commits
    gitster committed Jul 2, 2009
  3. Merge branch 'js/daemon-log'

    * js/daemon-log:
      receive-pack: do not send error details to the client
      upload-pack: squelch progress indicator if client cannot see it
      daemon: send stderr of service programs to the syslog
    gitster committed Jul 2, 2009
  4. Merge branch 'cf/maint-remote-uploadpack-useconfig-fix'

    * cf/maint-remote-uploadpack-useconfig-fix:
      git-remote: fix missing .uploadpack usage for show command
    gitster committed Jul 2, 2009
  5. Merge branch 'sb/quiet-porcelains'

    * sb/quiet-porcelains:
      stash: teach quiet option
      am, rebase: teach quiet option
      submodule, repack: migrate to git-sh-setup's say()
      git-sh-setup: introduce say() for quiet options
      am: suppress apply errors when using 3-way
      t4150: test applying with a newline in subject
    gitster committed Jul 2, 2009
  6. Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'

    * ne/maint-1.6.0-diff-tree-t-r-show-directory:
      diff-tree -r -t: include added/removed directories in the output
    gitster committed Jul 2, 2009
  7. Merge branch 'maint'

    * maint:
      request-pull: really really disable pager
    gitster committed Jul 2, 2009