Permalink
Commits on Oct 5, 2005
  1. upload-pack: Do not choke on too many heads request.

    Junio C Hamano
    Junio C Hamano committed Oct 5, 2005
    Cloning from a repository with more than 256 refs (heads and tags
    included) will choke, because upload-pack has a built-in limit of
    feeding not more than MAX_NEEDS (currently 256) heads to underlying
    git-rev-list.  This is a problem when cloning a repository with many
    tags, like http://www.linux-mips.org/pub/scm/linux.git, which has 290+
    tags.
    
    This commit introduces a new flag, --all, to git-rev-list, to include
    all refs in the repository.  Updated upload-pack detects requests that
    ask more than MAX_NEEDS refs, and sends everything back instead.
    
    We may probably want to tweak the definitions of MAX_NEEDS and
    MAX_HAS, but that is a separate topic.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. [PATCH] Quote the missing GIT_DIR.

    sbejar authored and Junio C Hamano committed Oct 5, 2005
    Signed-off-by: Santi Béjar <sbejar@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. [PATCH] Fix symbolic ref validation

    jonas authored and Junio C Hamano committed Oct 5, 2005
    Use the correct buffer when validating 'ref: refs/...'
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. [PATCH] hold_index_file_for_update should not unlink failed to open .…

    raalkml authored and Junio C Hamano committed Oct 5, 2005
    …lock files atexit
    
    Set up atexit only if the .lock-file was opened successfully.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. Fix diff-filter All-Or-None mark.

    Junio C Hamano
    Junio C Hamano committed Oct 5, 2005
    When we updated the marker for new files from 'N' to 'A', we forgot to
    notice that the letter is already taken by the All-Or-None mark.
    Change the All-Or-None marker to '*' to resolve this conflict.
    
    	git-diff-tree -r --diff-filter='R*' -M
    
    shows all the changes (not just renames) that are contained in commits
    that have renames, in comparison with:
    
    	git-diff-tree -r --diff-filter='R' -M
    
    shows the same set of changes but the diff output are limited only to
    renaming changes.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Add missing documentation.

    Junio C Hamano
    Junio C Hamano committed Oct 4, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 4, 2005
  1. Remove useless use of sed in git-format-patch.

    Junio C Hamano
    Junio C Hamano committed Oct 4, 2005
    There was a leftover use of sed that attempted to remove the commit ID
    output from git-diff-tree, which turned into an expensive no-op when
    git-diff-tree output header format changed about three months ago.
    Drop it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. Leave an empty line between log and sign-off.

    Junio C Hamano
    Junio C Hamano committed Oct 4, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Remove unused external-diff script.

    Junio C Hamano
    Junio C Hamano committed Oct 4, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Merge branch 'fixes'

    Junio C Hamano
    Junio C Hamano committed Oct 4, 2005
  5. [PATCH] Limit the number of requests outstanding in ssh-fetch.

    Daniel Barkalow Junio C Hamano
    Daniel Barkalow authored and Junio C Hamano committed Oct 4, 2005
    This completes fetches if there are more than 100 outstanding requests
    and there are more to prefetch.
    
    Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Avoid compiler warning.

    Junio C Hamano
    Junio C Hamano committed Oct 4, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. Make sure get_sha1 does not accept ambiguous sha1 prefix (again).

    Junio C Hamano
    Junio C Hamano committed Oct 3, 2005
    The earlier fix incorrectly dropped the code the original had to
    ensure the found SHA1 is at least unique within the same pack.
    Restore the check.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 3, 2005
  1. GIT 0.99.8a

    Junio C Hamano
    Junio C Hamano committed Oct 3, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. git-pull: do not barf on -a flag meant for git-fetch.

    Junio C Hamano
    Junio C Hamano committed Oct 3, 2005
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. [PATCH] Random documentation fixes

    jonas authored and Junio C Hamano committed Oct 3, 2005
    The fixes focuses on improving the HTML output. Most noteworthy:
    
     - Fix the Makefile to also make various *.html files depend on
       included files.
    
     - Consistently use 'NOTE: ...' instead of '[ ... ]' for additional
       info.
    
     - Fix ending '::' for description lists in OPTION section etc.
    
     - Fix paragraphs in description lists ending up as preformated text.
    
     - Always use listingblocks (preformatted text wrapped in lines with -----)
       for examples that span empty lines, so they are put in only one HTML
       block.
    
     - Use '1.' instead of '(1)' for numbered lists.
    
     - Fix linking to other GIT docs.
    
     - git-rev-list.txt: put option descriptions in an OPTION section.
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. Error message from get_sha1() on ambiguous short SHA1.

    Junio C Hamano
    Junio C Hamano committed Oct 3, 2005
    Unlike cases where "no such object exists", the case where specified
    prefix is ambiguous would confuse the user if we say "no such commit"
    or such.  Give an extra error message from the uniqueness check if
    there are more than one objects that match the given prefix.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. [PATCH] Enable and fix support for base less merges.

    Fredrik Kuivinen Junio C Hamano
    Fredrik Kuivinen authored and Junio C Hamano committed Oct 3, 2005
    Let the merge strategies handle the base less case if they are able to
    do it. It also fixes git-resolve.sh to die if no common ancestors
    exists, instead of doing the wrong thing. Furthermore, it contains a
    small independent fix for git-merge.sh and a fix for a base less code
    path in gitMergeCommon.py.
    
    With this it's possible to use
        git merge -s recursive 'merge message' A B
    to do a base less merge of A and B.
    
    [jc: Thanks Fredrik for fixing the brown-paper-bag in git-merge.
     I fixed a small typo in git-merge-resolve fix; 'test' equality
     check is spelled with single equal sign -- C-style double equal
     sign is bashism.]
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. Make sure get_sha1 does not accept ambiguous sha1 prefix.

    Junio C Hamano
    Junio C Hamano committed Oct 3, 2005
    The original code did not even check alternates, and was confused if
    an unpacked object was uniquely found when there was another object
    that shares the same prefix in the pack.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. Fix minor DOS in rev-list.

    Junio C Hamano
    Junio C Hamano committed Oct 3, 2005
    A carefully crafted pathname can be used to disrupt downstream git-pack-objects
    that uses 'git-rev-list --objects' output.  Prevent this.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
