Skip to content
Commits on Sep 18, 2005
  1. GIT 0.99.7

    Junio C Hamano committed Sep 18, 2005
  2. Arrgh -- another asciidoc caret workaround.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 18, 2005
  3. [PATCH] Improve git-update-index error reporting

    This makes git-update-index error reporting much less confusing. The
    user will know what went wrong with better precision, and will be given
    a hopefully less confusing advice.
    
    Signed-off-by: Petr Baudis <pasky@suse.cz>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Petr Baudis committed with Junio C Hamano Sep 18, 2005
  4. [PATCH] Improved "git add"

    This fixes everybodys favourite complaint about "git add", namely that it
    doesn't take directories.
    
    We use "git-ls-files --others" to generate an arbitrary list of filenames,
    and thus also automatically honor ignore-files while we're at it.
    
    Side note: there's a lot of room for improvement here. In particular, if
    we have a long list of filenames (importing a big archive), this will just
    do a big stupid for-loop and add them one at a time. Maybe it should use
    
    	generate-list | xargs -0 git-update-idex --add --
    
    instead.
    
    Also, I think we should have a default ignore list if we don't find a
    .git/info/exclude file. Ignoring "*.o" and ".*" by default would probably
    be the right thing to do.
    
    But I think this is a good first step.
    
    Use the "-n" flag to just show the list of files to be added without
    adding them.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Sep 18, 2005
  5. [PATCH] Add "--git-dir" flag to git-rev-parse

    Especially when you're deep inside the git repository, it's not all that
    trivial for scripts to figure out where GIT_DIR is if it isn't set.
    
    So add a flag to git-rev-parse to show where it is, since it will have
    figured it out anyway.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Sep 18, 2005
  6. [PATCH] Support alternates and http-alternates in http-fetch

    This allows the remote repository to refer to additional repositories
    in a file objects/info/http-alternates or
    objects/info/alternates. Each line may be:
    
     a relative path, starting with ../, to get from the objects directory
      of the starting repository to the objects directory of the added
      repository.
    
     an absolute path of the objects directory of the added repository (on
      the same server).
    
     (only in http-alternates) a full URL of the objects directory of the
      added repository.
    
    Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Daniel Barkalow committed with Junio C Hamano Sep 18, 2005
  7. Document extended SHA1 used by git-rev-parse.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 18, 2005
  8. fetch() assumes we do not have the object.

    Bugfix for the previous one.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 18, 2005
  9. Merge branch 'master' of .

    Junio C Hamano committed Sep 18, 2005
  10. Improve the safety check used in fetch.c

    The recent safety check to trust only the commits we have made
    things impossibly slow and turn out to waste a lot of memory.
    
    This commit fixes it with the following improvements:
    
     - mark already scanned objects and avoid rescanning the same
       object again;
    
     - free the tree entries when we have scanned the tree entries;
       this is the same as b0d8923
       which reduced memory usage by rev-list;
    
     - plug memory leak from the object_list dequeuing code;
    
     - use the process_queue not just for fetching but for scanning,
       to make things tail recursive to avoid deep recursion; the
       deep recursion was especially prominent when we cloned a big
       pack.
    
     - avoid has_sha1_file() call when we already know we do not have
       that object.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 18, 2005
  11. Archive-destroying "git repack -a -d" bug.

    Using "git repack -a -d" can destroy your git archive if you use it
    twice in succession, because the new pack can be called the same as
    the old pack.  Found by Linus.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 17, 2005
Commits on Sep 17, 2005
  1. Do not fail after calling bisect_auto_next()

    As a convenience measure, 'bisect bad' or 'bisect good' automatically
    does 'bisect next' when it knows it can, but the result of that test
    to see if it can was leaking through as the exit code from the whole
    thing, which was bad.  Noticed by Anton Blanchard.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 17, 2005
  2. [PATCH] Add support for alternates in HTTP

    This tries .../objects/info/http-alternates and then
    .../objects/info/alternates, looking for a file which specifies where
    else to download objects and packs from.
    
    It currently only supports absolute paths, and doesn't support full URLs.
    
    Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Daniel Barkalow committed with Junio C Hamano Sep 14, 2005
  3. Fix typo in test comment.

    I do not know why it was spelled git-rev-tree when I meant to say
    git-read-tree, but the typo was left since day one.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 16, 2005
  4. [PATCH] getdomainname should be usable on SunOS with -lnsl

    Jason Riedy suggests that we should be able to use getdomainname
    if we properly specify which libraries to link.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 11, 2005
  5. [PATCH] Make "git shortlog" understand raw logs

    This is a nicer fix for git-shortlog being unable to handle the raw log
    format. Just use a more permissive regexp instead of doing two nearly
    identical ones.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Sep 16, 2005
  6. [PATCH] Fix "git-rev-list" revision range parsing

    There were two bugs in there:
     - if the range didn't end up working, we restored the '.' character in
       the wrong place.
     - an empty end-of-range should be interpreted as HEAD.
    
    See rev-parse.c for the reference implementation of this.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Sep 16, 2005
  7. Add git-send-email to .gitignore

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 16, 2005
  8. Teach rsync transport about alternates.

    For local operations and downloading and uploading via git aware protocols,
    use of $GIT_OBJECT_DIRECTORY/info/alternates is recommended on the server
    side for big projects that are derived from another one (like Linux kernel).
    
    However, dumb protocols and rsync transport needs to resolve this on the
    client end, which we did not bother doing until this week.
    
    I noticed we use "rsync -z" but most of our payload is already compressed,
    which was not quite right.  This commit also fixes it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 17, 2005
