1. 18 10月, 2005 11 次提交
  2. 17 10月, 2005 7 次提交
  3. 16 10月, 2005 12 次提交
    • J
      Squelch compiler warnings from connect.c · 6abf5c0c
      Junio C Hamano 提交于
      Forgot to include necessary header file to get the function declaration.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      6abf5c0c
    • J
      Disable hooks during tests. · c09a69a8
      Junio C Hamano 提交于
      Individual tests for hooks would want to have their own tests when
      written.  Also we should not pick up from random templates the user
      happens to have.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      c09a69a8
    • P
      Sparse fixes for http-fetch · f5dce806
      Peter Hagervall 提交于
      This patch cleans out all sparse warnings from http-fetch.c
      
      I'm a bit uncomfortable with adding extra #ifdefs to avoid either
      'mixing declaration with code' or 'unused variable' warnings, but I
      figured that since those functions are already littered with #ifdefs I
      might just get away with it. Comments?
      
      [jc: I adjusted Peter's patch to address uncomfortableness issues.]
      Signed-off-by: NPeter Hagervall <hager@cs.umu.se>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      f5dce806
    • J
      whatchanged: document -m option from git-diff-tree. · 15fad5f4
      Junio C Hamano 提交于
      The documentation for git-whatchanged is meant to describe only
      the most frequently used options from git-diff-tree.  Because "why
      doesn't it show merges" was asked more than once, we'd better
      describe '-m' option there.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      15fad5f4
    • J
      Show peeled onion from upload-pack and server-info. · f6b42a81
      Junio C Hamano 提交于
      This updates git-ls-remote to show SHA1 names of objects that are
      referred by tags, in the "ref^{}" notation.
      
      This would make git-findtags (without -t flag) almost trivial.
      
          git-peek-remote . |
          sed -ne "s:^$target	"'refs/tags/\(.*\)^{}$:\1:p'
      
      Also Pasky could do:
      
          git-ls-remote --tags $remote |
          sed -ne 's:\(	refs/tags/.*\)^{}$:\1:p'
      
      to find out what object each of the remote tags refers to, and
      if he has one locally, run "git-fetch $remote tag $tagname" to
      automatically catch up with the upstream tags.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      f6b42a81
    • J
      Introduce notation "ref^{type}". · 5385f52d
      Junio C Hamano 提交于
      Existing "tagname^0" notation means "dereference tag zero or more
      times until you cannot dereference it anymore, and make sure it is a
      commit -- otherwise barf".  But tags do not necessarily reference
      commit objects.
      
      This commit introduces a bit more generalized notation, "ref^{type}".
      Existing "ref^0" is a shorthand for "ref^{commit}".  If the type
      is empty, it just dereferences tags until it hits a non-tag object.
      
      With this, "git-rev-parse --verify 'junio-gpg-pub^{}'" shows the blob
      object name -- there is no need to manually read the tag object and
      find out the object name anymore.
      
      "git-rev-parse --verify 'HEAD^{tree}'" can be used to find out the
      tree object name of the HEAD commit.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      5385f52d
    • J
      Ignore funny refname sent from remote · 1a7141ff
      Junio C Hamano 提交于
      This allows the remote side (most notably, upload-pack) to show
      additional information without affecting the downloader.  Peek-remote
      does not ignore them -- this is to make it useful for Pasky's
      automatic tag following.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      1a7141ff
    • J
      Refuse to create funny refs in clone-pack, git-fetch and receive-pack. · d8a1deec
      Junio C Hamano 提交于
      Using git-check-ref-format, make sure we do not create refs with
      funny names when cloning from elsewhere (clone-pack), fast forwarding
      local heads (git-fetch), or somebody pushes into us (receive-pack).
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      d8a1deec
    • J
      git-check-ref-format: reject funny ref names. · 03feddd6
      Junio C Hamano 提交于
      Update check_ref_format() function to reject ref names that:
      
       * has a path component that begins with a ".", or
       * has a double dots "..", or
       * has ASCII control character, "~", "^", ":" or SP, anywhere, or
       * ends with a "/".
      
      Use it in 'git-checkout -b', 'git-branch', and 'git-tag' to make sure
      that newly created refs are well-formed.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      03feddd6
    • J
      Merge branch 'fixes' · f51248eb
      Junio C Hamano 提交于
      f51248eb
    • J
      Show curl error a bit better. · f80376c5
      Junio C Hamano 提交于
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      f80376c5
    • J
      Some curl versions lack curl_easy_duphandle() · 7baa3e86
      Johannes Schindelin 提交于
      Hi,
      
      On Fri, 14 Oct 2005, Junio C Hamano wrote:
      
      > Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
      >
      > > This patch looks bigger than it really is: The code to get the
      > > default handle was refactored into a function, and is called
      > > instead of curl_easy_duphandle() if that does not exist.
      >
      > I'd like to take Nick's config file patch first, which
      > unfortunately interferes with your patch.  I'd hate to ask you
      > this, but could you rebase it on top of Nick's patch, [...]
      
      No need to hate it. Here comes the rebased patch, and this time, I
      actually tested it a bit.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      7baa3e86
  4. 15 10月, 2005 6 次提交
  5. 14 10月, 2005 4 次提交
    • J
      format-patch: take sequence of ranges. · 603d8745
      Junio C Hamano 提交于
      This enhances set of revs you can give format-patch.
      
      Originally, format-patch took either one rev, or two revs:
      
          format-patch rev1
          format-patch rev1 rev2
      
      The first format was a short-hand for "format-patch rev1 HEAD"
      (i.e. rev2==HEAD).  What this meant was to find commits that are
      in branch rev2 that has not been merged to branch rev1.
      
      The above notation is still supported, but now it takes sequence
      of "from1..to1 from2..to2 ...".  In short, the second format has
      become a short-hand for "format-patch rev1..rev2".  Commits in
      to1 but not in from1, to2 but not in from2, ... are formatted as
      emailable patches.
      
      With this, cherry-picking from other branch can be written as:
      
          git-format-patch -k --stdout master..branch1 master..branch2 |
          git-am -k -3
      
      which is generally faster than traditional cherry-pick (which
      always did 3-way merge) if patches apply cleanly, and still
      falls back on 3-way merge if some of them do not.
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      603d8745
    • L
      Add "-l" flag for repacking only local packs · f7aac2ea
      Linus Torvalds 提交于
      This uses the new "--local" flag to git-pack-objects.  It currently only
      makes a difference together with "-a", since a normal incremental repack
      won't pack any packed objects at all (whether local or remote).
      
      Eventually, it might end up skipping any objects that aren't local to
      the current object directory, but for now it only knows to skip packed
      objects.
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      f7aac2ea
    • L
      Add support for "local" packing · 64560374
      Linus Torvalds 提交于
      This adds the "--local" flag to git-pack-objects, which acts like
      "--incremental", except that instead of ignoring all packed objects, it
      only ignores objects that are packed and in an alternate object tree.
      
      As a result, it effectively only does a local re-pack: any remote-packed
      objects will stay in the alternate object directories.
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      64560374
    • L
      Keep track of whether a pack is local or not · 9d835df2
      Linus Torvalds 提交于
      If we want to re-pack just local packfiles, we need to know whether a
      particular object is local or not.
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      9d835df2