1. 21 9月, 2006 12 次提交
  2. 20 9月, 2006 3 次提交
  3. 18 9月, 2006 10 次提交
  4. 17 9月, 2006 10 次提交
    • J
      Merge branch 'jc/archive' · 4d69065d
      Junio C Hamano 提交于
      * jc/archive:
        git-tar-tree: devolve git-tar-tree into a wrapper for git-archive
        git-archive: inline default_parse_extra()
        builtin-archive.c: rename remote_request() to extract_remote_arg()
        upload-archive: monitor child communication more carefully.
        Add sideband status report to git-archive protocol
        Prepare larger packet buffer for upload-pack protocol.
        Teach --exec to git-archive --remote
        Add --verbose to git-archive
        archive: force line buffered output to stderr
        Use xstrdup instead of strdup in builtin-{tar,zip}-tree.c
        Move sideband server side support into reusable form.
        Move sideband client side support into reusable form.
        archive: allow remote to have more formats than we understand.
        git-archive: make compression level of ZIP archives configurable
        Add git-upload-archive
        git-archive: wire up ZIP format.
        git-archive: wire up TAR format.
        Add git-archive
      4d69065d
    • M
      gitweb: export options · 32f4aacc
      Matthias Lederhofer 提交于
      $export_ok: If this variable evaluates to true it is checked
      if a file with this name exists in the repository.  If it
      does not exist the repository cannot be viewed from gitweb.
      (Similar to git-daemon-export-ok for git-daemon).
      
      $strict_export: If this variable evaluates to true only
      repositories listed on the project-list-page of gitweb can
      be accessed.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      32f4aacc
    • M
      gitweb: do not use 'No such directory' error message · 7939fe44
      Matthias Lederhofer 提交于
      undef $project; to prevent a file named description to be read.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      7939fe44
    • R
      git-tar-tree: devolve git-tar-tree into a wrapper for git-archive · 87af29f0
      Rene Scharfe 提交于
      This patch removes the custom tree walker tree_traverse(), and makes
      generate_tar() use write_tar_archive() and the infrastructure provided
      by git-archive instead.
      
      As a kind of side effect, make write_tar_archive() able to handle NULL
      as base directory, as this is what the new and simple generate_tar()
      uses to indicate the absence of a base directory.  This was simpler
      and cleaner than playing tricks with empty strings.
      
      The behaviour of git-tar-tree should be unchanged (quick tests didn't
      indicate otherwise) except for the text of some error messages.
      Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      87af29f0
    • M
      gitweb: fix uninitialized variable warning. · 800764cf
      Martin Waitz 提交于
      Perl spit out a varning when "blob" or "blob_plain" actions were
      used without a $hash parameter.
      Signed-off-by: NMartin Waitz <tali@admingilde.org>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      800764cf
    • M
      gitweb: more support for PATH_INFO based URLs · dd70235f
      Martin Waitz 提交于
      Now three types of path based URLs are supported:
      	gitweb.cgi/project.git
      	gitweb.cgi/project.git/branch
      	gitweb.cgi/project.git/branch/filename
      
      The first one (show project summary) was already supported for a long time
      now.  The other two are new: they show the shortlog of a branch or
      the plain file contents of some file contained in the repository.
      
      This is especially useful to support project web pages for small
      projects: just create an html branch and then use an URL like
      gitweb.cgi/project.git/html/index.html.
      Signed-off-by: NMartin Waitz <tali@admingilde.org>
      Acked-by: NJakub Narebski <jnareb@gmail.com>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      dd70235f
    • J
      apply --unidiff-zero: loosen sanity checks for --unidiff=0 patches · 4be60962
      Junio C Hamano 提交于
      In "git-apply", we have a few sanity checks and heuristics that
      expects that the patch fed to us is a unified diff with at least
      one line of context.
      
       * When there is no leading context line in a hunk, the hunk
         must apply at the beginning of the preimage.  Similarly, no
         trailing context means that the hunk is anchored at the end.
      
       * We learn a patch deletes the file from a hunk that has no
         resulting line (i.e. all lines are prefixed with '-') if it
         has not otherwise been known if the patch deletes the file.
         Similarly, no old line means the file is being created.
      
      And we declare an error condition when the file created by a
      creation patch already exists, and/or when a deletion patch
      still leaves content in the file.
      
      These sanity checks are good safety measures, but breaks down
      when people feed a diff generated with --unified=0.  This was
      recently noticed first by Matthew Wilcox and Gerrit Pape.
      
      This adds a new flag, --unified-zero, to allow bypassing these
      checks.  If you are in control of the patch generation process,
      you should not use --unified=0 patch and fix it up with this
      flag; rather you should try work with a patch with context.  But
      if all you have to work with is a patch without context, this
      flag may come handy as the last resort.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      4be60962
    • J
      t1400: make test debuggable. · 8aac4b45
      Junio C Hamano 提交于
      I had a hard time figuring out why this test was failing with
      the packed-refs update without running it under "sh -x".  This
      makes output from "sh t1400-update-ref.sh -v" more descriptive.
      
      Updating other tests would be a good janitorial task.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      8aac4b45
    • J
      Add ftp:// protocol support for git-http-fetch · 4adffc7b
      Junio C Hamano 提交于
      Based on Sasha Khapyorsky's patch but adjusted to the refactored
      "missing target" detection code.
      
      It might have been better if the program were called
      git-url-fetch but it is too late now ;-).
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      4adffc7b
    • J
      http-fetch.c: consolidate code to detect missing fetch target · be4a015b
      Junio C Hamano 提交于
      At a handful places we check two error codes from curl library
      to see if the file we asked was missing from the remote (e.g.
      we asked for a loose object when it is in a pack) to decide what
      to do next.  This consolidates the check into a single function.
      
      NOTE: the original did not check for HTTP_RETURNED_ERROR when
      error code is 404, but this version does to make sure 404 is
      from HTTP and not some other protcol.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      be4a015b
  5. 16 9月, 2006 5 次提交
    • J
      Fix git-am safety checks · c95b1389
      Junio C Hamano 提交于
      An earlier commit cbd64afb added a check that prevents "git-am"
      to run without its standard input connected to a terminal while
      resuming operation.  This was to catch a user error to try
      feeding a new patch from its standard input while recovery.
      
      The assumption of the check was that it is an indication that a
      new patch is being fed if the standard input is not connected to
      a terminal.  It is however not quite correct (the standard input
      can be /dev/null if the user knows the operation does not need
      any input, for example).  This broke t3403 when the test was run
      with its standard input connected to /dev/null.
      
      When git-am is given an explicit command such as --skip, there
      is no reason to insist that the standard input is a terminal; we
      are not going to read a new patch anyway.
      
      Credit goes to Gerrit Pape for noticing and reporting the
      problem with t3403-rebase-skip test.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      c95b1389
    • L
      Allow multiple "git_path()" uses · e7676d2f
      Linus Torvalds 提交于
      This allows you to maintain a few filesystem pathnames concurrently, by
      simply replacing the single static "pathname" buffer with a LRU of four
      buffers.
      
      We did exactly the same thing with sha1_to_hex(), for pretty much exactly
      the same reason. Sometimes you want to use two pathnames, and while it's
      easy enough to xstrdup() them, why not just do the LU buffer thing.
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      e7676d2f
    • J
      gitweb: Add link to "project_index" view to "project_list" page · 9d0734ae
      Jakub Narebski 提交于
      Add link to "project_index" view as [TXT] beside link to "opml" view,
      (which is marked by [OPML]) to "project_list" page.
      
      While at it add alternate links for "opml" and "project_list" to HTML
      header for "project_list" view.
      Signed-off-by: NJakub Narebski <jnareb@gmail.com>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      9d0734ae
    • J
      gitweb: Allow for href() to be used for links without project param · a1565c44
      Jakub Narebski 提交于
      Make it possible to use href() subroutine to generate link with
      query string which does not include project ('p') parameter.
      href() used to add project=$project to its parameters, if it
      was not set (to be more exact if $params{'project'} was false).
      Now you can pass "project => undef" if you don't want for href()
      to add project parameter to query string in the generated link.
      
      Links to "project_list", "project_index" and "opml" (all related
      to list of all projects/all git repositories) doesn't need project
      parameter. Moreover "project_list" is default view (action) if
      project ('p') parameter is not set, just like "summary" is default
      view (action) if project is set; project list served as a kind
      of "home" page for gitweb instalation, and links to "project_list"
      view were done without specyfying it as an action.
      
      Convert remaining links (except $home_link and anchor links)
      to use href(); this required adding 'order => "o"' to @mapping
      in href(). This finishes consolidation of URL generation.
      Signed-off-by: NJakub Narebski <jnareb@gmail.com>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      a1565c44
    • J
      Define fallback PATH_MAX on systems that do not define one in <limits.h> · d0c2449f
      Junio C Hamano 提交于
      Notably on GNU/Hurd, as reported by Gerrit Pape.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      d0c2449f