Commits on Sep 16, 2005
  1. [PATCH] Avoid building object ref lists when not needed

    The object parsing code builds a generic "this object references that
    object" because doing a full connectivity check for fsck requires it.
    
    However, nothing else really needs it, and it's quite expensive for
    git-rev-list that can have tons of objects in flight.
    
    So, exactly like the commit buffer save thing, add a global flag to
    disable it, and use it in git-rev-list.
    
    Before:
    
    	$ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l
    	12.28user 0.29system 0:12.57elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
    	0inputs+0outputs (0major+26718minor)pagefaults 0swaps
    	59124
    
    After this change:
    
    	$ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l
    	10.33user 0.18system 0:10.54elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
    	0inputs+0outputs (0major+18509minor)pagefaults 0swaps
    	59124
    
    and note how the number of pages touched by git-rev-list for this
    particular object list has shrunk from 26,718 (104 MB) to 18,509 (72 MB).
    
    Calculating the total object difference between two git revisions is still
    clearly the most expensive git operation (both in memory and CPU time),
    but it's now less than 40% of what it used to be.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Sep 16, 2005
  2. [PATCH] Improve git-rev-list memory usage further

    This avoids keeping tree entries around, and free's them as it traverses
    the list. This avoids building up a huge memory footprint just for these
    small but very common allocations.
    
    Before:
    
    	$ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l
    	11.65user 0.38system 0:12.65elapsed 95%CPU (0avgtext+0avgdata 0maxresident)k
    	0inputs+0outputs (0major+42934minor)pagefaults 0swaps
    	59124
    
    After:
    
    	$ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l
    	12.28user 0.29system 0:12.57elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
    	0inputs+0outputs (0major+26718minor)pagefaults 0swaps
    	59124
    
    Note how the minor fault numbers - which ends up being how many pages we
    needed to map - go down from 42934 (167 MB) to 26718 (104 MB).  That is:
    
    Before:
    	42934 minor pagefaults
    
    After:
    
    	26718 minor pagefaults
    
    This is all in _addition_ to the previous fixes.  It used to be
    ~48,000 pagefaults.
    
    That's still a honking big memory footprint, but it's about half of what
    it was just a day or two ago (and this is the object list for a pretty big
    update - almost 60,000 objects. Smaller updates need less memory).
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Sep 16, 2005
  3. [PATCH] fetch.c: cleanups

    Clean-ups suggested by Sergey Vlasov and acked by Daniel Barkalow.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 16, 2005
  4. [PATCH] Debian: build-depend on "bc"

    Build systems should run tests. This patch adds the necessary
    debian/control and debian/rules bits ("bc" was missing,
    t/t4002-diff-basic.sh wants it).
    
    Signed-off-by: Matthias Urlichs <smurf@smurf.noris.de>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Matthias Urlichs committed with Junio C Hamano Sep 16, 2005
  5. [PATCH] Make git-checkout failure message more friendly.

    ... or less so, perhaps ;-).  Suggested by Jeff Garzik.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 16, 2005
  6. [PATCH] Update git-core.spec.in

    Update git-core spec file based on feedback from Fedora Extras review.
    
    - update BuildRoot to be more specific
    - eliminate Requires that must be satisfied for base system install
    - drop Vendor
    - use dist tag to differentiate between branches
    - own %{_datadir}/git-core/
    - use RPM_OPT_FLAGS in spec file
    
    Signed-off-by: Chris Wright <chrisw@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Chris Wright committed with Junio C Hamano Sep 16, 2005
  7. [PATCH] PATCH Documentation/git-rev-list.txt typo fix

    An earlier commit causes a mismatch in <emphasis> and <superscript>
    tags, one way of fixing it is having no more than one caret symbol per
    line, which is the only solution I found in the asciidoc
    documentation. Ugly, but it works.
    
    [jc: ugly indeed but that is not Peter's fault.]
    
    Signed-off-by: Peter Hagervall <hager@cs.umu.se>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Peter Hagervall committed with Junio C Hamano Sep 16, 2005
  8. Recommend 'less' for Debian.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 15, 2005
  9. @vonbrand

    [PATCH] Require less in RPM spec

    ... and the next one will be the one to do Debian, naturally.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    vonbrand committed with Junio C Hamano Sep 16, 2005
  10. Revert breakage introduced by c80522e.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 15, 2005
  11. [PATCH] Documentation/git-rev-list.txt typo fix

    Fix the "superscript" problem on the git-rev-list doc page.
    
    Signed-off-by: Jon Loeliger <jdl@freescale.com>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    jdl@freescale.com committed with Junio C Hamano Sep 15, 2005
Commits on Sep 15, 2005
  1. [PATCH] Re-organize "git-rev-list --objects" logic

    The logic to calculate the full object list used to be very inter-twined
    with the logic that looked up the commits.
    
    For no good reason - it's actually a lot simpler to just do that logic
    as a separate pass.
    
    This improves performance a bit, and uses slightly less memory in my
    tests, but more importantly it makes the code simpler to work with and
    follow what it does.
    
    The performance win is less than I had hoped for, but I get:
    
    Before:
    
    	[torvalds@g5 linux]$ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l
    	13.64user 0.42system 0:14.13elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
    	0inputs+0outputs (0major+47947minor)pagefaults 0swaps
    	58945
    
    After:
    
    	[torvalds@g5 linux]$ /usr/bin/time git-rev-list --objects v2.6.12..HEAD | wc -l
    	11.80user 0.36system 0:12.16elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
    	0inputs+0outputs (0major+42684minor)pagefaults 0swaps
    	58945
    
    ie it improved by 2 seconds, and took a 5000+ fewer pages (hey, that's
    20MB out of 174MB to go). And got the same number of objects (in theory,
    the more expensive one might find some more shared objects to avoid. In
    practice it obviously doesn't).
    
    I know how to make it use _lots_ less memory, which will probably speed it
    up. But that's for another time, and I'd prefer to see this go in first.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Sep 15, 2005
  2. Plug diff leaks.

    It is a bit embarrassing that it took this long for a fix since the
    problem was first reported on Aug 13th.
    
        Message-ID: <87y876gl1r.wl@mail2.atmark-techno.com>
        From: Yasushi SHOJI <yashi@atmark-techno.com>
        Newsgroups: gmane.comp.version-control.git
        Subject: [patch] possible memory leak in diff.c::diff_free_filepair()
        Date: Sat, 13 Aug 2005 19:58:56 +0900
    
    This time I used valgrind to make sure that it does not overeagerly
    discard memory that is still being used.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 15, 2005
  3. Avoid wasting memory while keeping track of what we have during fetch.

    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 15, 2005
  4. [PATCH] Avoid wasting memory in git-rev-list

    As pointed out on the list, git-rev-list can use a lot of memory.
    
    One low-hanging fruit is to free the commit buffer for commits that we
    parse. By default, parse_commit() will save away the buffer, since a lot
    of cases do want it, and re-reading it continually would be unnecessary.
    However, in many cases the buffer isn't actually necessary and saving it
    just wastes memory.
    
    We could just free the buffer ourselves, but especially in git-rev-list,
    we actually end up using the helper functions that automatically add
    parent commits to the commit lists, so we don't actually control the
    commit parsing directly.
    
    Instead, just make this behaviour of "parse_commit()" a global flag.
    Maybe this is a bit tasteless, but it's very simple, and it makes a
    noticable difference in memory usage.
    
    Before the change:
    
    	[torvalds@g5 linux]$ /usr/bin/time git-rev-list v2.6.12..HEAD > /dev/null
    	0.26user 0.02system 0:00.28elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k
    	0inputs+0outputs (0major+3714minor)pagefaults 0swaps
    
    after the change:
    
    	[torvalds@g5 linux]$ /usr/bin/time git-rev-list v2.6.12..HEAD > /dev/null
    	0.26user 0.00system 0:00.27elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
    	0inputs+0outputs (0major+2433minor)pagefaults 0swaps
    
    note how the minor faults have decreased from 3714 pages to 2433 pages.
    That's all due to the fewer anonymous pages allocated to hold the comment
    buffers and their metadata.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Linus Torvalds committed with Junio C Hamano Sep 15, 2005
  5. Be more backward compatible with git-ssh-{push,pull}.

    HPA reminded me that these programs knows about the name of the
    counterpart on the other end and simply symlinking the old name to
    new name locally would not be enough.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Junio C Hamano committed Sep 15, 2005
Something went wrong with that request. Please try again.