Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jul 9, 2009
  1. @peff @gitster

    Makefile: install 'git' in execdir

    peff authored gitster committed
    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>
  2. @gitster

    Merge branch 'ld/push-porcelain-output-format'

    gitster authored
    * ld/push-porcelain-output-format:
      add --porcelain option to git-push
  3. @gitster

    Merge branch 'gb/gitweb-avatar'

    gitster authored
    * 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
  4. @gitster

    Merge branch 'ml/http'

    gitster authored
    * ml/http:
      http.c: add http.sslCertPasswordProtected option
      http.c: prompt for SSL client certificate password
    
    Conflicts:
    	http.c
  5. @gitster

    Merge branch 'rs/grep-p'

    gitster authored
    * 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()
  6. @gitster

    Merge branch 'js/run-command-updates' (early part)

    gitster authored
    * 'js/run-command-updates' (early part):
      MinGW: truncate exit()'s argument to lowest 8 bits
Commits on Jul 8, 2009
  1. @ydirson @gitster

    git-svn.txt: fix description of fetch flags accepted by clone.

    ydirson authored gitster committed
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @ydirson @gitster

    git-svn.txt: fix fetch flags incorrectly documented as init flags.

    ydirson authored gitster committed
    Signed-off-by: Yann Dirson <ydirson@altern.org>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @ydirson @gitster

    git-svn.txt: make formatting more consistent.

    ydirson authored gitster committed
    - 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>
  4. @ydirson @gitster

    git-svn.txt: stop using dash-form of commands.

    ydirson authored gitster committed
    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>
  5. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Documentation: update description of shell aliases
  6. @gitster

    Merge branch 'cb/maint-fetch-refspec-wo-dst' into maint

    gitster authored
    * cb/maint-fetch-refspec-wo-dst:
      fetch: do not create ref from empty name
  7. @gitster

    Merge branch 'cf/maint-remote-uploadpack-useconfig-fix' into maint

    gitster authored
    * cf/maint-remote-uploadpack-useconfig-fix:
      git-remote: fix missing .uploadpack usage for show command
  8. @sitaramc @gitster

    Documentation: update description of shell aliases

    sitaramc authored gitster committed
    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>
Commits on Jul 6, 2009
  1. @bebarino @gitster

    completion: __git_config_get_set_variables() handle values with spaces

    bebarino authored gitster committed
    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>
  2. @gitster

    Merge branch 'tr/die_errno'

    gitster authored
    * 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()
  3. @gitster

    Merge branch 'cb/maint-fetch-refspec-wo-dst'

    gitster authored
    * cb/maint-fetch-refspec-wo-dst:
      fetch: do not create ref from empty name
  4. @gitster

    Merge branch 'sb/show-ref-parse-options'

    gitster authored
    * sb/show-ref-parse-options:
      show-ref: migrate to parse-options
  5. @gitster

    Merge branch 'gb/am-foreign'

    gitster authored
    * 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
  6. @gitster

    Merge branch 'jk/use-our-regexp'

    gitster authored
    * jk/use-our-regexp:
      Makefile: Solaris needs HAVE_ALLOCA_H for alloca()
      Makefile: use compat regex on Solaris
      Makefile: refactor regex compat support
  7. @gitster

    Merge branch 'uk/rev-parse-parse-opt'

    gitster authored
    * 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
  8. @gitster

    Avoid generating a warning if $fullname{$file} is undefined

    Nick Woolley authored gitster committed
    Signed-off-by: Nick Woolley <git.wu-lee@noodlefactory.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. @gitster

    Remove archaic use of regex capture \1 in favour of $1

    Nick Woolley authored gitster committed
    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>
  10. @tmzullinger @gitster

    completion: Add --full-diff to log options

    tmzullinger authored gitster committed
    Signed-off-by: Todd Zullinger <tmz@pobox.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. @gitster

    Allow the Unix epoch to be a valid commit date

    Eric Wong authored gitster committed
    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>
  12. @gitster

    http-push: fix xml_entities() string parsing overrun

    Hunter, D. Seth authored gitster committed
    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>
Commits on Jul 5, 2009
  1. @gitster

    MinGW: truncate exit()'s argument to lowest 8 bits

    Johannes Sixt authored gitster committed
    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>
Commits on Jul 3, 2009
  1. @gitster

    grep: simplify -p output

    René Scharfe authored gitster committed
    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>
Commits on Jul 2, 2009
  1. @martinxyz @gitster

    Remove filename from conflict markers

    martinxyz authored gitster committed
    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>
  2. @gitster

    Merge branch 'cc/bisect'

    gitster authored
    * 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
  3. @gitster

    Merge branch 'js/daemon-log'

    gitster authored
    * 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
  4. @gitster

    Merge branch 'cf/maint-remote-uploadpack-useconfig-fix'

    gitster authored
    * cf/maint-remote-uploadpack-useconfig-fix:
      git-remote: fix missing .uploadpack usage for show command
  5. @gitster

    Merge branch 'sb/quiet-porcelains'

    gitster authored
    * 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
  6. @gitster

    Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'

    gitster authored
    * ne/maint-1.6.0-diff-tree-t-r-show-directory:
      diff-tree -r -t: include added/removed directories in the output
  7. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      request-pull: really really disable pager
Something went wrong with that request. Please try again.