Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: 20100613/jnar/…
Commits on Jun 15, 2010
  1. @jnareb

    gitweb: Return or exit after done serving request

    jnareb authored committed
    Check if there is a caller in top frame of gitweb, and either 'return'
    if gitweb code is wrapped in subroutine, or 'exit' if it is not.
    
    This should avoid
    
      gitweb.cgi: Subroutine git_SOMETHING redefined at gitweb.cgi line NNN
    
    warnings in error_log when running gitweb with mod_perl (using
    ModPerl::Registry handler)
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Commits on Jun 13, 2010
  1. @gitster

    Merge branch 'ab/cvsserver'

    gitster authored
    * ab/cvsserver:
      git-cvsserver: test for pserver authentication support
      git-cvsserver: document making a password without htpasswd
      git-cvsserver: Improved error handling for pserver
      git-cvsserver: indent & clean up authdb code
      git-cvsserver: use a password file cvsserver pserver
      git-cvsserver: authentication support for pserver
  2. @gitster

    Merge branch 'mg/notes-dry-run'

    gitster authored
    * mg/notes-dry-run:
      notes: dry-run and verbose options for prune
  3. @gitster

    Merge branch 'mc/maint-zoneparse'

    gitster authored
    * mc/maint-zoneparse:
      Add "Z" as an alias for the timezone "UTC"
  4. @gitster

    Merge branch 'jk/diff-m-doc'

    gitster authored
    * jk/diff-m-doc:
      docs: clarify meaning of -M for git-log
  5. @gitster

    Merge branch 'jn/maint-doc-ignore'

    gitster authored
    * jn/maint-doc-ignore:
      gitignore.5: Clarify matching rules
  6. @gitster

    Merge branch 'jn/fsck-ident'

    gitster authored
    * jn/fsck-ident:
      fsck: fix bogus commit header check
  7. @gitster

    Merge branch 'bs/userdiff-php'

    gitster authored
    * bs/userdiff-php:
      diff: Support visibility modifiers in the PHP hunk header regexp
  8. @gitster

    Merge branch 'jk/maint-sha1-file-name-fix'

    gitster authored
    * jk/maint-sha1-file-name-fix:
      remove over-eager caching in sha1_file_name
  9. @gitster

    Merge branch 'jk/maint-pull-dry-run-noop'

    gitster authored
    * jk/maint-pull-dry-run-noop:
      pull: do nothing on --dry-run
  10. @gitster

    Merge branch 'ab/submodule-foreach-toplevel'

    gitster authored
    * ab/submodule-foreach-toplevel:
      git-submodule foreach: Add $toplevel variable
  11. @gitster

    Merge branch 'rs/grep-binary'

    gitster authored
    * rs/grep-binary:
      grep: support NUL chars in search strings for -F
      grep: use REG_STARTEND for all matching if available
      grep: continue case insensitive fixed string search after NUL chars
      grep: use memmem() for fixed string search
      grep: --name-only over binary
      grep: --count over binary
      grep: grep: refactor handling of binary mode options
      grep: add test script for binary file handling
  12. @gitster

    Merge branch 'jn/gitweb-syntax-highlight'

    gitster authored
    * jn/gitweb-syntax-highlight:
      gitweb: Refactor syntax highlighting support
      gitweb: Syntax highlighting support
  13. @gitster

    Merge branch 'js/maint-windows'

    gitster authored
    * js/maint-windows:
      Recent MinGW has a C99 implementation of snprintf functions
      mingw: use _commit to implement fsync
  14. @gitster

    Merge branch 'bw/diff-metainfo-color'

    gitster authored
    * bw/diff-metainfo-color:
      diff: fix coloring of extended diff headers
  15. @gitster

    Merge branch 'js/try-to-free-stackable'

    gitster authored
    * js/try-to-free-stackable:
      Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used
      Have set_try_to_free_routine return the previous routine
  16. @gitster

    Merge branch 'jn/make-header-dependency'

    gitster authored
    * jn/make-header-dependency:
      Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES
      Makefile: fix header dependency checker to allow NO_CURL builds
  17. @gitster

    Merge branch 'cb/assume-unchanged-fix'

    gitster authored
    * cb/assume-unchanged-fix:
      Documentation: git-add does not update files marked "assume unchanged"
      do not overwrite files marked "assume unchanged"
  18. @gitster

    Merge branch 'jn/notes-doc'

    gitster authored
    * jn/notes-doc:
      Documentation/notes: nitpicks
      Documentation/notes: clean up description of rewriting configuration
      Documentation/notes: simplify treatment of default display refs
      Documentation/log: add a CONFIGURATION section
      Documentation/notes: simplify treatment of default notes ref
      Documentation/notes: add configuration section
      Documentation/notes: describe content of notes blobs
      Documentation/notes: document format of notes trees
  19. @gitster

    Merge branch 'wp/pretty-enhancement'

    gitster authored
    * wp/pretty-enhancement:
      pretty: initialize new cmt_fmt_map to 0
      pretty: add aliases for pretty formats
      pretty: add infrastructure for commit format aliases
      pretty: make it easier to add new formats
  20. @gitster

    Merge branch 'ab/test-cleanup'

    gitster authored
    * ab/test-cleanup:
      Turn setup code in t2007-checkout-symlink.sh into a test
      Move t6000lib.sh to lib-*
  21. @gitster

    Merge branch 'jn/maint-amend-missing-name'

    gitster authored
    * jn/maint-amend-missing-name:
      commit --amend: cope with missing display name
  22. @gitster

    Merge branch 'rs/diff-no-minimal'

    gitster authored
    * rs/diff-no-minimal:
      git diff too slow for a file
  23. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      add-interactive: Clarify “remaining hunks in the file”
  24. @jrn @gitster

    add-interactive: Clarify “remaining hunks in the file”

    jrn authored gitster committed
    The "a" and "d" commands to ‘add --patch’ (accept/reject rest of file)
    interact with "j", "g", and "/" (skip some hunks) in a perhaps
    confusing way: after accepting or rejecting all _later_ hunks in the
    file, they return to the earlier, skipped hunks and prompt the user
    about them again.
    
    This behavior can be very useful in practice.  One can still accept or
    reject _all_ undecided hunks in a file by using the "g" command to
    move to hunk #1 first.
    
    Reported-by: Frédéric Brière <fbriere@fbriere.net>
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  25. @jnareb @gitster

    gitweb: Fix typo in hash key name in %opts in git_header_html

    jnareb authored gitster committed
    The name of the key has to be the same in call site handle_errors_html
    and in called subroutine that uses it, i.e. git_header_html.
    
    Signed-off-by: Jakub Narebski <jnareb@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 12, 2010
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      t/README: document --root option
      Makefile: default pager on AIX to "more"
