Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 24, 2011
  1. @gitster

    Sync with 1.7.6.1

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

    Merge branch 'jc/maint-smart-http-race-upload-pack'

    gitster authored
    * jc/maint-smart-http-race-upload-pack:
      helping smart-http/stateless-rpc fetch race
Commits on Aug 8, 2011
  1. @gitster

    helping smart-http/stateless-rpc fetch race

    gitster authored
    A request to fetch from a client over smart HTTP protocol is served in
    multiple steps. In the first round, the server side shows the set of refs
    it has and their values, and the client picks from them and sends "I want
    to fetch the history leading to these commits".
    
    When the server tries to respond to this second request, its refs may have
    progressed by a push from elsewhere. By design, we do not allow fetching
    objects that are not at the tip of an advertised ref, and the server
    rejects such a request. The client needs to try again, which is not ideal
    especially for a busy server.
    
    Teach upload-pack (which is the workhorse driven by git-daemon and smart
    http server interface) that it is OK for a smart-http client to ask for
    commits that are not at the tip of any advertised ref, as long as they are
    reachable from advertised refs.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 27, 2011
  1. @gitster

    Merge branch 'jk/maint-upload-pack-shallow'

    gitster authored
    * jk/maint-upload-pack-shallow:
      upload-pack: start pack-objects before async rev-list
Commits on Mar 29, 2011
  1. @gitster

    Merge branches 'sp/maint-fetch-pack-stop-early' and 'sp/maint-upload-…

    gitster authored
    …pack-stop-early'
    
    * sp/maint-fetch-pack-stop-early:
      enable "no-done" extension only when fetching over smart-http
    
    * sp/maint-upload-pack-stop-early:
      enable "no-done" extension only when serving over smart-http
  2. @gitster

    Revert two "no-done" reverts

    gitster authored
    Last night I had to make these two emergency reverts, but now we have a
    better understanding of which part of the topic was broken, let's get rid
    of the revert to fix it correctly.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @gitster

    enable "no-done" extension only when serving over smart-http

    gitster authored
    Do not advertise no-done capability when upload-pack is not serving over
    smart-http, as there is no way for this server to know when it should stop
    reading in-flight data from the client, even though it is necessary to
    drain all the in-flight data in order to unblock the client.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Acked-by: Shawn O. Pearce <spearce@spearce.org>
  4. @gitster

    Revert "upload-pack: Implement no-done capability"

    gitster authored
    This reverts 3e63b21 (upload-pack: Implement no-done capability,
    2011-03-14).  Together with 761ecf0 (fetch-pack: Implement no-done
    capability, 2011-03-14) it seems to make the fetch-pack process out of
    sync and makes it keep talking long after upload-pack stopped listening to
    it, terminating the process with SIGPIPE.
Commits on Mar 23, 2011
  1. @gitster

    Merge branch 'sp/maint-upload-pack-stop-early'

    gitster authored
    * sp/maint-upload-pack-stop-early:
      upload-pack: Implement no-done capability
      upload-pack: More aggressively send 'ACK %s ready'
Commits on Dec 11, 2009
  1. @gitster

    Sync with 1.6.5.6

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

    Remove post-upload-hook

    gitster authored
    This hook runs after "git fetch" in the repository the objects are
    fetched from as the user who fetched, and has security implications.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 3, 2009
  1. @gitster

    Merge branch 'np/maint-sideband-favor-status' into maint

    gitster authored
    * np/maint-sideband-favor-status:
      give priority to progress messages
Commits on Nov 21, 2009
  1. @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 18, 2009
  1. @gitster

    Merge branch 'np/maint-sideband-favor-status'

    gitster authored
    * np/maint-sideband-favor-status:
      give priority to progress messages
Commits on Sep 7, 2009
  1. @gitster

    Merge branch 'jc/upload-pack-hook'

    gitster authored
    * jc/upload-pack-hook:
      upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook
      upload-pack: add a trigger for post-upload-pack hook
  2. @gitster

    Merge branch 'np/maint-1.6.3-deepen'

    gitster authored
    * np/maint-1.6.3-deepen:
      pack-objects: free preferred base memory after usage
      make shallow repository deepening more network efficient
