1. 26 3月, 2006 1 次提交
    • L
      git-apply: safety fixes · c1504628
      Linus Torvalds 提交于
      This was triggered by me testing the "@@" numbering shorthand by GNU
      patch, which not only showed that git-apply thought it meant the number
      was duplicated (when it means that the second number is 1), but my tests
      showed than when git-apply mis-understood the number, it would then not
      raise an alarm about it if the patch ended early.
      
      Now, this doesn't actually _matter_, since with a three-line context, the
      only case that "x,1" will be shorthanded to "x" is when x itself is 1 (in
      which case git-apply got it right), but the fact that git-apply would also
      silently accept truncated patches was a missed opportunity for additional
      sanity-checking.
      
      So make git-apply refuse to look at a patch fragment that ends early.
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      c1504628
  2. 25 3月, 2006 3 次提交
  3. 24 3月, 2006 4 次提交
  4. 23 3月, 2006 1 次提交
  5. 22 3月, 2006 5 次提交
  6. 21 3月, 2006 6 次提交
    • E
      contrib/git-svn: allow rebuild to work on non-linear remote heads · ac749050
      Eric Wong 提交于
      Because committing back to an SVN repository from different
      machines can result in different lineages, two different
      repositories running git-svn can result in different commit
      SHA1s (but of the same tree).  Sometimes trees that are tracked
      independently are merged together (usually via children),
      resulting in non-unique git-svn-id: lines in rev-list.
      Signed-off-by: NEric Wong <normalperson@yhbt.net>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      ac749050
    • N
      http-push: don't assume char is signed · a3c57c9a
      Nick Hengeveld 提交于
      Declare remote_dir_exists[] as signed char to be sure that values of -1
      are valid.
      Signed-off-by: NNick Hengeveld <nickh@reactrix.com>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      a3c57c9a
    • N
      http-push: add support for deleting remote branches · 3dfaf7bc
      Nick Hengeveld 提交于
      Processes new command-line arguments -d and -D to remove a remote branch
      if the following conditions are met:
      - one branch name is present on the command line
      - the specified branch name matches exactly one remote branch name
      - the remote HEAD is a symref
      - the specified branch is not the remote HEAD
      - the remote HEAD resolves to an object that exists locally (-d only)
      - the specified branch resolves to an object that exists locally (-d only)
      - the specified branch is an ancestor of the remote HEAD (-d only)
      Signed-off-by: NNick Hengeveld <nickh@reactrix.com>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      3dfaf7bc
    • Y
      Be verbose when !initial commit · 1fa7a68f
      Yasushi SHOJI 提交于
      verbose option in git-commit.sh lead us to run git-diff-index, which
      needs a commit-ish we are making diff against.  When we are commiting
      the fist set, we obviously don't have any commit-ish in the repo.  So
      we just skip the git-diff-index run.
      
      It might be possible to produce diff against empty but do we need
      that?
      Signed-off-by: NYasushi SHOJI <yashi@atmark-techno.com>
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      1fa7a68f
    • F
      Fix multi-paragraph list items in OPTIONS section · 3070b603
      Francis Daly 提交于
      This patch makes the html docs right, makes the asciidoc docs a bit odd
      but consistent with what is there already, and makes the manpages look
      OK using docbook-xsl 1.68, but miss a paragraph separator when using 1.69.
      
      For the manpages, current is like
      
             -A <author_file>
                    Read a file with lines on the form
      
                    username = User's Full Name <email@addr.es>
      
                    and use "User's Full Name <email@addr.es>" as the GIT
      
      With this patch, docbook-xsl v1.68 looks like
      
             -A <author_file>
                    Read a file with lines on the form
      
                            username = User's Full Name <email@addr.es>
      
                    and use "User's Full Name <email@addr.es>" as the GIT author and
      
      while docbook-xsl v1.69 becomes
      
             -A <author_file>
                    Read a file with lines on the form
      
                              username = User's Full Name <email@addr.es>
                    and use "User's Full Name <email@addr.es>" as the GIT author and
      
      The extra indentation is to keep the v1.69 manpage looking sane.
      3070b603
    • J
      http-fetch: nicer warning for a server with unreliable 404 status · bb528079
      Junio C Hamano 提交于
      When a repository otherwise properly prepared is served by a
      dumb HTTP server that sends "No such page" output with 200
      status for human consumption to a request for a page that does
      not exist, the users will get an alarming "File X corrupt" error
      message.  Hint that they might be dealing with such a server at
      the end and suggest running fsck-objects to check if the result
      is OK (the pack-fallback code does the right thing in this case
      so unless a loose object file was actually corrupt the result
      should check OK).
      Signed-off-by: NJunio C Hamano <junkio@cox.net>
      bb528079
  7. 20 3月, 2006 6 次提交
  8. 19 3月, 2006 2 次提交
  9. 18 3月, 2006 12 次提交