Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jan 25, 2010
  1. @gitster

    Add test-run-command to .gitignore

    Alejandro Riveira Fernández authored gitster committed
    Add test-run-command to .gitignore so it does not pollute
    git status output.
    
    Signed-off-by: Alejandro Riveira Fernández <ariveira@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 13, 2010
  1. @gitster

    Merge branch 'il/vcs-helper'

    gitster authored
    * il/vcs-helper:
      Reset possible helper before reusing remote structure
      Remove special casing of http, https and ftp
      Support remote archive from all smart transports
      Support remote helpers implementing smart transports
      Support taking over transports
      Refactor git transport options parsing
      Pass unknown protocols to external protocol handlers
      Support mandatory capabilities
      Add remote helper debug mode
    
    Conflicts:
    	Documentation/git-remote-helpers.txt
    	transport-helper.c
  2. @gitster

    Merge branch 'nd/sparse'

    gitster authored
    * nd/sparse: (25 commits)
      t7002: test for not using external grep on skip-worktree paths
      t7002: set test prerequisite "external-grep" if supported
      grep: do not do external grep on skip-worktree entries
      commit: correctly respect skip-worktree bit
      ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID
      tests: rename duplicate t1009
      sparse checkout: inhibit empty worktree
      Add tests for sparse checkout
      read-tree: add --no-sparse-checkout to disable sparse checkout support
      unpack-trees(): ignore worktree check outside checkout area
      unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
      unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
      unpack-trees.c: generalize verify_* functions
      unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
      Introduce "sparse checkout"
      dir.c: export excluded_1() and add_excludes_from_file_1()
      excluded_1(): support exclude files in index
      unpack-trees(): carry skip-worktree bit over in merged_entry()
      Read .gitignore from index if it is skip-worktree
      Avoid writing to buffer in add_excludes_from_file_1()
      ...
    
    Conflicts:
    	.gitignore
    	Documentation/config.txt
    	Documentation/git-update-index.txt
    	Makefile
    	entry.c
    	t/t7002-grep.sh
Commits on Dec 28, 2009
  1. @gitster

    Remove special casing of http, https and ftp

    Ilari Liusvaara authored gitster committed
    HTTP, HTTPS and FTP are no longer special to transport code. Also
    add support for FTPS (curl supports it so it is easy).
    
    Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 3, 2009
  1. @gitster

    build dashless "bin-wrappers" directory similar to installed bindir

    Matthew Ogilvie authored gitster committed
    The new bin-wrappers directory contains wrapper scripts
    for executables that will be installed into the standard
    bindir.  It explicitly does not contain most dashed-commands.
    The scripts automatically set environment variables to run out
    of the source tree, not the installed directory.
    
    This will allow running the test suite without dashed commands in
    the PATH.  It also provides a simplified way to test run custom
    built git executables without installing them first.
    
    bin-wrappers also contains wrappers for some test suite support
    executables, where the test suite will soon make use of them.
    
    Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 21, 2009
  1. @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
  2. @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
Commits on Nov 10, 2009
  1. @gitster

    Merge branch 'jk/gitignore-anchored'

    gitster authored
    * jk/gitignore-anchored:
      gitignore: root most patterns at the top-level directory
    
    Conflicts:
    	.gitignore