Commits on Aug 29, 2009
  1. @gitster

    upload-pack: feed "kind [clone|fetch]" to post-upload-pack hook

    gitster authored
    A request to clone the repository does not give any "have" but asks for
    all the refs we offer with "want".  When a request does not ask to clone
    the repository fully, but asks to fetch some refs into an empty
    repository, it will not give any "have" but its "want" won't ask for all
    the refs we offer.
    
    If we suppose (and I would say this is a rather big if) that it makes
    sense to distinguish these two cases, a hook cannot reliably do this
    alone.  The hook can detect lack of "have" and bunch of "want", but there
    is no direct way to tell if the other end asked for all refs we offered,
    or merely most of them.
    
    Between the time we talked with the other end and the time the hook got
    called, we may have acquired more refs or lost some refs in the repository
    by concurrent operations.  Given that we plan to introduce selective
    advertisement of refs with a protocol extension, it would become even more
    difficult for hooks to guess between these two cases.
    
    This adds "kind [clone|fetch]" to hook's input, as a stable interface to
    allow the hooks to tell these cases apart.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    upload-pack: add a trigger for post-upload-pack hook

    gitster authored
    After upload-pack successfully finishes its operation, post-upload-pack
    hook can be called for logging purposes.
    
    The hook is passed various pieces of information, one per line, from its
    standard input.  Currently the following items can be fed to the hook, but
    more types of information may be added in the future:
    
        want SHA-1::
            40-byte hexadecimal object name the client asked to include in the
            resulting pack.  Can occur one or more times in the input.
    
        have SHA-1::
            40-byte hexadecimal object name the client asked to exclude from
            the resulting pack, claiming to have them already.  Can occur zero
            or more times in the input.
    
        time float::
            Number of seconds spent for creating the packfile.
    
        size decimal::
            Size of the resulting packfile in bytes.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Aug 22, 2009
  1. @gitster

    Merge branch 'cc/replace'

    gitster authored
    * cc/replace:
      t6050: check pushing something based on a replaced commit
      Documentation: add documentation for "git replace"
      Add git-replace to .gitignore
      builtin-replace: use "usage_msg_opt" to give better error messages
      parse-options: add new function "usage_msg_opt"
      builtin-replace: teach "git replace" to actually replace
      Add new "git replace" command
      environment: add global variable to disable replacement
      mktag: call "check_sha1_signature" with the replacement sha1
      replace_object: add a test case
      object: call "check_sha1_signature" with the replacement sha1
      sha1_file: add a "read_sha1_file_repl" function
      replace_object: add mechanism to replace objects found in "refs/replace/"
      refs: add a "for_each_replace_ref" function
Commits on Aug 5, 2009
  1. @gitster

    Merge branch 'ne/futz-upload-pack'

    gitster authored
    * ne/futz-upload-pack:
      Shift object enumeration out of upload-pack
    
    Conflicts:
    	upload-pack.c
Commits on May 3, 2009
  1. @gitster

    Merge branch 'lt/pack-object-memuse' into maint

    gitster authored
    * lt/pack-object-memuse:
      show_object(): push path_name() call further down
      process_{tree,blob}: show objects without buffering
Commits on Apr 18, 2009
  1. @gitster

    Merge branch 'lt/pack-object-memuse'

    gitster authored
    * lt/pack-object-memuse:
      show_object(): push path_name() call further down
      process_{tree,blob}: show objects without buffering
    
    Conflicts:
    	builtin-pack-objects.c
    	builtin-rev-list.c
    	list-objects.c
    	list-objects.h
    	upload-pack.c
Commits on Aug 31, 2008
  1. @gitster

    'git foo' program identifies itself without dash in die() messages

    gitster authored
    This is a mechanical conversion of all '*.c' files with:
    
    	s/((?:die|error|warning)\("git)-(\S+:)/$1 $2/;
    
    The result was manually inspected and no false positive was found.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Mar 2, 2008
  1. @gitster

    Merge branch 'mk/maint-parse-careful'

    gitster authored
    * mk/maint-parse-careful:
      receive-pack: use strict mode for unpacking objects
      index-pack: introduce checking mode
      unpack-objects: prevent writing of inconsistent objects
      unpack-object: cache for non written objects
      add common fsck error printing function
      builtin-fsck: move common object checking code to fsck.c
      builtin-fsck: reports missing parent commits
      Remove unused object-ref code
      builtin-fsck: move away from object-refs to fsck_walk
      add generic, type aware object chain walker
    
    Conflicts:
    
    	Makefile
    	builtin-fsck.c
Commits on Feb 19, 2008
  1. @gitster

    Merge branch 'mk/maint-parse-careful'

    gitster authored
    * mk/maint-parse-careful:
      peel_onion: handle NULL
      check return value from parse_commit() in various functions
      parse_commit: don't fail, if object is NULL
      revision.c: handle tag->tagged == NULL
      reachable.c::process_tree/blob: check for NULL
      process_tag: handle tag->tagged == NULL
      check results of parse_commit in merge_bases
      list-objects.c::process_tree/blob: check for NULL
      reachable.c::add_one_tree: handle NULL from lookup_tree
      mark_blob/tree_uninteresting: check for NULL
      get_sha1_oneline: check return value of parse_object
      read_object_with_reference: don't read beyond the buffer
Commits on Jun 8, 2007
  1. @gitster

    Even more missing static

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 7, 2007
  1. @gitster

    War on whitespace

    gitster authored
    This uses "git-apply --whitespace=strip" to fix whitespace errors that have
    crept in to our source files over time.  There are a few files that need
    to have trailing whitespaces (most notably, test vectors).  The results
    still passes the test, and build result in Documentation/ area is unchanged.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Something went wrong with that request. Please try again.