Commits on Jun 11, 2010
  1. @trast @gitster

    t/README: document --root option

    trast authored gitster committed
    We've had this option since f423ef5 (tests: allow user to specify
    trash directory location, 2009-08-09).  Make it easier to look up :-)
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @peff @gitster

    Makefile: default pager on AIX to "more"

    peff authored gitster committed
    AIX doesn't ship with "less" by default, and their "more" is
    more featureful than average, so the latter is a more
    sensible choice.  People who really want less can set the
    compile-time option themselves, or users can set $PAGER.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Tested-by: Tor Arntsen <tor@spacetec.no>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    merge-recursive: demonstrate an incorrect conflict with submodule

    Johannes Sixt authored gitster committed
    When one side of a merge turns a directory into a submodule, and the other
    side does not touch that directory (but has other non-conflicting changes),
    then a merge should succeed. But currently, it does not; it rather fails
    with a file/directory conflict.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 10, 2010
  1. @peff @gitster

    Makefile: default pager on AIX to "more"

    peff authored gitster committed
    AIX doesn't ship with "less" by default, and their "more" is
    more featureful than average, so the latter is a more
    sensible choice.  People who really want less can set the
    compile-time option themselves, or users can set $PAGER.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Tested-by: Tor Arntsen <tor@spacetec.no>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 8, 2010
  1. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      Change C99 comments to old-style C comments
Commits on Jun 7, 2010
  1. @ptor @gitster

    Change C99 comments to old-style C comments

    ptor authored gitster committed
    Signed-off-by: Tor Arntsen <tor@spacetec.no>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'maint'

    gitster authored
    * maint:
      commit.txt: clarify how --author argument is used
  3. @jaysoffian @gitster

    commit.txt: clarify how --author argument is used

    jaysoffian authored gitster committed
    commit --author was added by 146ea06 (git commit --author=$name: look $name up
    in existing commits), but its documentation was sorely lacking compared to its
    excellent commit message. This commit tries to improve the documentation.
    
    Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.