Commits on Nov 9, 2009
  1. @jrn @gitster

    Add intermediate build products to .gitignore

    jrn authored gitster committed
    Temporaries such as configure.ac+ and Documentation/*.xml+
    sometimes remain after an interrupted build.  Tell git not to
    track them.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Nov 5, 2009
  1. @spearce @gitster

    Git-aware CGI to provide dumb HTTP transport

    spearce authored gitster committed
    The git-http-backend CGI can be configured into any Apache server
    using ScriptAlias, such as with the following configuration:
    
      LoadModule cgi_module /usr/libexec/apache2/mod_cgi.so
      LoadModule alias_module /usr/libexec/apache2/mod_alias.so
      ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/
    
    Repositories are accessed via the translated PATH_INFO.
    
    The CGI is backwards compatible with the dumb client, allowing all
    older HTTP clients to continue to download repositories which are
    managed by the CGI.
    
    Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 28, 2009
  1. @peff @gitster

    gitignore: root most patterns at the top-level directory

    peff authored gitster committed
    Our gitignore doesn't use a preceding "/" to root its
    patterns in the top of the repository. This means that if
    you add a file or directory called "git" (for example)
    inside a subdirectory, it will be erroneously ignored.
    
    This patch was done mechanically with "s/^[^*]/\/&/" with
    one exception: instead of ignoring gitk-wish, we should
    gitk-git/gitk-wish (arguably, this should be done in
    gitk-git/.gitignore, but because that is a subtree merge
    from elsewhere, this is easier).
    
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Oct 20, 2009
  1. @dscho @gitster

    Add a script to edit/inspect notes

    dscho authored gitster committed
    The script 'git notes' allows you to edit and show commit notes, by
    calling either
    
    	git notes show <commit>
    
    or
    
    	git notes edit <commit>
    
    This patch has been improved by the following contributions:
    - Tor Arne Vestbø: fix printing of multi-line notes
    - Michael J Gruber: test and handle empty notes gracefully
    - Thomas Rast:
      - only clean up message file when editing
      - use GIT_EDITOR and core.editor over VISUAL/EDITOR
      - t3301: fix confusing quoting in test for valid notes ref
      - t3301: use test_must_fail instead of !
      - refuse to edit notes outside refs/notes/
    - Junio C Hamano: tests: fix "export var=val"
    - Christian Couder: documentation: fix 'linkgit' macro in "git-notes.txt"
    - Johan Herland: minor cleanup and bugfixing in git-notes.sh (v2)
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Tor Arne Vestbø <tavestbo@trolltech.com>
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
    Signed-off-by: Johan Herland <johan@herland.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 19, 2009
  1. @mstormo @gitster

    Add scripts to generate projects for other buildsystems (MSVC vcproj,…

    mstormo authored gitster committed
    … QMake)
    
    These scripts generate projects for the MSVC IDE (.vcproj files) or
    QMake (.pro files), based on the output of a 'make -n MSVC=1 V=1' run.
    
    This enables us to simply do the necesarry changes in the Makefile, and you
    can update the other buildsystems by regenerating the files. Keeping the
    other buildsystems up-to-date with main development.
    
    The generator system is designed to easily drop in pm's for other
    buildsystems as well, if someone has an itch. However, the focus has been
    Windows development, so the 'engine' might need patches to support any
    platform.
    
    Also add some .gitignore entries for MSVC files.
    
    Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
    Acked-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Sep 13, 2009
  1. @gitster

    Merge branch 'db/vcs-helper'

    gitster authored
    * db/vcs-helper:
      Makefile: remove remnant of separate http/https/ftp helpers
      Use a clearer style to issue commands to remote helpers
      Make the "traditionally-supported" URLs a special case
      Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
      Makefile: do not link three copies of git-remote-* programs
      Makefile: git-http-fetch does not need expat
      http-fetch: Fix Makefile dependancies
      Add transport native helper executables to .gitignore
      git-http-fetch: not a builtin
      Use an external program to implement fetching with curl
      Add support for external programs for handling native fetches
Commits on Sep 12, 2009
  1. @gitster

    Makefile: remove remnant of separate http/https/ftp helpers

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 24, 2009
  1. @pclouds @gitster

    Add test-index-version

    pclouds authored gitster committed
    Commit 06aaaa0 may step index format
    version up and down, depends on whether extended flags present in the
    index. This adds a test to check for index format version.
    
    Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 6, 2009
  1. @MikeRalphson @gitster

    Add transport native helper executables to .gitignore

    MikeRalphson authored gitster committed
    Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 1, 2009
  1. @davvid @gitster

    Add git-replace to .gitignore

    davvid authored gitster committed
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 18, 2009
  1. @gitster

    Merge branch 'da/difftool'

    gitster authored
    * da/difftool:
      mergetool--lib: simplify API usage by removing more global variables
      Fix misspelled mergetool.keepBackup
      difftool/mergetool: refactor commands to use git-mergetool--lib
      mergetool: use $( ... ) instead of `backticks`
      bash completion: add git-difftool
      difftool: add support for a difftool.prompt config variable
      difftool: add various git-difftool tests
      difftool: move 'git-difftool' out of contrib
      difftool/mergetool: add diffuse as merge and diff tool
      difftool: add a -y shortcut for --no-prompt
      difftool: use perl built-ins when testing for msys
      difftool: remove the backup file feature
      difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff
      git-mergetool: add new merge tool TortoiseMerge
      git-mergetool/difftool: make (g)vimdiff workable under Windows
      doc/merge-config: list ecmerge as a built-in merge tool
Commits on Apr 13, 2009
  1. @gitster

    gitignore git-bisect--helper

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 8, 2009
  1. @davvid @gitster

    difftool/mergetool: refactor commands to use git-mergetool--lib

    davvid authored gitster committed
    This consolidates the common functionality from git-mergetool and
    git-difftool--helper into a single git-mergetool--lib scriptlet.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @davvid @gitster

    difftool: move 'git-difftool' out of contrib

    davvid authored gitster committed
    This prepares 'git-difftool' and its documentation for
    mainstream use.
    
    'git-difftool-helper' became 'git-difftool--helper'
    since users should not use it directly.
    
    'git-difftool' was added to the list of commands as
    an ancillaryinterrogator.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 11, 2009
  1. @gitster

    Revert "Merge branch 'js/notes'"

    gitster authored
    This reverts commit 7b75b33, reversing
    changes made to 5d680a6.
Commits on Feb 6, 2009
  1. @gitster

    Merge branch 'js/notes'

    gitster authored
    * js/notes:
      git-notes: fix printing of multi-line notes
      notes: fix core.notesRef documentation
      Add an expensive test for git-notes
      Speed up git notes lookup
      Add a script to edit/inspect notes
      Introduce commit notes
    
    Conflicts:
    	pretty.c
Commits on Feb 1, 2009
  1. @gitster

    Merge branch 'jk/signal-cleanup'

    gitster authored
    * jk/signal-cleanup:
      t0005: use SIGTERM for sigchain test
      pager: do wait_for_pager on signal death
      refactor signal handling for cleanup functions
      chain kill signals for cleanup functions
      diff: refactor tempfile cleanup handling
      Windows: Fix signal numbers
Commits on Jan 25, 2009
  1. @d0k @gitster

    Ignore test-ctype

    d0k authored gitster committed
    Signed-off-by: Benjamin Kramer <benny.kra@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 22, 2009
  1. @peff @gitster

    chain kill signals for cleanup functions

    peff authored gitster committed
    If a piece of code wanted to do some cleanup before exiting
    (e.g., cleaning up a lockfile or a tempfile), our usual
    strategy was to install a signal handler that did something
    like this:
    
      do_cleanup(); /* actual work */
      signal(signo, SIG_DFL); /* restore previous behavior */
      raise(signo); /* deliver signal, killing ourselves */
    
    For a single handler, this works fine. However, if we want
    to clean up two _different_ things, we run into a problem.
    The most recently installed handler will run, but when it
    removes itself as a handler, it doesn't put back the first
    handler.
    
    This patch introduces sigchain, a tiny library for handling
    a stack of signal handlers. You sigchain_push each handler,
    and use sigchain_pop to restore whoever was before you in
    the stack.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 21, 2008
  1. @dscho @gitster

    Add a script to edit/inspect notes

    dscho authored gitster committed
    The script 'git notes' allows you to edit and show commit notes, by
    calling either
    
    	git notes show <commit>
    
    or
    
    	git notes edit <commit>
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 4, 2008
  1. @peff @gitster

    add stage to gitignore

    peff authored gitster committed
    This is a generated builtin since 24b1f65 (Install git-stage in
    exec-path).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 14, 2008
  1. @hendeby @gitster

    Update .gitignore to ignore git-help

    hendeby authored gitster committed
    Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 7, 2008
  1. @gitster

    Merge branch 'dr/ceiling'

    gitster authored
    * dr/ceiling:
      Eliminate an unnecessary chdir("..")
      Add support for GIT_CEILING_DIRECTORIES
      Fold test-absolute-path into test-path-utils
      Implement normalize_absolute_path
    
    Conflicts:
    
    	cache.h
    	setup.c