Commits on Oct 2, 2005
  1. GIT 0.99.8

    Junio C Hamano
    Junio C Hamano committed Oct 2, 2005
    GIT already did everything I wanted it to do since mid 0.99.7,
    and it has almost everything I want it to have now, except a
    couple of minor tweaks and enhancements.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  2. [PATCH] Update git-clone documentation

    ebiederm authored and Junio C Hamano committed Oct 2, 2005
    The documentation for git-clone is behind the actual command.
    I have been getting tired of reading the shell script to see
    what the arguments are so here is an update of the actual documentation.
    
    Signed-off-by: Eric Biederman <ebiederman@xmission.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  3. Handle really trivial case inside git-merge.

    Junio C Hamano
    Junio C Hamano committed Oct 2, 2005
    Using Linus' --trivial option, this handles really trivial case
    inside git-merge itself, without using any strategy modules.
    
    A 'really trivial case' is:
    
     - we are merging one branch into the current branch;
     - there is only one merge base between the branches;
     - there is no file-level merge required.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  4. read-tree: --trivial

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Sep 29, 2005
    This adds an option --trivial to restrict 3-way 'read-tree -m -u'
    to happen only if there is no file-level merging required.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  5. [PATCH] Teach git-ls-files about '--' to denote end of options.

    Fredrik Kuivinen Junio C Hamano
    Fredrik Kuivinen authored and Junio C Hamano committed Oct 2, 2005
    Useful if you have a file whose name starts with a dash.
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  6. [PATCH] Teach the recursive merge strategy about renames.

    Fredrik Kuivinen Junio C Hamano
    Fredrik Kuivinen authored and Junio C Hamano committed Oct 2, 2005
    It will now merge cases where a file was renamed in one branch and
    modified in the other branch cleanly. We also detect a couple of
    conflict cases now that wasn't detected before.
    
    Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  7. read-tree: remove --head option.

    Junio C Hamano
    Junio C Hamano committed Oct 2, 2005
    Initially it was to allow specifying more than one remote to
    allow creation of an Octopus, but it is not being used.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  8. Customize git command for installations that lack certain commands.

    Junio C Hamano
    Junio C Hamano committed Oct 2, 2005
    When the platform lacks certain git subcommands, omit them from the
    list of subcommands that are available from "git" wrapper.
    
    Noticed by Geert Bosch.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  9. [PATCH] git on OpenBSD

    hanb authored and Junio C Hamano committed Oct 1, 2005
    iconv is installed in /usr/local.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  10. [PATCH] Re-instate index file write optimization

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Oct 1, 2005
    This makes "git-update-index" avoid the new index file write if it didn't
    make any changes to the index.
    
    It still doesn't make things like "git status" be read-only operations in
    general, but if the index file doesn't need refreshing, it now will at
    least avoid making unnecessary changes.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  11. [PATCH] Better error reporting for "git status"

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Oct 1, 2005
    Instead of "git status" ignoring (and hiding) potential errors from the
    "git-update-index" call, make it exit if it fails, and show the error.
    
    In order to do this, use the "-q" flag (to ignore not-up-to-date files)
    and add a new "--unmerged" flag that allows unmerged entries in the index
    without any errors.
    
    This also avoids marking the index "changed" if an entry isn't actually
    modified, and makes sure that we exit with an understandable error message
    if the index is corrupt or unreadable. "read_cache()" no longer returns an
    error for the caller to check.
    
    Finally, make die() and usage() exit with recognizable error codes, if we
    ever want to check the failure reason in scripts.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
  12. More portability.

    Junio C Hamano Junio C Hamano
    Junio C Hamano authored and Junio C Hamano committed Sep 30, 2005
     - The location of openssl development files got customizable.
     - The location of iconv development files got customizable.
     - Pass $TAR down to t5000 test so that the user can override with
       'gmake TAR=gtar'.
     - Solaris 'bc' does not seem to grok "define abs()".  There is no
       reason to use bc there -- expr would do.
    
    Signed-off-by: Junio C Hamano <junio@twinsun.com>
  13. Add git-symbolic-ref

    Junio C Hamano Junio C Hamano
    Junio C Hamano authored and Junio C Hamano committed Sep 30, 2005
    This adds the counterpart of git-update-ref that lets you read
    and create "symbolic refs".  By default it uses a symbolic link
    to represent ".git/HEAD -> refs/heads/master", but it can be compiled
    to use the textfile symbolic ref.
    
    The places that did 'readlink .git/HEAD' and 'ln -s refs/heads/blah
    .git/HEAD' have been converted to use new git-symbolic-ref command, so
    that they can deal with either implementation.
    
    Signed-off-by: Junio C Hamano <junio@twinsun.com>
  14. Use resolve_ref() to implement read_ref().

    Junio C Hamano Junio C Hamano
    Junio C Hamano authored and Junio C Hamano committed Sep 30, 2005
    Symbolic refs are understood by resolve_ref(), so existing read_ref()
    users will automatically understand them as well.
    
    Signed-off-by: Junio C Hamano <junio@twinsun.com>
  15. [PATCH] Allow reading "symbolic refs" that point to other refs

    Linus Torvalds Junio C Hamano
    Linus Torvalds authored and Junio C Hamano committed Sep 25, 2005
    This extends the ref reading to understand a "symbolic ref": a ref file
    that starts with "ref: " and points to another ref file, and thus
    introduces the notion of ref aliases.
    
    This is in preparation of allowing HEAD to eventually not be a symlink,
    but one of these symbolic refs instead.
    
    [jc: Linus originally required the prefix to be "ref: " five bytes
     and nothing else, but I changed it to allow and strip any number of
     leading whitespaces to match what update-ref.c does.]
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>