Commits on Jul 5, 2008
  1. @gitster

    Retire 'stupid' merge strategy

    Miklos Vajna authored gitster committed
    As pointed out by Linus, this strategy tries to take the best merge
    base, but 'recursive' just does it better. If one needs something more
    than 'resolve' then he/she should really use 'recursive' and not
    'stupid'.
    
    Cf. Message-ID: <alpine.LFD.1.10.0807030947360.18105@woody.linux-foundation.org>
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 23, 2008
  1. @gitster

    Fold test-absolute-path into test-path-utils

    David Reiss authored gitster committed
    Signed-off-by: David Reiss <dreiss@facebook.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Implement normalize_absolute_path

    David Reiss authored gitster committed
    normalize_absolute_path removes several oddities form absolute paths,
    giving nice clean paths like "/dir/sub1/sub2".  Also add a test case
    for this utility, based on a new test program (in the style of test-sha1).
    
    Signed-off-by: David Reiss <dreiss@facebook.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 29, 2008
  1. @peff @gitster

    use build-time SHELL_PATH in test scripts

    peff authored gitster committed
    The top-level Makefile now creates a GIT-BUILD-OPTIONS file
    which stores any options selected by the make process that
    may be of use to further parts of the build process.
    Specifically, we store the SHELL_PATH so that it can be used
    by tests to construct shell scripts on the fly.
    
    The format of the GIT-BUILD-OPTIONS file is Bourne shell,
    and it is sourced by test-lib.sh; all tests can rely on just
    having $SHELL_PATH correctly set in the environment.
    
    The GIT-BUILD-OPTIONS file is written every time the
    toplevel 'make' is invoked. Since the only users right now
    are the test scripts, there's no drawback to updating its
    timestamp. If something build-related depends on this, we
    can do a trick similar to the one used by GIT-CFLAGS.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.