commit f9f0459b5b39cf83143c91ae39b4eaf187cf678a
tree f262000f302b749e485f5eb971e6aabefbb85680
parent d7ab6b58e7090b28ee9e89530e1cc762e59fa48d
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 04:45:35 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 04:45:35 +0200

    cogito-0.8

commit d7ab6b58e7090b28ee9e89530e1cc762e59fa48d
tree 79784b690ecca2fa4724bc7d79e06d9d4e5ba6f4
parent 138499aa0ddf5b5762698ffe22918f358f51a921
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 04:42:09 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 04:42:09 +0200

    Update git-prune-script to consider all Cogito's HEADs, so that
    it is actually non-deadly for Cogito users.

commit 138499aa0ddf5b5762698ffe22918f358f51a921
tree 02f6b2493ad464ce964bc935af6079e276314b19
parent 30d200bd659ba3543038d0aa26e90844b0385e28
parent d1df5743809614241883ecad51876607cf432034
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 04:36:44 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 04:36:44 +0200

    Merge with rsync://www.kernel.org/pub/linux/kernel/people/torvalds/git.git
    

commit 30d200bd659ba3543038d0aa26e90844b0385e28
tree 2be63a27c88dc56ab854aeb93b945235848ca58d
parent f6329f3f5fbb8defb65150ce20b6a0143a60fd75
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 04:31:45 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 04:31:45 +0200

    In cg-pull, survive failed tags pull.

commit f6329f3f5fbb8defb65150ce20b6a0143a60fd75
tree 0d39ef256998a079ab6c4c0b1869525caae7dcdd
parent f82f899cdf0a254df562bbfb9efab541549507c3
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 03:47:18 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 03:47:18 +0200

    Updated some fossil pre-renaming stuff in cg-seek.

commit f82f899cdf0a254df562bbfb9efab541549507c3
tree 875989b6e296d8e1ee037ce39fe699322de4b23a
parent f1a9521e4e4bec71edf98f81b4eea20e0bcad21d
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 03:42:21 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 03:42:21 +0200

    Fix fetch_rsync() to always return the error status of the rsync,
    not of the filter.

commit f1a9521e4e4bec71edf98f81b4eea20e0bcad21d
tree 48d94129891aada8f90a5fc09001bdf0f97c555d
parent 9ed5765837fd81cd0c508144fd8d290e498717f2
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 03:29:37 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 03:29:37 +0200

    Fixed a bug when the compatibility checks in cg-Xlib would kick in
    even when doing something outside of the tree (cg-init or cg-clone).

commit d1df5743809614241883ecad51876607cf432034
tree b49d0923200e1a1e765e88b044ed3c90100f8465
parent 86436c28289eedd2ee9b7f9c872a0ed039866a0f
author Junio C Hamano <junkio@cox.net> Mon, 25 Apr 2005 18:26:45 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 18:26:45 -0700

    [PATCH] Introduce diff-tree-helper.
    
    This patch introduces a new program, diff-tree-helper.  It reads
    output from diff-cache and diff-tree, and produces a patch file.
    The diff format customization can be done the same way the
    show-diff uses; the same external diff interface introduced by
    the previous patch to drive diff from show-diff is used so this
    is not surprising.
    
    It is used like the following examples:
    
       $ diff-cache --cached -z <tree> | diff-tree-helper -z -R paths...
       $ diff-tree -r -z <tree1> <tree2> | diff-tree-helper -z paths...
    
     - As usual, the use of the -z flag is recommended in the script
       to pass NUL-terminated filenames through the pipe between
       commands.
    
     - The -R flag is used to generate reverse diff.  It does not
       matter for diff-tree case, but it is sometimes useful to get
       a patch in the desired direction out of diff-cache.
    
     - The paths parameters are used to restrict the paths that
       appears in the output.  Again this is useful to use with
       diff-cache, which, unlike diff-tree, does not take such paths
       restriction parameters.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 9ed5765837fd81cd0c508144fd8d290e498717f2
tree 06426f0a2932a12f392e7c49e8b89cb14e0f88c2
parent 2fc5ce9ee5f3fa24f6cca962c782a9c66f742073
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 03:24:11 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 03:24:11 +0200

    Simplify the repository compensation and just always descend to
    .git if there is any in the target URI when pulling from local
    location.

commit 86436c28289eedd2ee9b7f9c872a0ed039866a0f
tree 780ecf60c2d10084ab26758c093319d0c6c86480
parent ab7df1874d87d3f7494397442e67e900b580a346
author Junio C Hamano <junkio@cox.net> Mon, 25 Apr 2005 18:22:47 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 18:22:47 -0700

    [PATCH] Split external diff command interface to a separate file.
    
    With this patch, the non-core'ish part of show-diff command that
    invokes an external "diff" comand to obtain patches is split
    into a separate file.  The next patch will introduce a new
    command, diff-tree-helper, which uses this common diff interface
    to format diff-tree and diff-cache output into a patch form.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 2fc5ce9ee5f3fa24f6cca962c782a9c66f742073
tree 8ebc1eac65ed0539563a947106d38ad72cf248e1
parent d528348120de4629a469ad46fcf196d3b913245b
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 03:21:34 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 03:21:34 +0200

    When pulling from repository with "local" location, check if it
    does point at its working tree rather than its .git/ subdirectory
    and try to compensate for that.

commit d528348120de4629a469ad46fcf196d3b913245b
tree 7668f8f0960b033b927ac6516c25f09685b82937
parent 43b475a93258212d20a0d19416d11f6738bbe8f0
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 03:14:57 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 03:14:57 +0200

    Moved .git/heads and .git/tags to .git/refs subdirectory, as
    proposed by Daniel Barkalow on the mailing list.

commit 43b475a93258212d20a0d19416d11f6738bbe8f0
tree 1ef7478fc42648b8a37dfd12655f065d6c2ba87a
parent 3b95f84a5a4e25ec97b9e7394208af2027740219
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 02:52:42 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 02:52:42 +0200

    Moved .git/remotes to .git/branches/*.

commit 3b95f84a5a4e25ec97b9e7394208af2027740219
tree f60737d2051c438467455df33459ec0d4e91321b
parent 14bc831c2c606fc2b61f133b47384a0c2df48eeb
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 02:19:21 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 02:19:21 +0200

    cg-pull now hardlinks the objects database if the branch's location
    is local path, instead of rsync. Change the description of branch's
    location in usages appropriately.

commit 14bc831c2c606fc2b61f133b47384a0c2df48eeb
tree 1cfa5b08b1b10732f11434b58d4c255639cc6d5e
parent fbd53e1be389f1b652399016cb0d695ef34c2301
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 01:53:25 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 01:53:25 +0200

    Factored out rsync-specific bits in cg-pull to function fetch_rsync().

commit ab7df1874d87d3f7494397442e67e900b580a346
tree 635e855bb4a37467811de46f5fc17c18184a636c
parent 889262eacf43a7a8810c288c00732b9134d79630
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 16:34:13 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 16:34:13 -0700

    fsck-cache: show root objects only with "--root"
    
    This makes the default fsck behaviour be quiet for a repository
    that doesn't have any problems. Which is good.

commit 889262eacf43a7a8810c288c00732b9134d79630
tree 43d6b7874048e6f38b0a104d2cfb318df9cc5336
parent cd2fb81d1165cabf76e7f1c31386796e35dd1987
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 16:31:13 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 16:31:13 -0700

    fsck-cache: only show tags if asked to do so with "--tags"
    
    Normally we don't care, we just check them for being valid tag
    objects.

commit fbd53e1be389f1b652399016cb0d695ef34c2301
tree ce03de8eadbcec7759cce359db048dc373a14aad
parent fd6595de491f719ae818366a94207cbdd5ccf717
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 01:17:47 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 01:17:47 +0200

    Added cg-clone, which is a remote-friendly frontend for cg-init - it will
    create a new directory where it will do the checkout.

commit fd6595de491f719ae818366a94207cbdd5ccf717
tree ac42c178f9a6067a071174a355c581861bff30d7
parent e3d2af2a91eac13b4e2859900244d0fb545c1966
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 01:04:07 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 01:04:07 +0200

    cg-update now exits after recovering lost files when called with
    no parameters.

commit e3d2af2a91eac13b4e2859900244d0fb545c1966
tree f8b753a9562ec9d6717fa8e6d4512f27c181de2d
parent 027a438f2817271a77012b17e1027cb706410672
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 01:03:33 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 01:03:33 +0200

    Another major simplification of the Cogito concepts (some ideas
    by Pavel Machek). Kill the current concept of forking and local
    branches, rename "remotes" to branches:
    
    	mv cg-remote-add cg-branch-add
    	mv cg-remote-ls cg-branch-ls
    
    If you want to fork new branch, go to the directory where it shall
    reside and do
    
    	cg-init /path/to/source/branch
    
    This is currently quite wasteful since it duplicates the repository
    on disk, but that will be fixed soon.
    
    Kill now-useless cg-Xlntree.

commit 027a438f2817271a77012b17e1027cb706410672
tree 6cc98469d88e12d07a7d96574747658649cdb3d0
parent c6a47d11e133be071b23c99870e662f33de51bc8
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 00:38:33 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 00:38:33 +0200

    Fixed cg-help to call cg-version instead of gitversion.sh.

commit c6a47d11e133be071b23c99870e662f33de51bc8
tree 8068b2063979dcec1c0a0a85afda8a01b933ac09
parent 514512f26752d109655a02a05522f3e19cccdc3e
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 00:37:37 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 00:37:37 +0200

    Updated cg-help's ID description - s/remote/branch/ since that's
    what it is now.

commit 514512f26752d109655a02a05522f3e19cccdc3e
tree fd747a986307083c444f1fcd4fb03d84f5d2da01
parent 9f0b37e0b87b9ee5b68ff954af7eb75863634ebd
author Petr Baudis <pasky@ucw.cz> Tue, 26 Apr 2005 00:34:18 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 26 Apr 2005 00:34:18 +0200

    Factor out some common code (just the die() function for now)
    to cg-Xlib and include that from everywhere else.

commit cd2fb81d1165cabf76e7f1c31386796e35dd1987
tree 607829c662335a37120d50bbd2f57c5e0700cea6
parent 65f0d0ee4627dd0f0468ceded38677076d78feb5
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 15:29:45 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 15:29:45 -0700

    Add the git-*-script files to the install

commit 65f0d0ee4627dd0f0468ceded38677076d78feb5
tree 7eca7da44683b6eca9194768f44a6cff1ab7fd81
parent 56ce69f7afa6d7ce2f33a1173c143a1b89bb9663
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 15:23:53 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 15:23:53 -0700

    Add example "git-tag-script" to show how to create signed tag objects.

commit 56ce69f7afa6d7ce2f33a1173c143a1b89bb9663
tree 6f32f69e6badad78e9a19ca8a146ec417b9067af
parent ec4465adb38d21966acdc9510ff15c0fe4539468
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 15:21:49 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 15:21:49 -0700

    Make "fsck" also show what the name of the tag object is, not just
    the name of the object it tags.
    
    You need this if you actually want to build up a list of tags.

commit 9f0b37e0b87b9ee5b68ff954af7eb75863634ebd
tree e543b37735a0de0a2873fb3dce250deb0c74b5ad
parent be752fc468824c23263448833ef7ef200e536db2
author Petr Baudis <pasky@ucw.cz> Mon, 25 Apr 2005 22:55:15 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Mon, 25 Apr 2005 22:55:15 +0200

    Abandon the tracking concept altogether. cg-pull now always requires
    an argument and cg-update without arguments will bring the working
    tree up-to-date to HEAD, while preserving local changes; that means
    only recovering removed files now.

commit ec4465adb38d21966acdc9510ff15c0fe4539468
tree 1226432251537a46eea336799b243dc80b07d605
parent f5b913c9cb52cee019585375546817cfe5c75426
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 12:07:44 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 12:07:44 -0700

    Add "tag" objects that can be used to sign other objects.
    
    You use "git-mktag" to create them, and fsck-cache knows how to parse them.

commit f5b913c9cb52cee019585375546817cfe5c75426
tree ac76484a10f69423169e72f4bf9461b3e3ad880f
parent a44c9a5e2e6d4108452f2c64dbd11f74a83745af
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 12:04:55 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 12:04:55 -0700

    Fix up the types in write_sha1_file
    
    Use "unsigned long" for the size, like we do everywhere else.

commit a44c9a5e2e6d4108452f2c64dbd11f74a83745af
tree aa4796d8d4ae8c6c64bf9bd4b2d657571c67d4e4
parent e6948b6d88c69a864e9c461911287c5cc5932a3b
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 10:19:53 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 25 Apr 2005 10:19:53 -0700

    Simplify "write_sha1_file()" interfaces
    
    The write function now adds the header to the file by itself, so there
    is no reason to duplicate it among all the users any more.

commit be752fc468824c23263448833ef7ef200e536db2
tree 04eb9199cb4e9eadcbe6a59df8eac2a035dcbf6b
parent 0939e57ab25c836f46a6e7c578312b9b388688d0
author Petr Baudis <pasky@ucw.cz> Mon, 25 Apr 2005 14:46:20 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Mon, 25 Apr 2005 14:46:20 +0200

    Oops, updated Makefile to reflect the git-pasky -> Cogito renaming.
    I completely forgot about it (again). :-(

commit 0939e57ab25c836f46a6e7c578312b9b388688d0
tree 085cb0ecc1413e5f7880c19b35fe7b1ae0475e81
parent f89f75efeda2b33fa22a84b640cfedc2f1561c55
author Petr Baudis <pasky@ucw.cz> Mon, 25 Apr 2005 14:44:05 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Mon, 25 Apr 2005 14:44:05 +0200

    Mention cg-update in cg-help output.

commit f89f75efeda2b33fa22a84b640cfedc2f1561c55
tree e123f4ce100e0abf610664ba66b40cfaff912d08
parent 7dc7cdeeeee6428bb1dee59be19f47ac2e3bbb78
author Petr Baudis <pasky@ucw.cz> Mon, 25 Apr 2005 14:43:25 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Mon, 25 Apr 2005 14:43:25 +0200

    Killed cg-track and introduced much more versatile cg-admin-setopt,
    now supporting only option update-default, which is equivalent to
    cg-track.

commit 7dc7cdeeeee6428bb1dee59be19f47ac2e3bbb78
tree 7052897536f7cc9130266b3464b1b9fa0d939598
parent 685f71148d2c2ad27804997c44c12e4b9c051814
author Petr Baudis <pasky@ucw.cz> Mon, 25 Apr 2005 14:30:43 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Mon, 25 Apr 2005 14:30:43 +0200

    Updated gitfeedmaillist.sh to latest git-pasky -> Cogito changes.

commit 685f71148d2c2ad27804997c44c12e4b9c051814
tree f70bd0e5ea595f37ab96a407aa7e11a01f97ac2e
parent b21a04eb173b29a7c0b846ac5a47201a7d1ef18a
author Petr Baudis <pasky@ucw.cz> Mon, 25 Apr 2005 14:28:14 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Mon, 25 Apr 2005 14:28:14 +0200

    Changed semantics of cg-pull and cg-track. cg-pull now only pulls
    and cg-track only changes the default branch for new command cg-update
    to work upon - doing cg-update is equivalent to doing cg-pull on
    tracked branch before.
    
    Updated README to reflext this, also inevitably bundled with few other
    git-pasky -> Cogito updates (only small ones, though).

commit e6948b6d88c69a864e9c461911287c5cc5932a3b
tree 648b1464afe31bf85116ca64734a8b8990f4e0da
parent 3f053897b3445988309d0ae7378944783c34d152
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 16:20:53 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 16:20:53 -0700

    fsck-cache: warn about missing commit dates
    
    Now that we have hopefully converted all old archives, we
    can consider it an error.

commit 3f053897b3445988309d0ae7378944783c34d152
tree f5c350ae39f61486622c84597a507611e62fa6af
parent c6e007b0942a373bbf87fa3e4e11e2d90907de8c
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 15:49:09 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 15:49:09 -0700

    Update "convert-cache" to handle git itself.
    
    The git archives have some old-date-format commits with timezones
    that the converter didn't recognize. Also, make it be quiet about
    already-converted dates.

commit b21a04eb173b29a7c0b846ac5a47201a7d1ef18a
tree b2a5f6687769ec762154d975003e2421b334eb25
parent f7bc81842451b15b7d73d574dad7f0c15e602dc5
author Petr Baudis <pasky@ucw.cz> Mon, 25 Apr 2005 00:23:17 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Mon, 25 Apr 2005 00:23:17 +0200

    This commit changes naming of the git-pasky scripts to Cogito scripts,
    with the following mapping:
    
            mv gitXlntree.sh cg-Xlntree
            mv gitadd.sh cg-add
            mv gitaddremote.sh cg-remote-add
            mv gitapply.sh cg-patch
            mv gitcancel.sh cg-cancel
            mv gitcommit.sh cg-commit
            mv gitdiff-do cg-Xdiffdo
            mv gitdiff.sh cg-diff
            mv gitexport.sh cg-export
            mv gitfork.sh cg-fork
            mv githelp.sh cg-help
            mv gitinit.sh cg-init
            mv gitlog.sh cg-log
            mv gitls.sh cg-ls
            mv gitlsobj.sh cg-admin-lsobj
            mv gitlsremote.sh cg-remote-ls
            mv gitmerge-file.sh cg-Xmergefile
            mv gitmerge.sh cg-merge
            mv gitpatch.sh cg-mkpatch
            mv gitpull.sh cg-pull
            mv gitrm.sh cg-rm
            mv gitseek.sh cg-seek
            mv gitstatus.sh cg-status
            mv gittag.sh cg-tag
            mv gittrack.sh cg-track
            mv gitversion.sh cg-version
    
    The git multiplexer script is gone.

commit c6e007b0942a373bbf87fa3e4e11e2d90907de8c
tree b4186a52c7b88fb1e715af5ab4a94845df20414b
parent 32718b6c5e8dfe3ca39731b962ec6ada40407af4
author James Bottomley <James.Bottomley@SteelEye.com> Sun, 24 Apr 2005 15:14:16 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 15:14:16 -0700

    [PATCH] update-cache: add "--ignore-missing" option
    
    This adds an --ignore-missing option to update-cache, which makes it
    ignore missing files.  Together with the "-n" option to checkout-cache,
    it allows me to do
    
        checkout-cache -n -f -a && update-cache --ignore-missing --refresh
    
    which only updates and refreshes the files I already have checked out.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    

commit 32718b6c5e8dfe3ca39731b962ec6ada40407af4
tree 38ee0f8dd8492c06eaa075670b8b2cd8523c7b09
parent 235ac40772e259adfd978850b56192dca9791bb8
author James Bottomley <James.Bottomley@SteelEye.com> Sun, 24 Apr 2005 15:14:16 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 15:14:16 -0700

    [PATCH] checkout-cache: add "-n" option
    
    This adds the "-n" option to checkout-cache which tells it to not check
    out new files, only refresh files already checked out.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    

commit f7bc81842451b15b7d73d574dad7f0c15e602dc5
tree 7de71a831508e51e0985cea173f3f7a7012c82b7
parent 81b544a0f9907d9408f4dd30ba09bda1d0143de3
parent c35dfe858991ee1969870d2da9337a1da567157e
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 23:33:36 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 23:33:36 +0200

    Merge with rsync://www.kernel.org/pub/linux/kernel/people/torvalds/git.git
    

commit 235ac40772e259adfd978850b56192dca9791bb8
tree f74ed93cd9e524e798eb06ad59df494ce866ebc9
parent c35dfe858991ee1969870d2da9337a1da567157e
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 14:31:57 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 14:31:57 -0700

    Don't add references to objects we couldn't find.     
    
    That would SIGSEGV.

commit 81b544a0f9907d9408f4dd30ba09bda1d0143de3
tree 33f47e6d3c87ca52c971acc31eeb5ff5251d314f
parent aa786ab675b0a360f196a16286db5214b0866e7b
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 23:31:57 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 23:31:57 +0200

    Fixed help printing when the git multiplexer got called with no
    or invalid arguments.

commit aa786ab675b0a360f196a16286db5214b0866e7b
tree d09fcac8ff7b9f1e7e682cbaeaceea609491f705
parent a84eb55810b802b57b88e43095075e7e1ecf6b73
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 23:30:07 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 23:30:07 +0200

    Separate the git help command to githelp.sh.

commit a84eb55810b802b57b88e43095075e7e1ecf6b73
tree 97bef2d2005ab0c3e5120605e91420f7a5d4f8c7
parent 00a655f83278dc3807c9fcc8eb51e48c96df92de
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 23:24:33 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 23:24:33 +0200

    Kill gitXnormid.sh and split its functionality to before-just-dumb-wrappers
    commit-id and tree-id.

commit c35dfe858991ee1969870d2da9337a1da567157e
tree c7957a1345ea647b825c3a222d0c7e66cee2c311
parent d32987be618181db1f435a5c0a1bea85e90c7c7d
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 14:22:09 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 14:22:09 -0700

    Verify that the object type matches for tree/commit objects even before parsing.
    
    The type doesn't come from the parsing, the type also has to match the usage.

commit d32987be618181db1f435a5c0a1bea85e90c7c7d
tree 000a0382e736b024de1581ca3781b561a2ab1942
parent 4728b861ace127dc39c648f3bea64c3b86bbabc5
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 14:17:13 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 14:17:13 -0700

    Set object type at object creation time, not object parse time.
    
    Otherwise we can have objects without a type, which is not good.

commit 4728b861ace127dc39c648f3bea64c3b86bbabc5
tree 242227fc3c3a74d070ed36496e790335dd00c44a
parent da6abf5d9c342a74dffbcc2015b9c27d7819a900
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 14:10:55 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 14:10:55 -0700

    fsck-cache: notice missing "blob" objects.
    
    We should _not_ mark a blob object "parsed" just because we
    looked it up: it gets marked that way only once we've actually
    seen it. Otherwise we can never notice a missing blob.

commit 00a655f83278dc3807c9fcc8eb51e48c96df92de
tree d4b608f078e08733205600596b912d636cf94f45
parent 40cc4d85a9748396aa0311460b007d1ddbb5430e
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 23:10:47 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 23:10:47 +0200

    Use rev-list instead of rev-tree for git log if no range is given.
    This should speed this (common) case somewhat.

commit 40cc4d85a9748396aa0311460b007d1ddbb5430e
tree 33babc0260a77e317edd15283204a72dd07cc32a
parent 37a20ed4f4532568eeaee6efe730635ef23b3290
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 23:09:49 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 23:09:49 +0200

    Added libcurl to the dependency list. Pointed out by Jonas Fonseca.

commit da6abf5d9c342a74dffbcc2015b9c27d7819a900
tree fc8e8c5906aedbe8b1b99c422b14ae2dbd2220c8
parent c5b423860d4a0f2c1144c578207f327e0985bba7
author Andreas Gal <gal@uci.edu> Sun, 24 Apr 2005 14:04:13 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 24 Apr 2005 14:04:13 -0700

    [PATCH] fix segfault in fsck-cache
    
    Here is how to trigger it:
    
       echo blob 100 > .git/objects/00/ae4e8d3208e09f2cf7a38202a126f728cadb49
    
    Then run fsck-cache. It will try to unpack after the header to calculate 
    the hash, inflate returns total_out == 0 and memcpy() dies.
    
    The patch below seems to work with ZLIB 1.1 and 1.2.
    
    Signed-off-by: Andreas Gal <gal@uci.edu>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    

commit 37a20ed4f4532568eeaee6efe730635ef23b3290
tree f73a7a7c026436ab65af6c6d62ce0f5ea86746f6
parent 8466d8dcfdc00f81d22ab25cc69c04752de094e2
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 22:46:47 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 22:46:47 +0200

    "HEAD" id is now equivalent to the "this" id.

commit 8466d8dcfdc00f81d22ab25cc69c04752de094e2
tree 3745b0afd8550f643d73e142ea63f5cc65ae8c62
parent b43008726a08bc1788fb4132091d1efc33ef354e
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 22:43:19 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 22:43:19 +0200

    Use read-tree -m in git seek and git diff (for older-tree-against-working-tree
    cases). Should speed things up considerably. Pointed out by Dan Holmsand.

commit b43008726a08bc1788fb4132091d1efc33ef354e
tree b69c607af4fe66c1a3047d622862bd807a7c0c39
parent 256f5594ff286dd311d29218a5513af851582a20
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 22:34:42 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 22:34:42 +0200

    Cleanup gitmerge-file.sh's output. The error messages were unified,
    overdetailed progress report commented out for now. I also tried to
    make it more easily recognizable (e.g. automerging and conflict
    reports were too meshed together before).

commit 256f5594ff286dd311d29218a5513af851582a20
tree 6fcf70c4f089962b38a52876125b3f182f741454
parent dc292dd2289cd2dd820e4f00bc198eae30a769ad
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 22:29:15 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 22:29:15 +0200

    Merged changes in git-merge-one-file to gitmerge-file.sh; it deals
    properly with permissions now.

commit dc292dd2289cd2dd820e4f00bc198eae30a769ad
tree f4ddca71af5e16ffc21814b79a55ef853011d2e3
parent fb73fc6db899891d6c698f065b21526e69ca26b0
parent c5b423860d4a0f2c1144c578207f327e0985bba7
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 22:17:36 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 22:17:36 +0200

    Merge with rsync://www.kernel.org/pub/linux/kernel/people/torvalds/git.git
    

commit fb73fc6db899891d6c698f065b21526e69ca26b0
tree 248cef7a4083761e7ce3b63576a7022f26b42c18
parent 730df8aa1ce2e2821f14599be9efdf71daf02b2b
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 14:44:00 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 14:44:00 +0200

    Add the RCS dependency to the README, as pointed out on the mailing list.

commit 730df8aa1ce2e2821f14599be9efdf71daf02b2b
tree 36ca6684262b1ebebd28ddedfdb8d81b0e3a24f1
parent bc61d9a04dc39598014f38b0ad7422f0ceaf2cc9
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 14:38:13 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 14:38:13 +0200

    Fixed problem that make install required either an already installed
    version of git, or . in $PATH. Pointed out by many people.

commit c5b423860d4a0f2c1144c578207f327e0985bba7
tree 31e9af73983d640090508b06784ef7db4816c957
parent e2b6a9d0bf9335f24aa8b2be8ff00d3a4ccf6505
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 22:08:00 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 22:08:00 -0700

    Support a fine-grained diff-tree
    
    This is based on a patch by David Woodhouse, but with the selection
    tests much simplified and streamlined.
    
    It makes diff-tree take extra arguments, specifying the files or         
    directories which should be considered "interesting". Changes in
    uninteresting directories are not reported.
    
    Signed-off-by: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit e2b6a9d0bf9335f24aa8b2be8ff00d3a4ccf6505
tree e18acff3eeac6bee8a34b6c25016f1dfbdefbd67
parent 58e28af6a4d4d4faa1fa628e91c0b33c2b87aade
author James Bottomley <James.Bottomley@SteelEye.com> Sat, 23 Apr 2005 20:50:10 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 20:50:10 -0700

    [PATCH] make file merging respect permissions
    
    1) permissions aren't respected in the merge script (primarily because
    they're never passed in to it in the first place).  Fix that and also
    check for permission conflicts in the merge
    
    2) the delete of a file in both branches may indeed be just that, but it
    could also be the indicator of a rename conflict (file moved to
    different locations in both branches), so error out and ask the
    committer for guidance.
    
    Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    

commit 58e28af6a4d4d4faa1fa628e91c0b33c2b87aade
tree 6f24c9b481d76e067d64bac1a8dbd5cf5d0dfb05
parent 4056c09114e66ce3c2368551f0122e83628750d6
author Daniel Barkalow <barkalow@iabervon.org> Sat, 23 Apr 2005 20:29:22 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 20:29:22 -0700

    [PATCH] Allow multiple date-ordered lists
    
    Make pop_most_recent_commit() return the same objects multiple times, but only
    if called with different bits to mark.
    
    This is necessary to make merge-base work again.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    

commit 4056c09114e66ce3c2368551f0122e83628750d6
tree 34933617a2e8284ffca6ab2a1b2f00d6996a58e7
parent 64745109c41a5c4a66b9e3df6bca2fd4abf60d48
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 19:21:28 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 19:21:28 -0700

    Don't add parents to the commit list if we have already
    seen them.
    
    Otherwise any merges will make the parent list explode.

commit 64745109c41a5c4a66b9e3df6bca2fd4abf60d48
tree 2b7d1d2f747a63f2270c7062ffd0726b369ca25e
parent 6eb7ed5403b7d57d5ed7e30d0cd0b312888ee95c
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 19:04:40 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 19:04:40 -0700

    Add "rev-list" program that uses the new time-based commit listing.
    
    This is probably what you'd want to see for "git log".

commit 6eb7ed5403b7d57d5ed7e30d0cd0b312888ee95c
tree 3b4a5bb703599458ce8fe504f37f8e28b77bd6ca
parent b6b15db3f464b18180eee79927cb324fd63e15ff
author Daniel Barkalow <barkalow@iabervon.org> Sat, 23 Apr 2005 18:47:23 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 18:47:23 -0700

    [PATCH] Various transport programs
    
    This patch adds three similar and related programs. http-pull downloads
    objects from an HTTP server; rpull downloads objects by using ssh and
    rpush on the other side; and rpush uploads objects by using ssh and rpull
    on the other side.
    
    The algorithm should be sufficient to make the network throughput required
    depend only on how much content is new, not at all on how much content the
    repository contains.
    
    The combination should enable people to have remote repositories by way of
    ssh login for authenticated users and HTTP for anonymous access.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit b6b15db3f464b18180eee79927cb324fd63e15ff
tree c39c3027cb15e3d014f959c07794f96b4d4218ea
parent 8237b1854c64492ab5772994b4ac4efd7f1c2fc0
author Daniel Barkalow <barkalow@iabervon.org> Sat, 23 Apr 2005 18:47:23 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 18:47:23 -0700

    [PATCH] Replace merge-base implementation
    
    The old implementation was a nice algorithm, but, unfortunately, it could
    be confused in some cases and would not necessarily do the obvious thing
    if one argument was decended from the other. This version fixes that by
    changing the criterion to the most recent common ancestor.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 8237b1854c64492ab5772994b4ac4efd7f1c2fc0
tree 562b4adb2f435756bed81fc129116f449d507e53
parent 08692164e0937352fb2c8aab5a7318facbd07daa
author Daniel Barkalow <barkalow@iabervon.org> Sat, 23 Apr 2005 18:47:23 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 18:47:23 -0700

    [PATCH] Additional functions for the objects database
    
    This adds two functions: one to check if an object is present in the local
    database, and one to add an object to the local database by reading it
    from a file descriptor and checking its hash.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 08692164e0937352fb2c8aab5a7318facbd07daa
tree f6ce511a171fc2888000dd6e74be2f20763aecd3
parent dd97f850c3fc049f4f0d8b1fd252d54bc1ba6994
author Daniel Barkalow <barkalow@iabervon.org> Sat, 23 Apr 2005 18:47:23 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 18:47:23 -0700

    [PATCH] Parse tree objects completely
    
    This adds the contents of trees to struct tree.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit dd97f850c3fc049f4f0d8b1fd252d54bc1ba6994
tree c43426bf10b8a115fd038f96c40731fc0eae8341
parent 90ffd0952f61717d93858b154d2505d0ba051b14
author Daniel Barkalow <barkalow@iabervon.org> Sat, 23 Apr 2005 18:47:23 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 18:47:23 -0700

    [PATCH] Add some functions for commit lists
    
    This adds a function for inserting an item in a commit list, a function
    for sorting a commit list by date, and a function for progressively
    scanning a commit history from most recent to least recent.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 90ffd0952f61717d93858b154d2505d0ba051b14
tree d437ceb68a1df0f19991463367a3f11e64717b19
parent 65bc81d6fef619d7aadc5c7116be52860539f17a
author Jonas Fonseca <fonseca@diku.dk> Sat, 23 Apr 2005 18:41:48 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 18:41:48 -0700

    [PATCH] Simplify building of programs
    
    Do not first build .o files when building programs.
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    

commit 65bc81d6fef619d7aadc5c7116be52860539f17a
tree 9adb399af84228740555d732732983b7a02b019d
parent 93256315b2444601a35484f4fb76cd5723284201
author Petr Baudis <pasky@ucw.cz> Sat, 23 Apr 2005 18:05:07 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 18:05:07 -0700

    [PATCH] Fix broken diff-cache output on added files
    
    Added files were errorneously reported with the - prefix by diff-cache,
    obviously leading to great confusion.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    

commit bc61d9a04dc39598014f38b0ad7422f0ceaf2cc9
tree 2aaf94eae20acc451553766f3c063bc46cfa75c6
parent cf840ee5d17078d05182b62ea6dc931e0115470b
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 02:44:39 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 02:44:39 +0200

    git-pasky-0.7

commit cf840ee5d17078d05182b62ea6dc931e0115470b
tree 1d924ba97f134cbba5af7cdad6a020af131d6246
parent 9f692e45ca337cc5369f31aa8113627bd03fd837
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 02:44:28 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 02:44:28 +0200

    In git log colorizer, the signoff string must end with colon.
    Avoids some real world false positives.

commit 9f692e45ca337cc5369f31aa8113627bd03fd837
tree 8f328c3153690fe506b6faab91405f127db3599e
parent 3d6bb2b547775adb6c5539f9475171b452e4d114
parent 93256315b2444601a35484f4fb76cd5723284201
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 02:43:27 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 02:43:27 +0200

    Merge with rsync://www.kernel.org/pub/linux/kernel/people/torvalds/git.git
    

commit 3d6bb2b547775adb6c5539f9475171b452e4d114
tree af7939fe889f654e9059c02245c48249ea292add
parent e66556230bfe7c7475708e99109bca261c9563e2
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 02:37:56 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 02:37:56 +0200

    Fixed git merge to properly set up the cache when we are not going
    to commit the merge immediately (-c or conflicts). This fixes especially
    adds/removals not being reflected in the commits.

commit e66556230bfe7c7475708e99109bca261c9563e2
tree 04102c8acaaa7f2ed12bd7fdbae15e5a495fa210
parent 81fb277d1ea153ca8f6825d28ce66af50404b136
author Jonas Fonseca <fonseca@diku.dk> Sun, 24 Apr 2005 00:59:56 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 02:11:12 +0200

    Don't list libgit.a twice when compiling programs and make them depend
    on the .c files so that intermediate .o files do not need to be built.
    
    Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 81fb277d1ea153ca8f6825d28ce66af50404b136
tree 420f290638a7bf680f53c2817d355d658563af83
parent 6a2d1b5cb96f4fa764a2ab36b98536b471943c6b
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 01:56:31 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 01:56:31 +0200

    Changed git patch output to match Linus' preferred order for submission,
    as described in <Pine.LNX.4.58.0504192142040.6467@ppc970.osdl.org>:
    
    You should have "checkin comment" first, then "signed-off-by", then a line
    with three dashes, and then "administrative trivia".
    
    Ie I'd much rather see the email look like ...
    since otherwise I'll just have to edit it that way. I like seeing the
    administrative stuff (diffstat etc), but I don't want to have it in the
    commit message, and that's exactly what the "---" marker is for - my tools
    will automatically cut it off as if it was a signature (or the beginning
    of the patch).

commit 93256315b2444601a35484f4fb76cd5723284201
tree 30290c79f4914d7575c87d1c06f441d8a3bc5115
parent bfac5d94291bdb951ae3e739598a32bf868ea806
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 16:48:32 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 16:48:32 -0700

    Make a hack to convert-cache for missing author dates in old
    archives (notably the old sparse one).
    
    Very hacky. But hopefully we can do the conversion once, and never
    worry about this ever again.

commit bfac5d94291bdb951ae3e739598a32bf868ea806
tree 2c4061533b218715c1b953ca57f205d3c579fad6
parent 144bde78e9ff22d53682ef46b3d9845b83e70f54
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 16:37:31 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 16:37:31 -0700

    Make "convert-cache" able to handle the really old archive formats
    
    This includes the old-style "flat tree" object, and the old broken
    date format. Well, enough of the date format to convert the sparse
    archive, at least.

commit 6a2d1b5cb96f4fa764a2ab36b98536b471943c6b
tree f6c5b48f2aff9e77e36d2315e924a441e6dd4766
parent 4a858d3e94fe05fc2c5dd161c9eeaed8beb0e9d0
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 01:33:54 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 01:33:54 +0200

    Fix added files on Linus' side from the last merge. There's some
    bad bug in the merging code yet. :/

commit 4a858d3e94fe05fc2c5dd161c9eeaed8beb0e9d0
tree 3df862ae5cc66733dab3d8bd5c4ea359b2ca1884
parent 1998ba4b4652f3165d5c21fd94b4d81876e659a4
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 01:30:59 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 01:30:59 +0200

    [PATCH] Fix broken diff-cache output on added files
    
    Added files were errorneously reported with the - prefix by diff-cache,
    obviously leading to great confusion.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 1998ba4b4652f3165d5c21fd94b4d81876e659a4
tree 099679c62a98433d9d9b38581f39563c9574478e
parent a9734ac2fe1efeadd4720d09f5acb632310b9704
author Mike Dunston <atani@atani-software.net> Fri, 22 Apr 2005 14:25:07 -0700
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 01:27:52 +0200

    In my tests of using git (both Linus and pasky versions) I had a problem with
    doing "gitadd.sh *" where * expands to include directories.  This simple patch
    allows update-cache.c to more gracefully handle a directory being passed into
    the add_file_to_cache method.  Without this patch update-cache exits
    prematurely with an error similar to:
    -------------
    fatal: Unable to add plx to database
    -------------
    
    Now it spits out:
    -------------
    'plx' is a directory, ignoring
    -------------
    Which from an end user stand point is better.
    
    Signed-off-by: Mike Dunston <atani@atani-software.net>
    
    Output to stderr, style cleanup.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit a9734ac2fe1efeadd4720d09f5acb632310b9704
tree 66b3fa5bde838935121a2eb7cf4b67587c32de13
parent 981e9bb3d4685493e3d6db614d7d684cdcc41eef
author Nicolas Pitre <nico@cam.org> Fri, 22 Apr 2005 22:06:27 -0400
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 01:13:06 +0200

    [PATCH] fix git log time display for western timezones
    
    It appears that the date command doesn't know how to substract time and
    always adds it.  The time zone fixup has to be done separately otherwise
    time displayed in a negative time zone is wrong.
    
    Signed-off-by: Nicolas Pitre <nico@cam.org>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 981e9bb3d4685493e3d6db614d7d684cdcc41eef
tree 96ecb8500daea19e5cee169955ca078476aad3da
parent 8d4b4cc30e7a61d5fd61cce93228fc4945e0ce79
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 00:59:38 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 00:59:38 +0200

    git diff now again accepts individual file names as additional
    arguments.

commit 8d4b4cc30e7a61d5fd61cce93228fc4945e0ce79
tree 445f5ad94177444c014da98f14f3242fdceea6b9
parent de4d6378ea10b038dac4244cd227f1823654e83a
parent 144bde78e9ff22d53682ef46b3d9845b83e70f54
author Petr Baudis <pasky@ucw.cz> Sun, 24 Apr 2005 00:07:06 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sun, 24 Apr 2005 00:07:06 +0200

    Merge with rsync://www.kernel.org/pub/linux/kernel/people/torvalds/git.git
    

commit de4d6378ea10b038dac4244cd227f1823654e83a
tree 6a0eb79f673b3e40d95e3d1de0327cd286427366
parent ff343fd5813514a2fb8b67ab286f1655d058f4f5
author Petr Baudis <pasky@ucw.cz> Sat, 23 Apr 2005 23:59:59 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sat, 23 Apr 2005 23:59:59 +0200

    Do not proceed with git pull if any rsync returned error.
    Suggested by Morten Welinder.

commit ff343fd5813514a2fb8b67ab286f1655d058f4f5
tree e392011b2e21de56d4e10c2310537a779537f5c9
parent a8eb443886fecc9290ee0417dc94156a4d991270
author Petr Baudis <pasky@ucw.cz> Sat, 23 Apr 2005 23:51:55 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sat, 23 Apr 2005 23:51:55 +0200

    Fixed .git/tags/tags being generated by git pull errorneously.
    Pointed out by many people.

commit a8eb443886fecc9290ee0417dc94156a4d991270
tree 589a2e0bd887149d5c4a988b039ed3408e07b27c
parent 0bb7df321f1682581b28074f1c4e76f8333deabe
author Petr Baudis <pasky@ucw.cz> Sat, 23 Apr 2005 23:15:28 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sat, 23 Apr 2005 23:15:28 +0200

    For those doing git init, mention in the README that they get branch
    "origin", not "pasky". Pointed out by Inaky Perez-Gonzalez.

commit 144bde78e9ff22d53682ef46b3d9845b83e70f54
tree 329aca984ad6d06eb6d2dffae3933f00ccb8df5a
parent a6ef3518f9ac8a1c46a36c8d27173b1f73d839c4
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 11:09:32 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 23 Apr 2005 11:09:32 -0700

    Use O_NOATIME when opening the sha1 files.
    
    We really don't care about atime, and it sucks to dirty the
    inode cache just for it.
    
    This is more than a one-liner only because we need to be able to
    clear the O_NOATIME flag in case some of the objects are owned
    by others (in which case open will return EPERM), and because not
    everybody has the O_NOATIME flag.

commit a6ef3518f9ac8a1c46a36c8d27173b1f73d839c4
tree e6d3a81c30ad237102e2ca82f3dfc57d0b9f0ddf
parent b5af9107270171b79d46b099ee0b198e653f3a24
author Paul Mackerras <paulus@samba.org> Fri, 22 Apr 2005 23:08:43 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 22 Apr 2005 23:08:43 -0700

    [PATCH] PPC assembly implementation of SHA1
    
    Here is a SHA1 implementation with the core written in PPC assembly.
    On my 2GHz G5, it does 218MB/s, compared to 135MB/s for the openssl
    version or 45MB/s for the mozilla version.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit b5af9107270171b79d46b099ee0b198e653f3a24
tree 8284e5e732d110051beb6281e423488b74ee7593
parent 94537c78a82619b2625cb827ec0094703579bfed
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 22 Apr 2005 17:15:28 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 22 Apr 2005 17:15:28 -0700

    New "diff-cache" implementation.
    
    This one is about a million times simpler, and much more likely to be
    correct too.
    
    Instead of trying to match up a tree object against the index, we just
    read in the tree object side-by-side into the index, and just walk the
    resulting index file. This was what all the read-tree cleanups were
    all getting to.

commit 94537c78a82619b2625cb827ec0094703579bfed
tree 9258e61a83bd78c41324c96ac57e3bf6e7967d58
parent aba06682473e2d797011f966d66c93043e3ed57a
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 22 Apr 2005 16:42:37 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 22 Apr 2005 16:42:37 -0700

    Move "read_tree()" to "tree.c" to be used as a generic helper function.
    
    Next step: make "diff-cache" use it.

commit aba06682473e2d797011f966d66c93043e3ed57a
tree c982679cb273515e4bfa54aa0dcb71ab505c9b48
parent cef661fc799a3a13ffdea4a3f69f1acd295de53d
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 22 Apr 2005 16:35:06 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 22 Apr 2005 16:35:06 -0700

    Clean up and simplify read-tree a bit.
    
    This is preparation for moving parts of it into "tree.c" to be used
    as a library function.

commit 0bb7df321f1682581b28074f1c4e76f8333deabe
tree 2a91836b5814ffacb1fde000dfb1e55457761c88
parent d30ad29d6d4ac803812e54b7516f7f38f69e8976
author Petr Baudis <pasky@ucw.cz> Sat, 23 Apr 2005 01:29:52 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sat, 23 Apr 2005 01:29:52 +0200

    In git cancel, try read-tree -m first and do read-tree only
    when it fails.

commit d30ad29d6d4ac803812e54b7516f7f38f69e8976
tree 607ab53a24b6dade1af9d509d170b2ba81e643c9
parent e5c53e9350bae7b216f2a2e46ddcbad496054831
author Petr Baudis <pasky@ucw.cz> Sat, 23 Apr 2005 01:28:34 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Sat, 23 Apr 2005 01:28:34 +0200

    Re-fixed the "only garbage" harmless error message sometimes
    produced when doing git merge.

commit e5c53e9350bae7b216f2a2e46ddcbad496054831
tree 4bc7395254c1008dd3463ec20c536d14ac15f28e
parent 8c389f24be9264462c84004edb4ed7951d85c9a3
author Steven Cole <elenstev@mesatop.com> Thu, 21 Apr 2005 20:58:14 -0600
committer Petr Baudis <xpasky@machine.sinus.cz> Sat, 23 Apr 2005 01:00:04 +0200

    Here's a patch to let people know about the nice color feature of git log.
    
    Signed-off-by: Steven Cole <elenstev@mesatop.com>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 8c389f24be9264462c84004edb4ed7951d85c9a3
tree 85d30321c25d91026aa15c64f17b2554d8a0f84f
parent f05afc692acf0bdebb34514c1d8e88ddd24f95cb
author Jan Harkes <jaharkes@cs.cmu.edu> Fri, 22 Apr 2005 15:29:07 -0400
committer Petr Baudis <xpasky@machine.sinus.cz> Sat, 23 Apr 2005 00:11:04 +0200

    [PATCH] git patch, patches are out of order
    
    Running git patch <a>:<b> gives all the patches between versions a and b
    in a random order one in which they do not necessarily apply if any
    commits modified identical files.
    
    Adding a simple numeric sort on the timestamp to put them in commit order.
    
    Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
    
    Note that they still do not necessarily apply when you take branches into account,
    but it's still better than it was before.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit f05afc692acf0bdebb34514c1d8e88ddd24f95cb
tree 5f61aecb06c2f2579bbb5951b1b53e0dedc434eb
parent d956f4a1a965de8bdd079eecf0c0b3bd8368bc39
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 19:51:49 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 19:51:49 +0200

    Take two on removing revision.h. There was a bug in the removing
    code before, and merging didn't do the right thing neither. ;-)

commit d956f4a1a965de8bdd079eecf0c0b3bd8368bc39
tree 5219e5cd0917defdae2586a27ae32fa96c36b3ea
parent 510ac75ec906353e2fac982008d4a1483c239191
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 19:50:05 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 19:50:05 +0200

    The official rsync cogito repository is now
    
    	rsync://rsync.kernel.org/pub/scm/cogito/cogito.git
    
    Thanks to the kernel.org people!

commit 510ac75ec906353e2fac982008d4a1483c239191
tree ac4dd6c37d2367b0c8c4295920cc07267325e5f2
parent 91b28d9369ef8ebeab29c6075769597393e5658a
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 19:47:24 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 19:47:24 +0200

    Support .git/tags/ being a symlink when pulling.

commit 91b28d9369ef8ebeab29c6075769597393e5658a
tree 9f6f9ee7ad29cafe4265eae5050ce712b00bfce0
parent 484da79fa042157c53c07cf5c936695b399030bc
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 19:22:15 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 19:22:15 +0200

    In the README, account for the case when yuo got a tarball without the .git subdirectory.

commit 484da79fa042157c53c07cf5c936695b399030bc
tree c4c6d0be3db3aaff22129594d12e38d1a21cecda
parent b3fcdaf95d334a2b81b0d0474bd8a22b33e816db
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 18:48:30 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 18:48:30 +0200

    Use bash instead of sh in all scripts. We were relying on some
    non-standard features anyway, and problems kept popping up.

commit b3fcdaf95d334a2b81b0d0474bd8a22b33e816db
tree 173843eee2c6191ad1df2ea6a99b8b69c26745c4
parent 0ffc18b88804847d1d154a35fdf90314fbc32809
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 18:31:31 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 18:31:31 +0200

    Compatibility with older zlib versions without deflateBound().
    Pointed out by Edgar Toernig <froese@gmx.de>.

commit 0ffc18b88804847d1d154a35fdf90314fbc32809
tree 0a9ee5a4d947b998a7ce489242800b39f98eeee5
parent 2b59b040b85b890556ef2260e2f77775f0dda5d4
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 05:01:31 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 05:01:31 +0200

    Fixed git commit to behave well (hopefully) when some files are
    added/removed and then you commit some individual files.

commit 2b59b040b85b890556ef2260e2f77775f0dda5d4
tree 68ba3fc4c92cc7244e3a4988cf76f15a0fa0b8d1
parent 8e7e77371f2ca989950d276bccaf53c5edc7e0ef
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 04:52:16 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 04:52:16 +0200

    Sanity check in git commit against passing -C and files to commit
    at once.

commit 8e7e77371f2ca989950d276bccaf53c5edc7e0ef
tree fa2ab4f0be2cf980248eb5fea1f512ffa0ae9cc1
parent a9f92f31e9a8ede8ea562c8c74198de215efc2fb
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 04:49:21 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 04:49:21 +0200

    Updated git.spec so that it uses DESTDIR and prefix make install parameters
    properly.

commit a9f92f31e9a8ede8ea562c8c74198de215efc2fb
tree 9cdad9f63da3f603e0f6dabbda49c19aef47fa4a
parent a40d5f32e055a1cefe13d99f191d2399ed63a29f
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 04:47:08 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 04:47:08 +0200

    Removed files show as removed (R) isntead of deleted (D) now in
    show-files -t output. More consistent.

commit a40d5f32e055a1cefe13d99f191d2399ed63a29f
tree 84e38a95f314b3131604a79cc80c760ae584a0e1
parent 14f14408a2d4855ae3da7a4bc5b468ada0700b3f
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 04:46:09 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 04:46:09 +0200

    Fixed git commit to extract the full list of changed files. It would
    omit added/removed files now.

commit 14f14408a2d4855ae3da7a4bc5b468ada0700b3f
tree f04710fb044248a2f7b5fef66e3debe814118b45
parent 47e6cb77261d23a23055a7866739c993ae54cc58
author Chris Wright <chrisw@osdl.org> Thu, 21 Apr 2005 17:55:21 -0700
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 04:36:28 +0200

    [PATCH] git-pasky spec file
    
    Here's a simple spec file to do rpm builds.  It's against the
    latest Makefile (which has the s/BINDIR/bindir/ change).  I've used
    DESTDIR, although it's not clear it's meant to stay in the Makefile.
    For now, there's no dynamic (git.spec.in, for example) update to the
    Version, so it's set against 0.6.3 (expecting it to be forthcoming
    shortly).  It installs to /usr/local/bin, and expects the tarball to be
    named git-pasky-0.6.3.tar.bz2.  Creates a package named git, which seems
    fine since Linus' isn't likely to be packaged directly.  Enjoy.
    
    Signed-off-by: Chris Wright <chrisw@osdl.org>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 47e6cb77261d23a23055a7866739c993ae54cc58
tree 8c271cf55b347797ebf5967d3f80b45c7c3f9f39
parent acc71aab89b4ae8d5f4a03c758cc4c2bc04a3229
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 04:33:05 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 04:33:05 +0200

    Remove the add/rm-queues, significantly simplifying a lot of code.
    Use the directory cache to record adds/removals now, and diff-cache
    for generating diffs between working tree and given tree, which will
    take the cache into account properly.
    
    I almost certainly forgot to update something. Please let me know,
    and test heavily.
    
    Note that diffing individual files is broken now. Patches welcome. ;-)

commit acc71aab89b4ae8d5f4a03c758cc4c2bc04a3229
tree 6a612d42afdba20fd2150e319a689ed451b010e4
parent efa860386451051a30ee3ed3e4e5eed39772b5cd
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 03:34:34 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 03:34:34 +0200

    git-pasky-0.6.3

commit efa860386451051a30ee3ed3e4e5eed39772b5cd
tree a58d5206754453b5360992e8a66e89f96eeefab2
parent e58c72c290a2bdc557be8e89cb772eb0487b7427
author Daniel Serpell <daniel.serpell@gmail.com> Thu, 21 Apr 2005 20:04:16 -0400
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 03:31:00 +0200

    Uses tput instead of setterm to set colors in git log output,
    seems to work with more terminals.
    
    Signed-off-by:  Daniel Serpell <daniel.serpell@gmail.com>
    
    Beautified.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit e58c72c290a2bdc557be8e89cb772eb0487b7427
tree 3a696921ee07aa233e07c7b1cf098e0dae5360b2
parent 5d539ac6b5265ceaf5c492df62a57583f72c1572
author Daniel Serpell <daniel.serpell@gmail.com> Thu, 21 Apr 2005 20:04:16 -0400
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 03:29:11 +0200

    Strip space in front of colorized header lines in git log output.
    
    Signed-off-by:  Daniel Serpell <daniel.serpell@gmail.com>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 5d539ac6b5265ceaf5c492df62a57583f72c1572
tree 38e4a362f6886443cacf2ba80fd321a5c1b38777
parent a78f1ee77523c68c927d55c526b397ac0b03e604
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 03:23:40 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 03:23:40 +0200

    rsync URLs can now contain branch names as fragment identifiers.

commit a78f1ee77523c68c927d55c526b397ac0b03e604
tree d141a6822171e9d0773f6d49140b9323bdb00ca8
parent bda87e288b206a7852035638044ae7287f686ede
author Pavel Roskin <proski@gnu.org> Thu, 21 Apr 2005 18:37:04 -0400
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 02:23:20 +0200

    We need to change prefix and bindir to be lowercase for
    compatibility with GNU standards.  Also, ifdef is not needed - command
    line trumps even unconditional variable assignments.  Another thing to
    fix - DESTDIR is not used when bindir is created.
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit bda87e288b206a7852035638044ae7287f686ede
tree ad13d4148e751aaf851379193b98acf65e07f97f
parent bc478fcc54c6ad3ace827851f6abe58ab360a100
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 02:17:09 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 02:17:09 +0200

    Note in the git help output that git patch accepts a range of
    two commits too.

commit bc478fcc54c6ad3ace827851f6abe58ab360a100
tree bce6fbc316cb1460415d9db270ec8f226ffcff64
parent 3524031d34f52f9607b13e29354f2d6416b78241
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 02:16:45 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 02:16:45 +0200

    git log now accepts a range of commits (id1;id2] for id1:id2 on the
    command line, much like git patch.

commit 3524031d34f52f9607b13e29354f2d6416b78241
tree f2925d518a96aa9c267fe81bdd10e235b0bc34b1
parent 51c11693ea5abd8c616cc69448cc468b263d4da2
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 01:57:36 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 01:57:36 +0200

    git patch now can take a range of commits instead of a single
    commit, and in that case emits patches for all the commits in
    the range.

commit 51c11693ea5abd8c616cc69448cc468b263d4da2
tree 554a309853abd19729b4d44081d4dd50f9da5928
parent c819afa981f4ba6c68de38df4a3c6b7a421a06de
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 01:10:06 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 01:10:06 +0200

    Fixed some long-missing (but not too harmful) checkout-cache warning
    which didn't get merged for some reason.

commit c819afa981f4ba6c68de38df4a3c6b7a421a06de
tree 551a8ba0a6afbbe00f5173d62e0313285a3b008e
parent 8845b1f4368eca747c6cde8f30ee1c6b56d5d8c3
parent cef661fc799a3a13ffdea4a3f69f1acd295de53d
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 01:01:08 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 01:01:08 +0200

    Merge with rsync://www.kernel.org/pub/linux/kernel/people/torvalds/git.git
    
    Mozilla's SHA1 implementation.

commit 8845b1f4368eca747c6cde8f30ee1c6b56d5d8c3
tree 7f1f3b815ffa99a0b365b9c42d545893549e2b25
parent 850ff3aa241096499d3af993a644a35cfef1b087
author Petr Baudis <pasky@ucw.cz> Fri, 22 Apr 2005 00:42:05 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 00:42:05 +0200

    git log now can take an optional -c argument which will make its
    output mildly (and eye-friendly) colorized. Idea by Sean <seanlkml@sympatico.ca>.

commit 850ff3aa241096499d3af993a644a35cfef1b087
tree fdefffa5484814994fb5f8bcf70de009b1e0f5aa
parent 2daa3b3401b6d354b97864d0b64f5c015118a670
author Linus Torvalds <torvalds@osdl.org> Thu, 21 Apr 2005 14:19:45 -0700
committer Petr Baudis <xpasky@machine.sinus.cz> Fri, 22 Apr 2005 00:20:59 +0200

    Make "git log" more human-friendly
    
    .. _and_ more easily parseable by scripts.
    
    This indents the comments by four spaces, making it easy to unambiguously
    grep for commit headers.
    
    It also uses a PAGER (and defaults to 'less') when the output goes to a
    tty.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 2daa3b3401b6d354b97864d0b64f5c015118a670
tree 4eb64b950dc8227cf2018797855385f282211f2e
parent a1fed04bb70b477357a857f427383c690abf6dae
author David Woodhouse <dwmw2@infradead.org> Thu, 21 Apr 2005 15:25:36 +1000
committer Petr Baudis <xpasky@machine.sinus.cz> Thu, 21 Apr 2005 23:32:00 +0200

    Added contrib/gitfeedmaillist.sh, used for feeding bk-commits-head@vger.kernel.org.

commit a1fed04bb70b477357a857f427383c690abf6dae
tree f8108673463a4872adb774e11b8aeb4e591ab841
parent d81e96bd5c02a24b43e79a80b86e297092ad9332
author Petr Baudis <pasky@ucw.cz> Thu, 21 Apr 2005 22:16:30 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Thu, 21 Apr 2005 22:16:30 +0200

    When fastforwarding, update the HEAD pointer as soon as we read-tree.

commit d81e96bd5c02a24b43e79a80b86e297092ad9332
tree a4b0c8efa40dd96212f289e3ef00f066ad232fd5
parent f7be79629a8d4359dc2c0fb6aaf5bd7b7d793c52
author Petr Baudis <pasky@ucw.cz> Thu, 21 Apr 2005 22:07:12 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Thu, 21 Apr 2005 22:07:12 +0200

    When doing git diff against local tree, make use of $GIT_INDEX_FILE
    instead of working in place of the current index.

commit f7be79629a8d4359dc2c0fb6aaf5bd7b7d793c52
tree 4a61a6ac6ffb5335605e8df1dca293e532848c87
parent ed07d3a55ef19da4c34f6e15b40d75d49bebfaf1
author Petr Baudis <pasky@ucw.cz> Thu, 21 Apr 2005 21:52:37 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Thu, 21 Apr 2005 21:52:37 +0200

    Added $PREFIX, $BINDIR and $DESTDIR make install - related variables
    to the Makefile, and make sure $BINDIR exists before installing to it.
    Inspired by all the various patches I received about this, the latest
    and best by Chris Wright <chrisw@osdl.org>.

commit ed07d3a55ef19da4c34f6e15b40d75d49bebfaf1
tree 2a48bb8a7ad3e44e928a109a02dc308e059898c9
parent 354ee54d400b9a14003f0ec0388f60a26dda3ec8
author Matthias Urlichs <smurf@smurf.noris.de> Thu, 21 Apr 2005 21:45:45 +1000
committer Petr Baudis <xpasky@machine.sinus.cz> Thu, 21 Apr 2005 21:48:34 +0200

    [PATCH] Missing quotes
    
    gitXnormid.sh should quote its cat-file calls so that nonexisting ssha1
    IDs don't result in shell errors.
    
    Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>

commit 354ee54d400b9a14003f0ec0388f60a26dda3ec8
tree 2bf065ba2975d101f514118ad57bcd0c2e876297
parent ed50572037728b5646f4d2623a65bb7464c3953e
author Petr Baudis <pasky@ucw.cz> Thu, 21 Apr 2005 21:46:41 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Thu, 21 Apr 2005 21:46:41 +0200

    Changed git export to use the new $GIT_INDEX_FILE and checkout-cache --prefix
    facilities merged recently.

commit ed50572037728b5646f4d2623a65bb7464c3953e
tree d714c328a15cb1c4c87f8bb2cf39ff986af07bbe
parent fc064479b1f04321fe8d01208d5f2ad46f9142ef
author Petr Baudis <pasky@ucw.cz> Thu, 21 Apr 2005 21:39:59 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Thu, 21 Apr 2005 21:39:59 +0200

    Do not hardcode path to bash in the scripts, use the /usr/bin/env
    wrapper instead. Inspired by Klaus Robert Suetterlin.

commit fc064479b1f04321fe8d01208d5f2ad46f9142ef
tree 90388233c5191aaf9790847b68e3a3b3a8a9215a
parent d0f758fa69f64cdb735fc5dd1288373905985a51
parent b2c007186786c39693d42d18a1e491aa2e7defce
author Petr Baudis <pasky@ucw.cz> Thu, 21 Apr 2005 21:34:15 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Thu, 21 Apr 2005 21:34:15 +0200

    Merge with rsync://www.kernel.org/pub/linux/kernel/people/torvalds/git.git
    

commit cef661fc799a3a13ffdea4a3f69f1acd295de53d
tree 690494557d393ca78f69a8569880ed4a3aeda276
parent cc1ad5c8309fbace11e3a68e3ec8ffcbded442a6
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 21 Apr 2005 12:33:22 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 21 Apr 2005 12:33:22 -0700

    Add support for alternate SHA1 library implementations.
    
    This one includes the Mozilla SHA1 implementation sent in by Edgar Toernig.
    It's dual-licenced under MPL-1.1 or GPL, so in the context of git, we
    obviously use the GPL version. 
    
    Side note: the Mozilla SHA1 implementation is about twice as fast as the
    default openssl one on my G5, but the default openssl one has optimized
    x86 assembly language on x86. So choose wisely.

commit cc1ad5c8309fbace11e3a68e3ec8ffcbded442a6
tree 5dd0a138fdc9f0da3d58eea83cd4a01526d7554e
parent b2c007186786c39693d42d18a1e491aa2e7defce
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 21 Apr 2005 12:14:46 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 21 Apr 2005 12:14:46 -0700

    Split up Makefile library list handling with separate entries for
    zlib and libssl.
    
    I'll start giving people choices here..

commit b2c007186786c39693d42d18a1e491aa2e7defce
tree f16f205c3ac0e22b6a86f7d807ac549f9fac712b
parent bb233d690a9782e1570dc93ead2bf04aaca7cfe4
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 21 Apr 2005 11:21:33 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 21 Apr 2005 11:21:33 -0700

    Include <limits.h> in commit.c for ULONG_MAX. Remove old "revision.h".
    
    The old revision.h helper header isn't used any more, but I never noticed
    it until I started grepping for ULONG_MAX users.

commit bb233d690a9782e1570dc93ead2bf04aaca7cfe4
tree fb5599a254b880afd905dcef56c639292f94b6ee
parent 65bb49144d26a10837582a99e66041035319ff91
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 21 Apr 2005 10:55:18 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 21 Apr 2005 10:55:18 -0700

    Add support for a "GIT_INDEX_FILE" environment variable.
    
    We use that to specify alternative index files, which can be useful
    if you want to (for example) generate a temporary index file to do
    some specific operation that you don't want to mess with your main
    one with.
    
    It defaults to the regular ".git/index" if it hasn't been specified.

commit 65bb49144d26a10837582a99e66041035319ff91
tree 46c126e40370987967564a7028d91c840ffc17db
parent 94dfb7f2e38fde5014fe50f9e74bde7d2d264184
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 21 Apr 2005 10:15:02 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 21 Apr 2005 10:15:02 -0700

    Add the ability to prefix something to the pathname to "checkout-cache.c"
    
    This basically makes it trivial to use checkout-cache as a "export as
    tree" function. Just read the desired tree into the index, and do a
    
    	checkout-cache --prefix=export-dir/ -a
    
    and checkout-cache will "export" the cache into the specified directory.
    
    NOTE! The final "/" is important. The exported name is literally just
    prefixed with the specified string, so you can also do something like
    
    	checkout-cache --prefix=.merged- Makefile
    
    to check out the currently cached copy of "Makefile" into the file
    ".merged-Makefile".

commit 94dfb7f2e38fde5014fe50f9e74bde7d2d264184
tree 938d695a43c5f1f7be45e80c62e965bdcffb68c5
parent c5bac17ad21c8e79fcca21c366832e75be095322
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 21 Apr 2005 09:58:24 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 21 Apr 2005 09:58:24 -0700

    Fix NSEC compile problem, and properly parse the rev-tree cmd line.
    
    The rev-tree thing just happened to work. It shouldn't have.

commit d0f758fa69f64cdb735fc5dd1288373905985a51
tree c0260bfb82da04aeff4e598ced5295d6ae2e262d
parent 52ec3fb45410fe724a3823879e85d7d926935ed0
author Petr Baudis <pasky@ucw.cz> Thu, 21 Apr 2005 09:35:46 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Thu, 21 Apr 2005 09:35:46 +0200

    When merging, feed patch only with the relevant diff lines.
    Avoids "only garbage" confusing (but harmless) error messages.

commit c5bac17ad21c8e79fcca21c366832e75be095322
tree de6864be255ba016d22ddef52cad71f35b334927
parent 80913d4364c0be4d9b97eabcd2c8acb800c647c1
author Junio C Hamano <junkio@cox.net> Wed, 20 Apr 2005 19:49:16 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 19:49:16 -0700

    [PATCH] Usage-string fixes.
    
    Usage string fixes to make maintenance easier (only one instance
    of a string to update not multiple copies).  I've spotted and
    corrected inconsistent usage text in diff-tree while doing this.
    
    Also diff-cache and read-tree usage text have been corrected to
    match their up-to-date features.  Earlier, neither "--cached"
    form of diff-cache nor "-m single-merge" form of read-tree were
    described. 
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 80913d4364c0be4d9b97eabcd2c8acb800c647c1
tree 7c1b27b76c1210b6197ac8c268c5e4d7b5ce1fac
parent 860edf7a710245ac748ada2ae3c0581a79f51f55
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 19:19:11 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 19:19:11 -0700

    Duh, just make git-export.c use the proper syntax, everything is fine.

commit 860edf7a710245ac748ada2ae3c0581a79f51f55
tree 121575fff4c32abcbf484331cd813b444f32c62b
parent 32347c375250fd470973a5d76185cac718955fd5
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 18:49:41 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 18:49:41 -0700

    Fix up some problems from the commit->tree helper patch

commit 32347c375250fd470973a5d76185cac718955fd5
tree 0c78f18ba12e18b7db1fe851b769aa881ed849f0
parent b12ec373b8ecf7de6ea37db392fde57f13c5b51c
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 18:48:27 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 18:48:27 -0700

    Fix up git-export to use the lower-level interfaces for diff generation.
    
    The high-level helpers seem to have forgotten what to do with sha1
    names.

commit b12ec373b8ecf7de6ea37db392fde57f13c5b51c
tree 9943f62d09ad2f09d855a53a8e8ab18330799810
parent 23b127ed085cbe2f853ce63b53c732a7b9e6de74
author Junio C Hamano <junkio@cox.net> Wed, 20 Apr 2005 18:06:50 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 18:06:50 -0700

    [PATCH] Teach read-tree about commit objects
    
    Updates read-tree to use read_tree_with_tree_or_commit_sha1()
    function.  The command can take either tree or commit IDs with
    this patch.
    
    The change involves a slight modification of how it recurses down
    the tree.  Earlier the caller only supplied SHA1 and the recurser
    read the object using it, but now it is the caller's responsibility
    to read the object and give it to the recurser.  This matches the
    way recursive behaviour is done in other tree- related commands.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 23b127ed085cbe2f853ce63b53c732a7b9e6de74
tree 535dc82ef2cd11594f52bf36449effe9c7cd0d8a
parent c1fdf2a6abb6a7c5b8092d72514264ae378d60ee
author Junio C Hamano <junkio@cox.net> Wed, 20 Apr 2005 18:06:50 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 18:06:50 -0700

    [PATCH] Teach ls-tree about commit objects
    
    Updates ls-tree.c to use read_tree_with_tree_or_commit_sha1()
    function.  The command can take either tree or commit IDs with
    this patch.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit c1fdf2a6abb6a7c5b8092d72514264ae378d60ee
tree d32447a96642a513e7ba83d8c88d86a33061db78
parent 38357e6703db9f2c1bff31de1ce7c7503c6db96a
author Junio C Hamano <junkio@cox.net> Wed, 20 Apr 2005 18:06:50 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 18:06:50 -0700

    [PATCH] Teach diff-tree about commit objects
    
    Updates diff-tree.c to use read_tree_with_tree_or_commit_sha1()
    function.  The command can take either tree or commit IDs with this patch.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 38357e6703db9f2c1bff31de1ce7c7503c6db96a
tree 122ad8b85c7e34ffbb897b0e9f6b1ad348f53cb8
parent f4913f91a960ebcfbc9c6a09dc909ce638cb5c66
author Junio C Hamano <junkio@cox.net> Wed, 20 Apr 2005 18:06:49 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 18:06:49 -0700

    [PATCH] Teach diff-cache about commit objects
    
    Updates diff-cache.c to use read_tree_with_tree_or_commit_sha1()
    function.  The end-user visible result is the same --- the command
    takes either tree or commit ID.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit f4913f91a960ebcfbc9c6a09dc909ce638cb5c66
tree fcfb33f86882e0cf1d7b0ef7e0d3285cf286ebb6
parent 6ca25ed331c57576a82c83f43040f4071671b1a7
author Junio C Hamano <junkio@cox.net> Wed, 20 Apr 2005 18:06:49 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 18:06:49 -0700

    [PATCH] Accept commit in some places when tree is needed.
    
    This patch implements read_tree_with_tree_or_commit_sha1(),
    which can be used when you are interested in reading an unpacked
    raw tree data but you do not know nor care if the SHA1 you
    obtained your user is a tree ID or a commit ID.  Before this
    function's introduction, you would have called read_sha1_file(),
    examined its type, parsed it to call read_sha1_file() again if
    it is a commit, and verified that the resulting object is a
    tree.  Instead, this function does that for you.  It returns
    NULL if the given SHA1 is not either a tree or a commit.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 52ec3fb45410fe724a3823879e85d7d926935ed0
tree 6efe4bd129e74641155478f89034fca034aaa180
parent 83f56c20da050ed45a11f49294b9618e70a82b3f
author Petr Baudis <pasky@ucw.cz> Thu, 21 Apr 2005 01:27:00 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Thu, 21 Apr 2005 01:27:00 +0200

    Removed compatibility hacks from git. The whole thing went under
    so big compatibility breakage lately that you would have big
    trouble upgrading from such old versions anyway.

commit 83f56c20da050ed45a11f49294b9618e70a82b3f
tree 3098669577fc568c852aba02c6d8f3eac2f8453a
parent 84ab9ba6956687958357d6ce72b7c58f6182a0ec
author David Greaves <david@dgreaves.com> Wed, 20 Apr 2005 17:08:29 +0100
committer Petr Baudis <xpasky@machine.sinus.cz> Thu, 21 Apr 2005 01:23:12 +0200

    README.reference which starts some reference documentation of the "core git"
    commands.
    
    Signed-off-by: David Greaves <david@dgreaves.com>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 84ab9ba6956687958357d6ce72b7c58f6182a0ec
tree 2e1f16579fdcd9cd5d242f53a3cfaad52ac5d207
parent b21cee2236b494787204754960d6a5d2916dfeb4
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 23:14:45 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 23:14:45 +0200

    git cancel now can undo seeks properly.

commit 6ca25ed331c57576a82c83f43040f4071671b1a7
tree 3ef49665799151ced5e03ae1d544b1d67a6b7e5b
parent 2dee0609685a0a01d7fd65e6a804363c3514087c
author Andre Noll <maan@systemlinux.org> Wed, 20 Apr 2005 13:10:13 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 13:10:13 -0700

    [PATCH] simplify Makefile
    
    Use a generic rule for executables that depend only on the corresponding
    .o and on $(LIB_FILE).
    
    Signed-Off-By: Andre Noll <maan@systemlinux.org>
    Signed-Off-By: Linus Torvalds <torvalds@osdl.org>

commit b21cee2236b494787204754960d6a5d2916dfeb4
tree f29be8140c5f1175052ec96ad2fa2b2901fd6ba5
parent 4184f13a1d91760063b67b2ba8ae75b7721cd079
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 22:03:40 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 22:03:40 +0200

    git-pasky-0.6.2

commit 4184f13a1d91760063b67b2ba8ae75b7721cd079
tree 2ec0f8abb0fb3eb96ffb78032273f0d1ab432ecd
parent 1690697813ffcfc35075859534a627699d07c613
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 22:03:00 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 22:03:00 +0200

    Add gitmerge-file.sh to the list of scripts in Makefile, so that
    it gets installed. Unwillingly pointed out by Ingo Molnar. ;-)

commit 2dee0609685a0a01d7fd65e6a804363c3514087c
tree 7f621eae988378ee776c040a5856e873e41691e1
parent ca9be05421ff3b641182ab4063c7c3ac834750b5
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 13:00:08 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 13:00:08 -0700

    Improve build: add <unistd.h> and use -O2 instead of -O3
    
    (Nobody should use -O3. It just makes bad inlining decisions).

commit 1690697813ffcfc35075859534a627699d07c613
tree 6dd9510c9938af9781e4f8daee6b170cd27a4a91
parent c041a76603aaedc5bcf81a2a90a1e088f813f2b4
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 21:54:20 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 21:54:20 +0200

    git-pasky-0.6.1

commit c041a76603aaedc5bcf81a2a90a1e088f813f2b4
tree a85701f50375be2eb3654aa8dfefb9430f35bcb8
parent 6e8a4dfb0419ed263313a8cf513272d8b4e03de7
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 21:53:55 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 21:53:55 +0200

    Pass rsync -v by default when pulling stuff, so that the user
    has better feedback on what transfer is going on.

commit 6e8a4dfb0419ed263313a8cf513272d8b4e03de7
tree 4b948ff17100e4d877383b7baa7a6ad3e42b0990
parent b498dafca4dcc136294853d1de09fb64b0b0deea
parent ca9be05421ff3b641182ab4063c7c3ac834750b5
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 21:50:40 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 21:50:40 +0200

    Merge with rsync://www.kernel.org/pub/linux/kernel/people/torvalds/git.git
    
    This brings an incompatibility-causing optimization w.r.t. the index file.
    You will need to rebuild it.

commit b498dafca4dcc136294853d1de09fb64b0b0deea
tree 3a946944463ee49d710b51bb61547bd531ed13f4
parent fe455afee12cc05df1952320b2b75ebc11570400
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 21:46:10 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 21:46:10 +0200

    git-pasky-0.6

commit ca9be05421ff3b641182ab4063c7c3ac834750b5
tree a914778424d080e5ddb481685fa18eb301dc2cfe
parent 4990aadc4cbb872cb71acdc0ca842eacb86f1362
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 12:36:41 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 12:36:41 -0700

    Make the sha1 of the index file go at the very end of the file.
    
    This allows us to both calculate it and verify it faster.

commit fe455afee12cc05df1952320b2b75ebc11570400
tree 52054eb7bf22e0fb17d33143269540c61554489a
parent be98b7b0ec2f971081772cf56b902a9bac04dc34
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 21:23:38 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 21:23:38 +0200

    Don't do read-tree -m in case of conflicts during git merge,
    since read-tree will refuse to merge with index containing
    unmerged entries.

commit be98b7b0ec2f971081772cf56b902a9bac04dc34
tree 3079317d123c568af0dc18f6bce12432ec16b5ec
parent f8a468cfca96ff79d3ad805c824374b045610409
parent 706bc531a19f268bb03dda7551929dee20172548
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 21:22:51 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 21:22:51 +0200

    Merge with rsync://www.kernel.org/pub/linux/kernel/people/torvalds/git.git
    

commit 4990aadc4cbb872cb71acdc0ca842eacb86f1362
tree 9c4a0f2062b0d544fc86d70bff41cae84a574499
parent 706bc531a19f268bb03dda7551929dee20172548
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 12:16:57 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 12:16:57 -0700

    Speed up index file writing by chunking it nicely.
    
    No point in making 17,000 small writes when you can make just
    a couple of hundred nice 8kB writes instead and save a lot
    of time.

commit f8a468cfca96ff79d3ad805c824374b045610409
tree 80353eef073bbdea3e675950522460ac81939aba
parent 24ae83649970f1ac3511cc8e29b526e58e965571
parent f18ca7316631914776136455c151d70318299459
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 21:06:10 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 21:06:10 +0200

    Merge with rsync://www.kernel.org/pub/linux/kernel/people/torvalds/git.git
    
    Big changes. Change of SHA1 summing to go over uncompressed contents
    (the objects database had to be converted). Also diff-cache which will
    be certainly useful for going away from the add/rm queues for git-pasky.

commit 706bc531a19f268bb03dda7551929dee20172548
tree 5ba25f0b0b6fb25a61426bed1de7b903d4e0f834
parent f18ca7316631914776136455c151d70318299459
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 09:28:05 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 09:28:05 -0700

    Make "write_sha1_file()" exit early if the file already exists.
    
    Avoid the compression.

commit f18ca7316631914776136455c151d70318299459
tree 44fe67f62fc692e499873e65cc1fac5dfb7abe9f
parent d98b46f8d9a3daf965a39f8c0089c1401e0081ee
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 01:34:54 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 01:34:54 -0700

    The recent hash/compression switch-over missed the blob creation.
    
    Happily, convert-cache just magically fixes all errors.

commit d98b46f8d9a3daf965a39f8c0089c1401e0081ee
tree 765ea3ef9d7d57d29a38d4c1d1ddc4be17554936
parent cb126d8d7906b3c15f313ca479259e567042840a
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 01:10:46 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 20 Apr 2005 01:10:46 -0700

    Do SHA1 hash _before_ compression.
    
    And add a "convert-cache" program to convert from old-style
    to new-style.

commit cb126d8d7906b3c15f313ca479259e567042840a
tree 1fe1cce0c6d0d4469d4a964b699c56d183ae915d
parent addb315d341437b11477d617fda3fd80e7bce3c1
author Zach Welch <zw@superlucidity.net> Tue, 19 Apr 2005 21:48:15 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 19 Apr 2005 21:48:15 -0700

    [PATCH] init-db.c: create and use safe_create_dir helper
    
    Factor mkdir calls into common safe_create_dir subroutine.
    
    Signed-Off-By: Zach Welch <zw@superlucidity.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit addb315d341437b11477d617fda3fd80e7bce3c1
tree 42370b18ee4f3afa9ac52526bf2b2006213685ed
parent 4696cb93d1e2ded452e4e673633fd6495698ffcd
author Zach Welch <zw@superlucidity.net> Tue, 19 Apr 2005 21:48:15 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 19 Apr 2005 21:48:15 -0700

    [PATCH] init-db.c: normalize env var handling.
    
    Normalize init-db environment variable handling, allowing the creation
    of object directories with something other than DEFAULT_DB_ENVIRONMENT.
    
    Signed-Off-By: Zach Welch <zw@superlucidity.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 4696cb93d1e2ded452e4e673633fd6495698ffcd
tree ee0d48387f2a8fa38e0b250ef91106b537714d52
parent abdb007d1f0ee1579c3719fc4fadbe4755163d74
author Zach Welch <zw@superlucidity.net> Tue, 19 Apr 2005 21:48:15 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 19 Apr 2005 21:48:15 -0700

    [PATCH] init-db.c: cleanup comments
    
    Consolidate comments at top of main.
    
    Signed-Off-By: Zach Welch <zw@superlucidity.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit abdb007d1f0ee1579c3719fc4fadbe4755163d74
tree d73f1dd6dcd5bf2a5526593e5cc8202929549cf0
parent e74f8f6aa7807d479d78bfc680a18a9a5198b172
author Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 19 Apr 2005 21:39:28 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 19 Apr 2005 21:39:28 -0700

    Make "diff-tree" take commit objects too, like "diff-cache" does.
    
    Sometimes it's just easier to not have to look up the "commit"->"tree"
    translation by hand first. It's trivial to do inside diff-tree, and
    it's just being polite.

commit e74f8f6aa7807d479d78bfc680a18a9a5198b172
tree 35c57efa419ba3cf2b49c454e8e8bca30624c481
parent b96afa59ebfd2c0902e2fd2653e29f291bf0cac7
author Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 19 Apr 2005 21:00:09 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 19 Apr 2005 21:00:09 -0700

    Add "diff-cache" helper program to compare a tree (or commit) with
    the current cache state and/or working directory.
    
    Very useful to see what has changed since the last commit, either in
    the index file or in the whole working directory.
    
    Also very possibly very buggy. Matching the two up is not entirely
    trivial.

commit 24ae83649970f1ac3511cc8e29b526e58e965571
tree a4faf941565a72b38eecbcbc5a91eccca312d26b
parent 9d78982cea560bb4dae8837137fefa65034db18f
parent b96afa59ebfd2c0902e2fd2653e29f291bf0cac7
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 01:03:16 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 01:03:16 +0200

    Merge with rsync://www.kernel.org/pub/linux/kernel/people/torvalds/git.git
    

commit 9d78982cea560bb4dae8837137fefa65034db18f
tree 94779da6e8bf4ee89c1659c05e94b2f8bf3cb855
parent 0089cdc33ce99d605625ca3e6bf688a983ebe857
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 00:56:23 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 00:56:23 +0200

    Oops, fixed git merge's fastforward, the local changes patch was
    applied with wrong -p.

commit 0089cdc33ce99d605625ca3e6bf688a983ebe857
tree 57fb260650b1b2cbbf5946d497855e11155bc2df
parent 216a3002e3afdd82000f97bf1f0a6bca2a272f8b
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 00:55:15 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 00:55:15 +0200

    Fixed git merge's fast-forward to use patch for applying the
    local changes rather than the fast-forward; this should result
    in much better performance.
    
    Suggested by Junio C Hamano.

commit b96afa59ebfd2c0902e2fd2653e29f291bf0cac7
tree 3d6e94ab9fe04737d6ad70e788c031ba551595c9
parent 17cf781661e6d38f737f15f53ab552f1e95960d7
author Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 19 Apr 2005 15:46:06 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 19 Apr 2005 15:46:06 -0700

    Make us be better at guessing a good hostname for the email.
    
    It's still just a guess, and the result is not a real email
    address anyway. If you want to, you can use COMMIT_AUTHOR_EMAIL
    to correct for any git guesses.

commit 216a3002e3afdd82000f97bf1f0a6bca2a272f8b
tree 2fd0ba4fd549f680208da9f04c16e2dfe051c036
parent 38f9e14312820d0a4ad28efc57c009efd4290fa2
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 00:28:36 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 00:28:36 +0200

    Fixed a bug in processing add/rm queues near git diff | git apply.

commit 38f9e14312820d0a4ad28efc57c009efd4290fa2
tree ffbba961094cbf35b2dd1b423a66b8058490b77f
parent 5cae6277303977468ebad05bfdd58462ca31b560
author Petr Baudis <pasky@ucw.cz> Wed, 20 Apr 2005 00:22:09 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Wed, 20 Apr 2005 00:22:09 +0200

    read-tree in git merge is now called with -m to do the "one-way merge".
    This should save us extraordinary amounts of time spent updating cache
    afterwards.

commit 5cae6277303977468ebad05bfdd58462ca31b560
tree 44dc37f74e9d82cc881d60102f7a7d208c6cd0b6
parent e36d378c5e7e7b4cf85511d45088f455904813be
parent 17cf781661e6d38f737f15f53ab552f1e95960d7
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 23:46:05 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 19 Apr 2005 23:46:05 +0200

    Merge with rsync://www.kernel.org/pub/linux/kernel/people/torvalds/git.git
    
    This adds mainly read-tree -m.

commit 17cf781661e6d38f737f15f53ab552f1e95960d7
tree 4a44f336e0c93ed650f228939a708258b5d4b222
parent c9823a427a0a7aabc4f840a90e82548e91f9bdd6
author Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 14:11:06 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 14:11:06 -0700

    Remove duplicate getenv(DB_ENVIRONMENT) call
    
    Noted by Tony Luck.

commit e36d378c5e7e7b4cf85511d45088f455904813be
tree 957e4b64109855bc81e815622a14949289778db8
parent 0d245b5e16af69c6a1c10c080c173053ce6bcbb1
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 23:08:46 +0200
committer Petr Baudis <xpasky@machine.sinus.cz> Tue, 19 Apr 2005 23:08:46 +0200

    Redirect tag rsync stderr to /dev/null since it is not required
    to be present on the remote side and it kept confusing people.

commit c9823a427a0a7aabc4f840a90e82548e91f9bdd6
tree 2e576d757af633d75c8df6340e28266e7a010714
parent 7fa6b4e7692926d2d07adee1ef8e277157929058
author Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 14:00:34 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 14:00:34 -0700

    Add stupid "git export" thing, which can export a git archive
    as a set of patches and commentary.
    
    You'd want something like this if you are tracking a git archive
    in another SCM format. Notably, we want something like that for
    BK users.

commit 7fa6b4e7692926d2d07adee1ef8e277157929058
tree 83757dc3185ab31cf3e12c0a67ec191c47e0a478
parent 8ccfbf3279b07028035aeb58baed5c4a79b63567
author Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 13:59:17 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 13:59:17 -0700

    Fix init-db shared database case
    
    Noted by Aaron Straus

commit 8ccfbf3279b07028035aeb58baed5c4a79b63567
tree 79c21a1f0b5ac1eab8ac9044564468048f320fd6
parent a3a65234dba0f90a0b8e06fa7b5f269fe5126761
author Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 12:56:47 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 12:56:47 -0700

    Update "git-pull-script" to use "read-tree -m" for
    reading a single tree too. That should speed up a
    trivial merge noticeably.
    
    Also, don't bother reading back the tree we just wrote
    when we committed a real merge. It had better be the
    same one we still have..

commit 0d245b5e16af69c6a1c10c080c173053ce6bcbb1
tree 20be5f2d8af2f8ecca94d4ac56512f23c6f1a7c6
parent 6e73d20a287859d4242d7fef23d94bd414d2cb69
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 21:39:20 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 21:39:20 +0200

    Mention that git patch can take commit id optionally.

commit 6e73d20a287859d4242d7fef23d94bd414d2cb69
tree cd7651b7afe8bb7b0e38c7211a7a9a85596d5634
parent 4babf1240973d9b978329b2c67f146a3d6007fab
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 21:38:54 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 21:38:54 +0200

    Add commit line to git patch output.

commit a3a65234dba0f90a0b8e06fa7b5f269fe5126761
tree 7315346f212d77d19f8c7c2fc82c5beda21e4a95
parent ca016f0e4e7e508407fe17e121fcd520fbb7c865
author Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 11:41:18 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 11:41:18 -0700

    Make "read-tree" know how to do a "1-way merge".
    
    This one just reads one tree, but picks up any matching stat information
    from the old index.

commit ca016f0e4e7e508407fe17e121fcd520fbb7c865
tree c5404b84a8df1badc32da2ba364f0485f4258e61
parent 4aaef1064a1091ec38ab6adc823f26b82cf4998d
author Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 11:16:12 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 11:16:12 -0700

    Make "read-tree" take the 'stat' information for a merge result from the
    old index state if the result matches.
    
    This leaves the stat information in the result tree for any trivial
    merges, which is just the way we like it.

commit 4babf1240973d9b978329b2c67f146a3d6007fab
tree 34486fd28b7d5d8a7ff7cde788aaf5a00559c62f
parent a48aea97d9d2974a850de1893ac68162c77bbdc4
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 20:15:54 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 20:15:54 +0200

    When merging, use the URI of the branch you are merging with,
    or at least the identifier passed to git merge by the user.

commit a48aea97d9d2974a850de1893ac68162c77bbdc4
tree 14662ad49526802c90a146e25d8f4d648383c175
parent 28f51a8189f1e7aa2c971c42dd1f67f7de85786b
parent 4aaef1064a1091ec38ab6adc823f26b82cf4998d
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 20:07:16 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 20:07:16 +0200

    Merging: 125df35311b14dce522a6be95469c5608d72e830
    
    Merge with Linus.

commit 28f51a8189f1e7aa2c971c42dd1f67f7de85786b
tree 630a1d044e8e67ffabe0a77d9c1715e5efa80cca
parent 1cf8b43679b6fba5575640c6738f34771960ee5a
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 20:04:02 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 20:04:02 +0200

    Make git diff of working tree backup the "good" cache before
    overwriting it by cache of another tree, so that we save one
    useless read-tree && update-cache.

commit 1cf8b43679b6fba5575640c6738f34771960ee5a
tree 2dd788ccf6bf6cb1100ff0a6a2a958caa7f59800
parent 9b1151e0e13dd02a0c21fd32dc2823fc99c4e0a3
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 20:02:02 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 20:02:02 +0200

    Trivial comment fix in git rm. Spotted by David A. Wheeler.

commit 9b1151e0e13dd02a0c21fd32dc2823fc99c4e0a3
tree af22152a52a76ac4e34e458723596061c25316f2
parent 99c8a696c2d639a22f3ba491bd56600d9db3179c
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 19:49:56 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 19:49:56 +0200

    Add a git patch command, which will export a given commit  in
    a patchy format (commit description and diff against first parent).
    Inspired by Ingo Molnar.

commit 99c8a696c2d639a22f3ba491bd56600d9db3179c
tree 94b102d6e8b4f01078a88e045d60ea32adbba0cc
parent a1cc4ba97f3012e2efa17088fe93229cbc187c75
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 19:46:08 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 19:46:08 +0200

    git apply called in git merge and git seek now does not affect
    add/rm queues since we read-tree anyway, which will reflect
    those changes, and we don't thus need to care.

commit 4aaef1064a1091ec38ab6adc823f26b82cf4998d
tree 2cc561c8cd57aefc641f5ff8b5719377b08763ad
parent 3b7d368f34715003c834233d9f23456bcb62b44a
author Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 09:53:58 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 09:53:58 -0700

    Make git-pull-script do the right thing for symlinked HEAD's.
    
    Also exit gracefully if the HEAD pull failed, rather than use
    a possibly stale MERGE_HEAD.

commit 3b7d368f34715003c834233d9f23456bcb62b44a
tree c3963ca87888c3957622af0558c62e519fdd3b70
parent 0a9ea850005de0fb74b6288d281eb0417e869b00
author Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 09:52:24 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Tue, 19 Apr 2005 09:52:24 -0700

    Don't parse commit objects more than once.
    
    Yes, the "parse_commit()" already checks for this condition, but
    we need to check for it in rev-tree too, so that we don't start
    walking the parent chain unnecessarily.

commit a1cc4ba97f3012e2efa17088fe93229cbc187c75
tree 9145245df5460e586d5bcb10ce1d556db14184d2
parent 39bd83cc9fafe0d89eac33cddb1ca84fbc31f7cf
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 11:30:09 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 11:30:09 +0200

    Fixed fgrep invocations; we want to match only complete lines.

commit 39bd83cc9fafe0d89eac33cddb1ca84fbc31f7cf
tree 4f2c6a25061bceddcfb3917d744048a6005de30d
parent cd55ecce4c7f9169a71fccd687ec7b2502ce613c
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 10:31:26 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 10:31:26 +0200

    Added -c (careful, no-commit) switch for git merge, which will
    prevent it to automatically commit the changes but lets the user
    review them and commit them always manually.

commit cd55ecce4c7f9169a71fccd687ec7b2502ce613c
tree 95219c04b1fd666f139a5ec321f448f283bf695a
parent 8cdd26846917337bd756e5aace3a849421a562b5
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 10:14:31 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 10:14:31 +0200

    Do not pass git merge -b $orig_head in git pull but rather gamble
    on merge-base. Also don't die if git merge does not succeed; the
    user will likely just resolve conflicts.

commit 8cdd26846917337bd756e5aace3a849421a562b5
tree 331f46c50b068915678f19cbd750a5655315a916
parent 09fb143680d2ef7cf03d4e05361c488c066edb67
parent 0a9ea850005de0fb74b6288d281eb0417e869b00
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 05:34:39 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 05:34:39 +0200

    Merging: 5b53d3a08d64198d26d4f2323f235790c04aeaab
    
    Merge with Linus. Mainly Greg KH's committer specification support.

commit 09fb143680d2ef7cf03d4e05361c488c066edb67
tree 12d76c5da75a8b6bdcdbaa5d012e1002f574ba39
parent a4b8c7e81d1c932f437b0f1835acf3d9fafcf5c9
parent 8c1becff243aeeec455eeabe513fa180631be83c
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 05:29:08 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 05:29:08 +0200

    Merging: 555d3cfec558e6f88f6554310c52766b5c7e238d
    
    Merge with Linus.

commit a4b8c7e81d1c932f437b0f1835acf3d9fafcf5c9
tree d662dbb72f369ef7ecdb76501f9894ce5c2a3b3b
parent 2fcdbe22cae0fa9293c167c62fd1c17c91ad586b
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 05:28:30 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 05:28:30 +0200

    Fixed merging branch which adds a file in new directory.
    Pointed out by James Bottomley <James.Bottomley@SteelEye.com>.

commit 2fcdbe22cae0fa9293c167c62fd1c17c91ad586b
tree 8459392b2f0403794a096b4147bc2407f4fe2976
parent 03956ae82b4c1d780eefb7b893eff6a005e41fa2
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 05:26:28 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 05:26:28 +0200

    Refuse to do "empty merges".

commit 03956ae82b4c1d780eefb7b893eff6a005e41fa2
tree 23e1ed5b8d99ff8355bb60f28b19ac53eb4f0a4b
parent a131f995d5b8358c59623d3bac68c29fc5a409fb
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 05:25:25 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 05:25:25 +0200

    git merge now makes use of the core git's merging capabilities,
    calling gitmerge-file.sh (tweaked clone of git-merge-one-file-script)
    for each file to merge it properly.
    
    git commit now takes -C argument which tells it to leave the
    index alone and just commit the thing. (git merge sets the cache
    up appropriately.)

commit 0a9ea850005de0fb74b6288d281eb0417e869b00
tree 8448ea54267e04be5961bb3a41b6361eb15a2771
parent b70070f0208be5d5d7b7a3b259e7ff3da19307d0
author James Bottomley <James.Bottomley@SteelEye.com> Mon, 18 Apr 2005 19:55:19 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org.(none)> Mon, 18 Apr 2005 19:55:19 -0700

    [PATCH] SCSI trees, merges and git status
    
    Doing the latest SCSI merge exposed two bugs in your merge script:
    
    1) It doesn't like a completely new directory (the misc tree contains a
       new drivers/scsi/lpfc)
    2) the merge testing logic is wrong.  You only want to exit 1 if the
       merge fails. 
    

commit a131f995d5b8358c59623d3bac68c29fc5a409fb
tree 1e9ff49600e564e746e4cfcc2c04308416347afb
parent d3215bb12a9a9dcf69eb37b82960e5db50e2d70b
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 04:16:15 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 04:16:15 +0200

    Make merge-cache not fail immediatelly when the merge program
    fails, but go on and return error code at the end. It makes sense
    to try to merge everything, then let the user solve the commits
    at once.

commit d3215bb12a9a9dcf69eb37b82960e5db50e2d70b
tree fdca1fb1b89185e6a5a4145b228e4afa0a2f4bd1
parent 7f02d9e7eccc4d735da4222f67f22bbf2c62028d
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 04:07:26 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 04:07:26 +0200

    Oops, make git-merge-one-file-script fail on conflicts.

commit 7f02d9e7eccc4d735da4222f67f22bbf2c62028d
tree a7588a8dfb16ffdbd6bb1e9d37b6fc8442c4f3a7
parent 951ce90b88b1d0f7bbe7d3faf528e0f8c086c93f
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 04:06:34 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 04:06:34 +0200

    Make the git-merge-one-file-script not fail so horribly to set
    sensible permissions on the new/merged files.

commit 951ce90b88b1d0f7bbe7d3faf528e0f8c086c93f
tree 1866cd4b74164c2ee57fd00f82562344fd044185
parent 1d9957cd45c9984182b0fcb9316a50f436e26245
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 03:55:45 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 03:55:45 +0200

    Make git-merge-one-file-script cleanup its temporary files properly.
    Also even file with conflicts is written over the original one.

commit 1d9957cd45c9984182b0fcb9316a50f436e26245
tree 6bacb3cbecd26500143a3578bbc8042fbebfc0f9
parent 0713abda62daacf2e268421f3e067f2bf615050a
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 03:47:38 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 03:47:38 +0200

    Added Linus' (c) to git-merge-one-file-script, and tiny comment update.

commit 0713abda62daacf2e268421f3e067f2bf615050a
tree b9c66febf52b9917f3f9e7b2e924b8871763c1a3
parent 45a514889c9aa2ba6275e9254b069593c830a315
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 03:42:11 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 03:42:11 +0200

    Make git-merge-one-file-script be vocal about failed update-cache --add
    when doing real merge.

commit 45a514889c9aa2ba6275e9254b069593c830a315
tree cbdfc65b900a93c84a482a47d80b497e45a13732
parent 39c1ae5dfd229fb87c723fcf9737f29a506a31f9
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 03:03:52 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 03:03:52 +0200

    Fix git-merge-one-file-script's automerge.

commit 39c1ae5dfd229fb87c723fcf9737f29a506a31f9
tree 2628d051026d62616ea2f30708528ff8fc309005
parent f9f95f7695f6541cd451128d288f356018b295db
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 02:42:08 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 02:42:08 +0200

    git merge will refuse to merge if you have local changes in your tree.

commit b70070f0208be5d5d7b7a3b259e7ff3da19307d0
tree 84e34067e4199de4d4cae90234daa9db59819944
parent f43b8abc6f051aece327a3779e903106916d6e67
author Greg KH <greg@kroah.com> Mon, 18 Apr 2005 17:37:32 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 17:37:32 -0700

    [PATCH] provide better committer information to commit-tree.c
    
    Here's a small patch to commit-tree.c that does two things:
    	- allows the committer email address and name to be overridden
    	  by environment variables (if you don't like the environment
    	  variable names I've used (COMMIT_AUTHOR_NAME,
    	  COMMIT_AUTHOR_EMAIL), feel free to change them.)
    	- provide the proper domainname to the author/committer email
    	  address (otherwise, my address was only showing up as from the
    	  hostname.)
    
    This allows people to set sane values for the commit names and email
    addresses, preventing odd, private hostnames and domains from being
    exposed to the world.
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    

commit f9f95f7695f6541cd451128d288f356018b295db
tree 40b6f472ba0b50c559cbc943818a6b44e9398235
parent b413732b1c5cf6004facb25bb365250576e0f82c
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 02:35:45 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 02:35:45 +0200

    Reworked and drastically simplified git merge, git commit and
    git cancel by dropping support for out-of-tree merges. Linus
    does not want them anymore, thankfully.

commit f43b8abc6f051aece327a3779e903106916d6e67
tree 5ef160373f4938c08184a1e38868c0c2e3c9823f
parent 8c1becff243aeeec455eeabe513fa180631be83c
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 17:35:31 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 17:35:31 -0700

    Make fsck-cache print the object type for unreachable objects.
    
    This got lost when I updated to Daniel's new object model.

commit b413732b1c5cf6004facb25bb365250576e0f82c
tree 754c866b792cd924fce25931056f9d16fc20209d
parent 58756a8f5403a0b2a16b23f3b628316d8f4b6158
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 02:15:42 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 02:15:42 +0200

    Fix git apply so that it only git add's and git rm's files which
    need it. Hopefully.

commit 58756a8f5403a0b2a16b23f3b628316d8f4b6158
tree c0dcbf07a798d3ac0f34b3a6d69bd610969b6df7
parent 36361978dea6743abcb6ed7a834f26de0737038d
author David Greaves <david@dgreaves.com> Mon, 18 Apr 2005 22:18:07 +0100
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 01:56:08 +0200

    Fixed git status missing out some added/removed files on some systems.
    
    Signed-off-by: David Greaves <david@dgreaves.com>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 36361978dea6743abcb6ed7a834f26de0737038d
tree e58349707807bca9f6efb96afc9ce3c5529826f6
parent 566557eb2a1c564f13612334edbd6e3aabef1b68
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 01:51:53 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 01:51:53 +0200

    git diff now properly diffs git add/git rm'd files.

commit 8c1becff243aeeec455eeabe513fa180631be83c
tree 6b377f54eff82fc1541b1dcbe9abd9447fd73423
parent 0ffb0bcaf6ab6277527f6ac8623632a9de55114d
author Junio C Hamano <junkio@cox.net> Mon, 18 Apr 2005 16:51:09 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 16:51:09 -0700

    [PATCH] show-diff: Remove stale comments
    
    Patch 1/6 in the series has already cleaned the interface to
    call sq_expand(), but the comment before that function still
    carries the stale interface warning.  Remove it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 0ffb0bcaf6ab6277527f6ac8623632a9de55114d
tree 94f78c7ef426cabf0198428e501ad304834815c2
parent 4789576e0e5364dcd3916ef583b2ea61bef23f24
author Junio C Hamano <junkio@cox.net> Mon, 18 Apr 2005 16:49:21 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 16:49:21 -0700

    [PATCH] Do not let rsync obliterate .git/object symbolic link.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 566557eb2a1c564f13612334edbd6e3aabef1b68
tree 3ca288f3843406aaadf03529b9b92c35a4c1a554
parent d670fe0ed46a401ac9c8bf6bb770395b39699942
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 01:36:39 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 01:36:39 +0200

    git diff now complains and returns error code if it was passed
    an explicit file list and couldn't have diffed any of the files
    passed.

commit d670fe0ed46a401ac9c8bf6bb770395b39699942
tree e39cb42f695d0fa47467067370c3d0cdefbade9d
parent 9272a7c1713d7b6d71eb5f57e289530ee2ad536d
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 01:35:07 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 01:35:07 +0200

    show-diff now returns error code when it had arguments passed
    explicitly and failed to match any of them.

commit 9272a7c1713d7b6d71eb5f57e289530ee2ad536d
tree 39d503c4f035e9b6b54242734595962298587244
parent e107eaa69c506e6fc7124e0705d80a37d7ff0e5e
author Aaron Straus <aaron@merfinllc.com> Mon, 18 Apr 2005 15:14:35 -0700
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 01:22:20 +0200

    [PATCH] trivial fix for init-db
    
    This makes init-db work for common object database.
    
    Signed-Off-By: Aaron Straus <aaron@merfinllc.com>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit e107eaa69c506e6fc7124e0705d80a37d7ff0e5e
tree 9fda4f001ee603fbf358331c97d4622b1d4b53c9
parent 0faec06c3057a3b8aef964c31f093aca55e382e1
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 01:17:57 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 01:17:57 +0200

    Fix git apply's handling of removal of filenames starting with a dash.

commit 0faec06c3057a3b8aef964c31f093aca55e382e1
tree bffacc18b98347aa9131d01fad25a6fcc94d6b1c
parent d9600d1d8f6b6c7874eeda7062cba21e895a9a70
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 01:13:26 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 01:13:26 +0200

    git merge saves the merge base to .git/merge-base. Mostly useful
    for the user, actually. ;-)

commit d9600d1d8f6b6c7874eeda7062cba21e895a9a70
tree 04cf2b524a6880f2753544427db0947e7320f3a4
parent d9a4320ca3c3e2914fb761c48ecd3ce24e4ca47a
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 01:04:39 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 01:04:39 +0200

    Make show-diff -z output really regular, and do not make it imply
    -s implicitly - program can specify that, shall it wish so.

commit d9a4320ca3c3e2914fb761c48ecd3ce24e4ca47a
tree 579718a76c24f7f7cbf01858a692538be711d41b
parent 0ec59a771ff9d618a1b86e0cc1b93e3d9dad17a9
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 00:42:10 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 00:42:10 +0200

    Fix trivial typo in git status, noted by Sebastian Kuzminsky <seb@highlab.com>.

commit 0ec59a771ff9d618a1b86e0cc1b93e3d9dad17a9
tree 76a451572f5a69cf1a7cac73965e3046c2378a94
parent 166f90065dae3bdb81a2dcf8b8901acb50876e81
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 00:17:40 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 00:17:40 +0200

    git-pasky-0.5

commit 166f90065dae3bdb81a2dcf8b8901acb50876e81
tree 43464110eda175e5021a84a710861161b1e7aafc
parent 9c30bf6ce6b7c8b295eed09d5dc738169a5d027b
parent 4789576e0e5364dcd3916ef583b2ea61bef23f24
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 00:16:03 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 00:16:03 +0200

    Merging: 377d47bbdf17a05975edb48f22932825102802a1
    
    Merge with Linus. Mainly cool show-diff updates by Junio.

commit 9c30bf6ce6b7c8b295eed09d5dc738169a5d027b
tree d1f4417087bfbc5193418731289e633bff32559e
parent 0572d0834c6db9879905c7d12625edc7d783fc10
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 00:08:57 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 00:08:57 +0200

    At least briefly touch some of the new commands (git status, git init, etc).

commit 4789576e0e5364dcd3916ef583b2ea61bef23f24
tree ebab4df7bc88e09c770bcbafe3a4c0b3cec74fc3
parent ff69ab9ad87d839e381b1e4abfe45032d18bada7
author Junio C Hamano <junkio@cox.net> Mon, 18 Apr 2005 15:07:24 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 15:07:24 -0700

    [PATCH] show-diff.c: -R option for reverse diff.
    
    This adds -R option to obtain reverse diff.
    
    It may be useful in the merge workflow.  After the base of the working
    directory is merged and commited, in the working directory:
    
        $ read-tree <tree-id-of-merged-tree>
        $ show-diff -R
    
    to re-validate if upstream changes make sense, and/or revert or
    conflict with local changes you have in the working files.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit ff69ab9ad87d839e381b1e4abfe45032d18bada7
tree 8c335c69f5f8fdf31f5f863643de0e30bd352ac4
parent 5a6ad74623571a1479af7914ec16783a9566e4b2
author Junio C Hamano <junkio@cox.net> Mon, 18 Apr 2005 15:07:24 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 15:07:24 -0700

    [PATCH] show-diff.c: make diff options customizable.
    
    This makes the diff output formatting options customizable via the
    environment variables.  The default is still the Linux kernel style. 
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 5a6ad74623571a1479af7914ec16783a9566e4b2
tree 1ef36590fde7db5897b06a9edfe9f7280bc37c0e
parent 8f3671dcd93b8c5ab21582752f736646c66e2249
author Junio C Hamano <junkio@cox.net> Mon, 18 Apr 2005 15:07:24 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 15:07:24 -0700

    [PATCH] show-diff.c: adjust default format for the Linux kernel.
    
    This patch adjusts the default output format of show-diff to match
    the Linux kernel style, recommended in Documentation/SubmittingPatches.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 8f3671dcd93b8c5ab21582752f736646c66e2249
tree 36f8f4238a895b360761f9c6404e6ae3f92ab6cd
parent d0db466326c32ca4b3faa849a81fab7d60615c6f
author Junio C Hamano <junkio@cox.net> Mon, 18 Apr 2005 15:07:24 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 15:07:24 -0700

    [PATCH] show-diff.c: simplify show_diff_empty.
    
    This patch removes the custom diff generation code from the
    show_diff_empty() function.  Instead, just use show_differences().
    
    This reduces the code size; but more importantly, it is needed for
    the later patch to give diff options.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit d0db466326c32ca4b3faa849a81fab7d60615c6f
tree 7adca356fd5756abecd4e38e10e806d9ecaabea6
parent c157d376740f224789f464785718f3757ea8aa92
author Junio C Hamano <junkio@cox.net> Mon, 18 Apr 2005 15:07:24 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 15:07:24 -0700

    [PATCH] show-diff.c: check unreadbale blob.
    
    This patch fixes show-diff to detect unreadable blob and warn
    instead of going ahead and crashing.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit c157d376740f224789f464785718f3757ea8aa92
tree 59c1a227ca811eb95a38b69288bfc54fb87fd078
parent 00829b5def72f36269796727c9589316a214dc85
author Junio C Hamano <junkio@cox.net> Mon, 18 Apr 2005 15:07:24 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 15:07:24 -0700

    [PATCH] show-diff.c: clean up private buffer use.
    
    This patch fixes sq_expand() and show_differences() not to use and
    hold onto its privately allocated buffer, which was a misguided
    attempt to reduce calls to malloc but made later changes harder.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 0572d0834c6db9879905c7d12625edc7d783fc10
tree a5b413772ac5379a9d9b594079d2a54a44b9468d
parent 638942d645451a11fd1c37eddce8abbba5c8c2ff
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 00:05:09 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 00:05:09 +0200

    git merge's -b parameter is now optional.

commit 00829b5def72f36269796727c9589316a214dc85
tree 55256581c61fa13142e42317364f56f70e7156f6
parent e3b4be7f6c31d85b5f6abc42bd24d61bce5027b4
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 15:01:48 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 15:01:48 -0700

    Add "update-cache --refresh" to git-pull-script to make sure
    out index is all ready to go after a pull.
    
    Noted by Russell King

commit 638942d645451a11fd1c37eddce8abbba5c8c2ff
tree 6fd87dbd37e5e674f862bb1d468a008e05ee6145
parent 20ddc471ddecc5d8be7fa5421382880b483f98a6
author Petr Baudis <pasky@ucw.cz> Tue, 19 Apr 2005 00:01:34 +0200
committer Petr Baudis <xpasky@machine> Tue, 19 Apr 2005 00:01:34 +0200

    Fixed pulling of untracked branches in tracking trees resulting
    in ugly diff-tree output.

commit 20ddc471ddecc5d8be7fa5421382880b483f98a6
tree fecd96fcc8e4d94753d0d8f5605ac1b5363af420
parent 220e96dc004ecccab87c3a8d920a902c15eb55bd
parent e3b4be7f6c31d85b5f6abc42bd24d61bce5027b4
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 23:59:27 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 23:59:27 +0200

    Merging: 0ecdce9fb5f394884169fdaee33c72b311ce61d7
    
    Merge with Linus. Mysterious unpack-file and enhancements of his
    merge script.

commit 220e96dc004ecccab87c3a8d920a902c15eb55bd
tree 14c2f24b47e6fec294f78df399a0ab89d9943959
parent fbf1ef918f740f1a8144d75e4df217029ac5ddc9
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 23:49:53 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 23:49:53 +0200

    Describe that git status takes no arguments.

commit fbf1ef918f740f1a8144d75e4df217029ac5ddc9
tree 1120102ae18a37d521bb687631ff750a7b0c1fa4
parent ed83978b84c29ef831cd30d5f13b45a5c53c2bc6
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 23:49:33 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 23:49:33 +0200

    Dramatically speed git status up.

commit ed83978b84c29ef831cd30d5f13b45a5c53c2bc6
tree c3e589d5b4a6a07cb206162da43224888d3e046d
parent 4c5da8571fd9b4bf8ebd18d19f30d968e58b3292
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 23:49:20 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 23:49:20 +0200

    git status now also ignores *.a files and ,,merge* directories.

commit 4c5da8571fd9b4bf8ebd18d19f30d968e58b3292
tree 397d12347c7da66f33b1b3acc888fb85ed833f7e
parent 965232a9e60a575a178225bcf4e868c3f6405fb4
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 23:45:32 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 23:45:32 +0200

    Make git log's date pretty-printed.
    
    Heavily inspired by signed-off patch of David Woodhouse <dwmw2@infradead.org>,
    and ideas by Sanjoy Mahajan <sanjoy@mrao.cam.ac.uk> and
    Ray Lee <ray-lk@madrabbit.org>.

commit e3b4be7f6c31d85b5f6abc42bd24d61bce5027b4
tree a1fc4f22ab9c7065f86046a81716ada8f9df5080
parent 3407bb4940c25ca67c846a48ef2c2c60c02178e0
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 14:17:58 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 14:17:58 -0700

    Change merge-cache and git-merge-one-file to use the SHA1 of the file
    instead of a checked-out temporary copy.
    
    If merging requires a checked-out-copy, we now do so with "unpack-file".

commit 3407bb4940c25ca67c846a48ef2c2c60c02178e0
tree a03f07de14b83440fc33358924329abc1d9f1ada
parent e590d694ead8d50c2afc7086161d4ddc5d907655
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 14:11:01 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 14:11:01 -0700

    Add "unpack-file" helper that unpacks a sha1 blob into a tmpfile.

commit 965232a9e60a575a178225bcf4e868c3f6405fb4
tree 5ae22b3393b09761f25da1cb5c8074b541ef4155
parent 4bfa627a8f446de752dc1e99c294573636e25c34
parent e590d694ead8d50c2afc7086161d4ddc5d907655
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 22:49:42 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 22:49:42 +0200

    Merging: b53501cd68498d48e02a1d3f52fc3af81892c976
    
    Merge with Linus. Splitting files.

commit 4bfa627a8f446de752dc1e99c294573636e25c34
tree 9049285800dca7a768490f99a6fa4de1eec13238
parent 8a8e73fb1a0193b4d3eea2c3c959f1ffb7562afe
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 22:35:07 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 22:35:07 +0200

    git cancel is the opposite, not negation, of git commit.

commit 8a8e73fb1a0193b4d3eea2c3c959f1ffb7562afe
tree 9faf6f990219d7ef97c8845b62e06b9bc44a2507
parent 14366089b00b2bbfac092d25d3f374524cb4f045
parent 0a02ce72d9ab78d061b2cc919bc15e36fe620ddc
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 22:32:28 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 22:32:28 +0200

    Merging: 20f6a01d508c6ebd3e38d175735affd6aaa362ba
    
    Merge with Linus. Daniel Barkalow's big objects infrastructure
    merge and few example scripts.

commit e590d694ead8d50c2afc7086161d4ddc5d907655
tree 5ab643be0689cc7bb6c61ba92e7cb195a5d33a21
parent 0fcfd160b0495c0881e142c546c4418b8cea7e93
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 13:12:21 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 13:12:21 -0700

    Add more header dependencies.
    
    Yeah, my Makefiles are always a total disaster. Better this than autotools
    or some horror like that, though.

commit 0fcfd160b0495c0881e142c546c4418b8cea7e93
tree 21bdf6702f0dfe75fc7caa3882da7bb34b0bc4bf
parent 0a02ce72d9ab78d061b2cc919bc15e36fe620ddc
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 13:04:43 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 13:04:43 -0700

    Split up read-cache.c into more logical clumps.
    
    Do the usage and error reporting in "usage.c", and the sha1 file
    accesses in "sha1_file.c".
    
    Small, nice, easily separated parts. Good.

commit 0a02ce72d9ab78d061b2cc919bc15e36fe620ddc
tree b33aa1f12f34891ff6a79cf499f7757233ce9707
parent 839a7a06f35bf8cd563a41d6db97f453ab108129
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 12:49:39 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 12:49:39 -0700

    Clean up the Makefile a bit.
    
    This introduces the concept of git "library" objects that
    the real programs use, and makes it easier to add such things
    to a "libgit.a".
    
    This will also make it trivial to split the current "read-cache.o"
    into more aptly named pieces (it does a lot more than just read
    the index file).

commit 14366089b00b2bbfac092d25d3f374524cb4f045
tree 6cd9e1f53e6c76a821fb91262567b2b385b5822c
parent df13c37ed671488c3c748840123406caae766e9e
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 21:46:59 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 21:46:59 +0200

    git diff now supports diffing individual files if you are diffing
    against working tree.

commit df13c37ed671488c3c748840123406caae766e9e
tree 3242a7c4b1dfc48b5cb63d298ba4ec1f5953e6c0
parent b10c03a39976ce9c06d74d6d7ef749b6b0a17e26
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 21:43:22 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 21:43:22 +0200

    Prevent error messages when add/rm queue does not exist while
    committing.

commit b10c03a39976ce9c06d74d6d7ef749b6b0a17e26
tree 007dd2e6f129dee184c035c385f0d6ad59cb13c7
parent 71eb319dab23030e726d542d9c7c53a964ffb474
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 21:42:37 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 21:42:37 +0200

    Fix committing individual files w.r.t. add/rm queues.

commit 71eb319dab23030e726d542d9c7c53a964ffb474
tree 9e2cbd612db180a6cb656d0a942f242d062d6dec
parent cf754ba9dbb308e5ab3c76627847fa5fa4a55ff8
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 21:37:33 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 21:37:33 +0200

    Fix a missing -r for gitdiff.sh when committing merge.

commit cf754ba9dbb308e5ab3c76627847fa5fa4a55ff8
tree 1bad732a4d2da0ad6dc2179f3ceff5ee89419534
parent 8632428ef47f4f356c7f925bc901879f8556f30a
parent a4b7dbef4ef53f4fffbda0a6f5eada4c377e3fc5
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 21:33:01 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 21:33:01 +0200

    Merging: 6db149a469baf3cd8891d25b9cca810be071a873
    
    Merge with Linus. Some bugfixes, documentation update and merge-cache.

commit 839a7a06f35bf8cd563a41d6db97f453ab108129
tree d7d681633af8bac34d18dbdcd526c301a4818a5e
parent b51ad4314078298194d23d46e2b4473ffd32a88a
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 12:15:10 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 12:15:10 -0700

    Add the simple scripts I used to do a merge with content conflicts.
    
    They sure as hell aren't perfect, but they allow you to do:
    
    	./git-pull-script {other-git-directory}
    
    to do the initial merge, and if that had content clashes, you do
    
    	merge-cache ./git-merge-one-file-script -a
    
    which tries to auto-merge. When/if the auto-merge fails, it will
    leave the last file in your working directory, and you can edit
    it and then when you're happy you can do "update-cache filename"
    on it. Re-do the merge-cache thing until there are no files left
    to be merged, and now you can write the tree and commit:
    
    	write-tree
    	commit-tree .... -p $(cat .git/HEAD) -p $(cat .git/MERGE_HEAD)
    
    and you're done.

commit b51ad4314078298194d23d46e2b4473ffd32a88a
tree 3dfffcf747e4fbdb04f1b43251be932f69f55476
parent a4b7dbef4ef53f4fffbda0a6f5eada4c377e3fc5
parent b5039db6d25ae25f1cb2db541ed13602784fafc3
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 12:12:00 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 12:12:00 -0700

    Merge the new object model thing from Daniel Barkalow
    
    This was a real git merge with conflicts. I'll commit the scripts I used
    to do the merge next.
    
    Not pretty, but it's half-way functional.

commit a4b7dbef4ef53f4fffbda0a6f5eada4c377e3fc5
tree ffff612a9cb5d5f390c1aeadaf2bd1e8c3d33ded
parent 1bc992acacf5961e65d9fdddeb8561284e708c74
author James Bottomley <James.Bottomley@SteelEye.com> Mon, 18 Apr 2005 11:44:31 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 11:44:31 -0700

    [PATCH] fix bug in read-cache.c which loses files when merging a tree
    
    I noticed this when I tried a non-trivial scsi merge and checked the
    results against BK.  The problem is that remove_entry_at() actually
    decrements active_nr, so decrementing it in add_cache_entry() before
    calling remove_entry_at() is a double decrement (hence we lose cache
    entries at the end).
    

commit 8632428ef47f4f356c7f925bc901879f8556f30a
tree acf33807a97bc4a2ed94e04aab36ca7d521431cf
parent 9eb87cdba911e6420271a2744d19ae60f35d7a11
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 20:43:56 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 20:43:56 +0200

    "local" is now not a reserved keyword in commit/tree IDs.
    It was used by git track but not so anymore.

commit 9eb87cdba911e6420271a2744d19ae60f35d7a11
tree 3a6f628339f0b9069dcfd73ed7fce42b20744a2a
parent 29c03848d47449d6b16bf024ceb677cc48dc548e
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 20:40:40 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 20:40:40 +0200

    Enhanced invocation of git merge in git pull. Now it is much simpler
    and will handle gitmerge.sh failure gracefully.

commit b5039db6d25ae25f1cb2db541ed13602784fafc3
tree 6ed59f0fe035b53766aaf0376534c0271f509b95
parent ff5ebe39b0ca5cbdcbe11f092b5b43dbeada820e
author Daniel Barkalow <barkalow@iabervon.org> Mon, 18 Apr 2005 11:39:48 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 11:39:48 -0700

    [PATCH] Switch implementations of merge-base, port to parsing
    
    This switches to my implementation of merge-base, but with the new parsing
    library.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit ff5ebe39b0ca5cbdcbe11f092b5b43dbeada820e
tree 7e203f60559156e4865f27635cae3d712ae295bf
parent 5873b67eef184d771359c187889c6e5c412b9d43
author Daniel Barkalow <barkalow@iabervon.org> Mon, 18 Apr 2005 11:39:48 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 11:39:48 -0700

    [PATCH] Port fsck-cache to use parsing functions
    
    This ports fsck-cache to use parsing functions. Note that performance
    could be improved here by only reading each object once, but this requires
    somewhat more complicated flow control.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 5873b67eef184d771359c187889c6e5c412b9d43
tree 248e514627e99ee59c38765ce148297eb1daca90
parent 175785e5ff7395be8a458694a7df0511ac14e948
author Daniel Barkalow <barkalow@iabervon.org> Mon, 18 Apr 2005 11:39:48 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 11:39:48 -0700

    [PATCH] Port rev-tree to parsing functions
    
    This ports rev-tree to use the parsing functions introduced in the
    previous patches.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 175785e5ff7395be8a458694a7df0511ac14e948
tree 3e65cde9bb577457d62c11fc6075f3a04a8d4bc9
parent 6eb8ae00d4bceaf660a07d8bc5ab8d6ddccbe1af
author Daniel Barkalow <barkalow@iabervon.org> Mon, 18 Apr 2005 11:39:48 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 11:39:48 -0700

    [PATCH] Implementations of parsing functions
    
    This implements the parsing functions.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 6eb8ae00d4bceaf660a07d8bc5ab8d6ddccbe1af
tree a8b8d7855516b8e7f79de226543f7fdfe8ee1e2e
parent 6683463ed6b2da9eed309c305806f9393d1ae728
author Daniel Barkalow <barkalow@iabervon.org> Mon, 18 Apr 2005 11:39:48 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 11:39:48 -0700

    [PATCH] Header files for object parsing
    
    This adds the structs and function declarations for parsing git objects.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 29c03848d47449d6b16bf024ceb677cc48dc548e
tree 9c63c6e60c1c33a0c51ab1952d79237129ce88b6
parent 2a02b2a5d8ff2ee819697ab71b465ccddc299d1b
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 20:38:13 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 20:38:13 +0200

    Moved the $head != $orig_head merging intelligence from git pull
    to git merge, which will do the right thing now when base is
    equal to the current HEAD.

commit 2a02b2a5d8ff2ee819697ab71b465ccddc299d1b
tree 16e4b58d713a525830e11313c6acf1f716123d1e
parent 18485cb9541f58a949d3b5ac609319fc38d9b2a7
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 20:23:04 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 20:23:04 +0200

    git pull now handles multiple local branches tracking a single
    remote branch. Also fixed initial pull and overally made the
    thing hopefully a little less messy.

commit 1bc992acacf5961e65d9fdddeb8561284e708c74
tree 4dca8f7c63099bfb713f915c110f1fd2ae634337
parent 6ad6d3d36c5924c8ff502ebbb6a6216df01e7efb
author Junio C Hamano <junkio@cox.net> Mon, 18 Apr 2005 10:42:48 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 18 Apr 2005 10:42:48 -0700

    [PATCH] Fix confusing behaviour of update-cache --refresh on unmerged paths.
    
    The "update-cache --refresh" command attempts refresh_entry()
    on unmerged path, which results in as many "needs update" messages
    as there are unmerged stages for that path.  This does not do
    any harm to the working directory, but it is confusing.
    
    Here is a fix.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 18485cb9541f58a949d3b5ac609319fc38d9b2a7
tree d0bc6091b39fc40d4421d8e2b723f8eac0dba061
parent 8caec85e1410ffddfed6c4c090f212180b0e0c06
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 16:31:45 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 16:31:45 +0200

    git lntree -> gitXlntree.sh. This command is useless for end-users.

commit 8caec85e1410ffddfed6c4c090f212180b0e0c06
tree 20f7d1005a66431526838c82a056997a9e8a7fbe
parent 9d13b870fe892ad1ba9127e50339a654fa0d7530
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 16:31:24 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 16:31:24 +0200

    Fixed displaying added/removed files. Still far from perfect.

commit 9d13b870fe892ad1ba9127e50339a654fa0d7530
tree 6cbc55662a4aea07af6dc789847f83ef3e743fdf
parent 9dd7afba53b7aa5b28b8b8781ec3876f4ce21fbb
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 16:17:42 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 16:17:42 +0200

    Add git status command, which will show uncommitted, modified
    etc files. It is pretty simple yet, and you cannot specify custom
    ignore masks; it just ignores *.o and "tags" files now.

commit 9dd7afba53b7aa5b28b8b8781ec3876f4ce21fbb
tree 15ab235205fa200fd6b306b9457da46b813d41a1
parent c8acab0ceb0a6311768f40168ebeb44be010c535
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 16:00:05 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 16:00:05 +0200

    show-files can now take -t parameter which will tag the output entries based
    on what "class" they are - cached, deleted, others, unmerged etc.

commit c8acab0ceb0a6311768f40168ebeb44be010c535
tree ff240bce376ee971e7b7dca781cf2ff41db53bdf
parent aef34023f9dd1cb4681d816619f15dd9bbb41c67
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 15:42:55 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 15:42:55 +0200

    Update README for the new git diff arguments format.

commit aef34023f9dd1cb4681d816619f15dd9bbb41c67
tree 6a3ab49acdf000d3c0c2a41e66e7cc1e01e8515a
parent 27ecd29b0313249a81e63943dff93338dbc6189c
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 15:33:18 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 15:33:18 +0200

    Changed git track semantics. It won't switch you to the tracked
    branch now, but git pull will apply any updates on the top of the
    HEAD you have now. Therefore, HEAD.local ceases to exist.
    
    So, git track will not do ANYTHING to your working tree anymore.
    It is actually utterly trivial now.

commit 27ecd29b0313249a81e63943dff93338dbc6189c
tree 95e5953805c535615b0cade4734940ce22512299
parent 1c2d77ca032ba9ce12bb5b57ec57e5b3b3713a7d
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 15:24:20 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 15:24:20 +0200

    Fixed a superfluous shift in gitmerge.sh.

commit 1c2d77ca032ba9ce12bb5b57ec57e5b3b3713a7d
tree 60c82d2aae6da321010d62642439d4ecd3bd22e3
parent 8554d5af099bc80a13c5a35605e5c97a2121fbf1
author Martin Schlemmer <azarah@nosferatu.za.org> Mon, 18 Apr 2005 11:57:26 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 15:04:37 +0200

    [pasky] recent changes to gitdiff.sh
    
    Update calls to gitdiff.sh to include the '-r' switch.
    
    Signed-off-by: Martin Schlemmer <azarah@nosferatu.za.org>
    
    I'm stupid.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 8554d5af099bc80a13c5a35605e5c97a2121fbf1
tree e046c13e39b5ada1fffd082768e009739a1a5a0d
parent 0f1b935a3e19529ebefcc37ab30d573899d0020c
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 15:02:38 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 15:02:38 +0200

    git update renamed to git seek and removed possibility to switch
    branches in the working directory. It might get implemented later
    with git switch or something, but for now I'd stay with git fork.

commit 0f1b935a3e19529ebefcc37ab30d573899d0020c
tree 893149db88f3b3b608b9d1914ea7c25ab3c1a614
parent bf04d4a3a256a2326e3f192b12ce5fcdd52dd767
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 13:32:56 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 13:32:56 +0200

    Enhanced .git/blocked handling; not limited to just merges now.

commit bf04d4a3a256a2326e3f192b12ce5fcdd52dd767
tree aecef9d24374f05d9dcc8ecc152dbe9c3b3adad1
parent 2d8fc50b80643d43134aef765810b078f3df954c
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 13:16:50 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 13:16:50 +0200

    Missing update-cache --refresh in gitpull.sh.

commit 6ad6d3d36c5924c8ff502ebbb6a6216df01e7efb
tree 163eaf2bd9b138d563b046e807f468c99c863562
parent 64982f75109dfc42967773f35301f2dcd30a1a9f
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 21:52:23 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 21:52:23 -0700

    Update README to reflect the hierarchical tree objects,
    and other newfangled things like merging.
    
    Also, talk more about the actual operations, and give some
    rough examples of what you can do.

commit 64982f75109dfc42967773f35301f2dcd30a1a9f
tree 12c432b101d918e193bd01c259c56046907b0ba9
parent 75118b13bc8187c629886b108929f996c47daf01
author Junio C Hamano <junkio@cox.net> Sun, 17 Apr 2005 20:31:40 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 20:31:40 -0700

    [PATCH] (resend) show-diff.c off-by-one fix
    
    The patch to introduce shell safety to show-diff has an
    off-by-one error.  Here is an fix.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 75118b13bc8187c629886b108929f996c47daf01
tree 7a191717f2b03af0ac1978e9cfc19826836f5c3c
parent 74b2428f5573b1f68ce717706296ae7d1832cd65
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 19:52:54 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 19:52:54 -0700

    Ass a "merge-cache" helper program to execute a merge on
    any unmerged files.
    
    This one doesn't actually do the merging, but it makes it
    easy to script the programs that do using it.

commit 2d8fc50b80643d43134aef765810b078f3df954c
tree 2a6df3f9c5eb2a0f38319a7c10b644c37e241b93
parent 7679c1fa42686e4a89dad159f7c5b3fc85354b3c
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 04:17:12 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 04:17:12 +0200

    Removed git branch command, which was a mistake and has no
    legitimate use.

commit 7679c1fa42686e4a89dad159f7c5b3fc85354b3c
tree d56fc36a613c8fb39e1216693220104dc64af95a
parent d82bc9f3cb00c8b66797ec5414cf72a880257c3d
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 04:15:28 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 04:15:28 +0200

    git fork now allows reusing an existing local branch for the new
    directory; in that case it is basically git export without getting
    outside of the git framework with the new tree.

commit 74b2428f5573b1f68ce717706296ae7d1832cd65
tree cd4af5810aa6bd17d9740a8f418c003b559d609e
parent d9f98eebcd31e123e859a4b8c6506bf3f3c4bad6
author Brad Roberts <braddr@puremagic.com> Sun, 17 Apr 2005 19:12:14 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 19:12:14 -0700

    [PATCH] fork optional branch point normazilation
    
    Fix remove_specials for real.  The second half logic needs the original
    head of the string.
    
    Signed-off-by: Brad Roberts <braddr@puremagic.com>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    

commit d82bc9f3cb00c8b66797ec5414cf72a880257c3d
tree 646e9349a76e03907acd29edbc8dd068aeb7fd94
parent a60cc0f688b54be0102850f67d423c5324c9913b
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 04:04:05 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 04:04:05 +0200

    No revision specified in git diff means working tree.

commit d9f98eebcd31e123e859a4b8c6506bf3f3c4bad6
tree 594cd3385658b717a95af8827228d51a37d6b813
parent 5e5128ed1cf4223fd32a36f858263d361ade5310
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 18:39:14 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 18:39:14 -0700

    Ignore any unmerged entries for "checkout-cache -a".
    
    They don't "exist" yet, and you need to merge them first.

commit a60cc0f688b54be0102850f67d423c5324c9913b
tree 0e5928946722a179a3b423be9368d88534b1bc87
parent f44de54db4b2f1470100fe2dc544e56d3044698c
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 03:37:47 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 03:37:47 +0200

    Changed git diff usage. Now, it takes revisions preceded by the
    -r parameter, either as -r rev1:rev2 or -r rev1 -r rev2. This
    is necessary so that we can ask for diffs of individual files
    and the same usage as the rest of the world.

commit f44de54db4b2f1470100fe2dc544e56d3044698c
tree a08ae8a73cf2de52dd3d4852571800c3b3d9ecbd
parent 633404a2b42b5c75731a0e1be23506e08a088748
parent 5e5128ed1cf4223fd32a36f858263d361ade5310
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 02:25:33 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 02:25:33 +0200

    Merging: f7d2aacf8c7cf9ace38f90f06d31caa39f65d7f8
    
    Merge with Linus. Carries few bugfixes.

commit 633404a2b42b5c75731a0e1be23506e08a088748
tree e7e3dd7600243bb1c77d8d8f7b9424a5fb9c6742
parent 2998893a711636e9a5fc987897a5290082e0c11c
author Ingo Molnar <mingo@elte.hu> Thu, 14 Apr 2005 13:32:58 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 02:15:25 +0200

    [patch] git: fix memory leaks in read-cache.c
    
    this patch fixes a common and a rare memory leak in read-cache.c.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 2998893a711636e9a5fc987897a5290082e0c11c
tree b568888b4460014e7b1c33969cf9f1abd5397204
parent 886557d3234aaaec35bd2bb92bf83d0062f16a47
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 02:13:21 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 02:13:21 +0200

    Properly munmap() the blob in update-cache.c:index_fd(), and
    unify the function's return path.
    
    Inspired by Ingo Molnar <mingo@elte.hu>.

commit 886557d3234aaaec35bd2bb92bf83d0062f16a47
tree 2050fd235eaa5f919eba00521efb3eeecbf49803
parent 76309607b617500eab4fef25ed9f7d01d99b254a
author Ingo Molnar <mingo@elte.hu> Thu, 14 Apr 2005 14:08:29 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 02:08:46 +0200

    [patch] git: clean up add_file_to_cache() in update-cache.c
    
    this patch cleans up add_file_to_cache() to free up all memory it
    allocates. This has no significance right now as the only user of
    add_file_to_cache() die()s immediately in the 'leak' paths - but if the
    function is ever used without dying then this uncleanliness could lead
    to a memory leak.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 76309607b617500eab4fef25ed9f7d01d99b254a
tree 7a2323f6e76f4e82357c0dc2751f07dc23269cbf
parent d40ea7045215d1645869d5093012d27d79547461
author Ingo Molnar <mingo@elte.hu> Thu, 14 Apr 2005 14:03:09 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 02:06:22 +0200

    [patch] git: fix memory leaks in update-cache.c
    
    this patch fixes two memory leaks in update-cache.c: we didnt free the
    temporary input and output buffers used for compression.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 5e5128ed1cf4223fd32a36f858263d361ade5310
tree 91747f0cff21db6fbdbbc7a97bb7ff2972a9b036
parent 08ca0b04ba80b7127dd19b6d17c548eaca057ab3
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 16:52:54 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 16:52:54 -0700

    Remove extraneous ',' ';' and '.' characters from the full name gecos field.
    
    Apparently some distributions tend to have space for phone numbers etc there.

commit d40ea7045215d1645869d5093012d27d79547461
tree 03e29d380eea54030fa53264e6263f526d528a51
parent 90adc73b6e202bf22eccac242b3c62749fb950d3
author Ingo Molnar <mingo@elte.hu> Thu, 14 Apr 2005 13:18:19 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 01:47:59 +0200

    [patch] git: fix overflow in update-cache.c
    
    this patch fixes a 1-byte overflow in update-cache.c (probably not
    exploitable). A specially crafted db object might trigger this overflow.
    
    the bug is that normally the 'type' field is parsed by read_sha1_file(),
    via:
    
            if (sscanf(buffer, "%10s %lu", type, size) != 2)
    
    i.e. 0-10 long strings, which take 1-11 bytes of space. Normally the
    type strings are stored in char [20] arrays, but in update-cache.c that
    is char [10], so a 1 byte overflow might occur.
    
    This should not happen with a 'friendly' DB, as the longest type string
    ("commit") is 7 bytes long. The fix is to use the customary char [20].
    
    (someone might want to clean those open-coded constants up with a
    TYPE_LEN define, they do tend to cause problems like this. I'm not
    against open-coded constants (they make code much more readable), but
    for fields that get filled in from possibly hostile objects this is
    playing with fire.)
    
    hey, this might be the first true security fix for GIT? ;-)
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 90adc73b6e202bf22eccac242b3c62749fb950d3
tree c8f836d64d9468cd60998c8f55bb3478b9818998
parent 175753fd555829a71e5eb8dcf1c2479ebe041833
author Ingo Molnar <mingo@elte.hu> Thu, 14 Apr 2005 13:08:34 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 01:43:54 +0200

    [patch] git: fix memory leak in show-diff.c
    
    this patch fixes a memory leak in show-diff.c.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 175753fd555829a71e5eb8dcf1c2479ebe041833
tree 07eebdebb3b88e07b71dd36dc46639f7ae5158a7
parent 319999b97d6b2e7e91804993229eaf9cc4d64c6a
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 01:28:54 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 01:28:54 +0200

    When removing the git clone command, I errorneously removed gitinit.sh
    instead of gitclone.sh from the Makefile. Oops. Fixed by this commit.
    
    Pointed out by Steven Cole.

commit 319999b97d6b2e7e91804993229eaf9cc4d64c6a
tree 384ba6f88bcede01e783f0b819150c651ca75652
parent 817aedae1decfe91ac80fac712e1043aef5f5e48
author Ingo Molnar <mingo@elte.hu> Thu, 14 Apr 2005 12:58:00 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 01:23:28 +0200

    Fix a rare memory leak in parse_commit().
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    
    Ported from rev-tree.c to revision.h.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 817aedae1decfe91ac80fac712e1043aef5f5e48
tree 36566400dca45d8bb562f56ca4c2053b79a58f47
parent 5cb65a384082b08697fa30abe61d07f4117b9352
author Ingo Molnar <mingo@elte.hu> Thu, 14 Apr 2005 12:54:22 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 01:20:49 +0200

    [patch] git: fix memory leaks in read-tree.c
    
    this patch fixes one common, and 4 rare memory leaks in read-tree.c.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    
    buffer -> bufptr, buffer0 -> buffer
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 08ca0b04ba80b7127dd19b6d17c548eaca057ab3
tree a188dc51c655a0bf06035da38d6618e4fcb34d53
parent d0d7cbe730c31a6e1d12bd68975ff73c60f1de6c
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 16:19:32 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 16:19:32 -0700

    Make the revision tracking track the object types too.
    
    This allows fsck to verify not just that an object exists, but
    also that it has the type it was expected to have.

commit 5cb65a384082b08697fa30abe61d07f4117b9352
tree c8155a01ac637bfd9d808e7033a94cfc9a9eb26e
parent 166cddeac1a26c0f3acfd803d524e3c349002205
author Ingo Molnar <mingo@elte.hu> Thu, 14 Apr 2005 12:43:44 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 01:13:52 +0200

    [patch] git: cleanup in ls-tree.c
    
    cleanup: this patch adds a free() to ls-tree.c.
    
    (Technically it's not a memory leak yet because the buffer is allocated
    once by the function and then the utility exits - but it's a tad cleaner
    to not leave such assumptions in the code, so that if someone reuses the
    function (or extends the utility to include a loop) the uncleanliness
    doesnt develop into a real memory leak.)
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    
    Forward-ported.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 166cddeac1a26c0f3acfd803d524e3c349002205
tree 548cd9b6185179186b550e28d28c1e09f548f1b1
parent 2dbbb7fa076e68f0b86d582bb56843136eb2d461
author Ingo Molnar <mingo@elte.hu> Thu, 14 Apr 2005 12:35:27 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 01:09:32 +0200

    [patch] git: fix memory leak #2 in checkout-cache.c
    
    this patch fixes another (very rare) memory leak in checkout-cache.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 2dbbb7fa076e68f0b86d582bb56843136eb2d461
tree 81e28936e80958760b89bfccdd411d6239308854
parent 8ed315d3e1bb124af5e613c06a66c5b36918a883
author Steven Cole <elenstev@mesatop.com> Sun, 17 Apr 2005 15:42:56 -0600
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 01:01:47 +0200

    [PATCH] Add lsremote command.
    
     This is a fairly trivial addition, but if users are adding remote repositories
     with git addremote, then those users should be able to list out the remote
     list without having to know the details of where the remotes file is kept.
    
    Signed-off-by: Steven Cole <elenstev@mesatop.com>
    
    Added to Makefile and a little reorganized to please my eye.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 8ed315d3e1bb124af5e613c06a66c5b36918a883
tree 7c09177ffbe2d4fbd556d1634d825942100cbc98
parent b0e12b1a91be00fac196178c378e3e74d29736e5
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 00:29:04 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 00:29:04 +0200

    In git pull, instead of throwing rsync's stdout to /dev/null,
    just grep out the ^MOTD: lines. Allows you to see progress and
    stuff, if you set appropriate RSYNC_FLAGS.

commit b0e12b1a91be00fac196178c378e3e74d29736e5
tree 8ea38ed00434d59c91152a3e679619d9247927e7
parent 1afc00ba27056dcedf3ffa60cda7a5696edf796c
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 00:26:28 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 00:26:28 +0200

    Killed git clone and made git init accept an optional rsync URL
    parameter instead.
    
    Idea by Daniel Barkalow.

commit d0d7cbe730c31a6e1d12bd68975ff73c60f1de6c
tree e496cd3c22f575e70d89b6d5d7e8b51393bc9558
parent 7d60ad7cc948b1b9e1066a3e740c91651bdc7e8d
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 15:26:13 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 15:26:13 -0700

    Make "commit-tree" check the input objects more carefully.
    
    Let's not allow trivially bogus commits. I did one for the first
    trial of the first kernel git merge. fsck found it ok, but..

commit 1afc00ba27056dcedf3ffa60cda7a5696edf796c
tree bb6e16fd404bac6d2300aa4cb936947a6d2b798c
parent 8c270fbdd5dbb57f6ef7e9246ccd99e78a2a597a
author Petr Baudis <pasky@ucw.cz> Mon, 18 Apr 2005 00:17:05 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 00:17:05 +0200

    The rsync invocations in git pull now include $RSYNC_FLAGS so that
    you can tell it to show --progress, --stats and whatever else.

commit 8c270fbdd5dbb57f6ef7e9246ccd99e78a2a597a
tree bc2d83d7edc736634de08b695fd7afc338fdfc8d
parent f855e3e8835702b266b0fd2744f7f1a79b2d5a27
author Ingo Molnar <mingo@elte.hu> Thu, 14 Apr 2005 12:26:38 +0200
committer Petr Baudis <xpasky@machine> Mon, 18 Apr 2005 00:10:18 +0200

    [patch] git: fix memory leak in checkout-cache.c
    
    this patch fixes a memory leak in checkout-cache.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit f855e3e8835702b266b0fd2744f7f1a79b2d5a27
tree 3c5d232445aae5d6ef8b08d1e919c568d15e42e1
parent 58ac28380562ce08110faef19c42eea205b7407b
author Morten Welinder <mwelinder@gmail.com> Fri, 15 Apr 2005 19:50:06 -0400
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 23:59:41 +0200

    [PATCH] write_sha1_buffer
    
    This write will failing sooner or later when someone's disk fills up.
    That'll leave someone with a truncated file.
    
    Signed-off-by: Morten Welinder <mwelinder@gmail.com>
    
    unlink() the truncated file and stick a TODO about rename().
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 58ac28380562ce08110faef19c42eea205b7407b
tree c1c7e9a7c9680d5ebb95cfc140ae85aa5f26df7d
parent 8d854f59b1c682d01d8e8b1cf70fdd5a38e69b52
author Petr Baudis <pasky@ucw.cz> Sun, 17 Apr 2005 23:34:51 +0200
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 23:34:51 +0200

    Stick a comment to update-cache.c:refresh_cache() that you can't
    just free(archive_cache[i]) when replacing it there.

commit 8d854f59b1c682d01d8e8b1cf70fdd5a38e69b52
tree 807a01725080c60332eb11b5fae613f23e8ff941
parent d82780647470661014648b3bbf826a36d273aec8
author Junio C Hamano <junkio@cox.net> Sun, 17 Apr 2005 00:15:48 -0700
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 23:24:41 +0200

    [PATCH] Really honor umask when creating files
    
    The stated plan was to create new files with either 0666 or 0777
    and let the system take care of applying umask().  Running
    fchmod afterwards defeats this plan, so drop it.
    
    You still need to spell your octals with prefix in addition to
    this patch.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit d82780647470661014648b3bbf826a36d273aec8
tree 931a2e835fa59d0c31d123781db7460c98ae6ee2
parent e0a3ec6041f249b94280e41ab17753f00cb5ce69
parent 7d60ad7cc948b1b9e1066a3e740c91651bdc7e8d
author Petr Baudis <pasky@ucw.cz> Sun, 17 Apr 2005 23:18:50 +0200
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 23:18:50 +0200

    Merging: 49a132ce2b568909a48c00f243d33153c8fe16b4
    
    Merge with Linus.
    
    I've decided to BACK OUT Daniel Barkalow's merge-base in favour
    of Linus'. This is not to say that I think it would be necessarily
    inferior, but my primary concern is ease of merging with Linus,

commit 7d60ad7cc948b1b9e1066a3e740c91651bdc7e8d
tree 7108636195bd22054fc889ab6eb87b2a0eb98e4a
parent 6683463ed6b2da9eed309c305806f9393d1ae728
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 12:40:18 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 12:40:18 -0700

    Make "parse_commit" return the "struct revision" for the commit.
    
    Also, make it a fatal error to pass in a non-commit object. The callers
    never checked, so better check here.
    
    This simplifies merge-base further. It's now so trivial that it's almost
    ridiculous.

commit 6683463ed6b2da9eed309c305806f9393d1ae728
tree 6d296ca7b9d8916797835771722b0c46085a6ea4
parent 15000d78996db926d18dd68e6f5f5770de09cad3
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 12:18:17 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 12:18:17 -0700

    Do a very simple "merge-base" that finds the most recent common
    parent of two commits.
    
    The question of "best" commit can probably be tweaked almost arbitrarily.
    In particular, trying to take things like how big the tree differences
    are into account migt be a good idea. This one is just very simple.

commit 15000d78996db926d18dd68e6f5f5770de09cad3
tree 3a95e7a220f82712cdc75073285bf5d93ba55f75
parent 01796b0e9180f92ed23aa8dc2261857b9dec7d13
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 12:09:20 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 12:09:20 -0700

    Make "rev-tree.c" use the new-and-improved "mark_reachable()"
    
    It used to have its own specialized version for marking the
    sub-reachability bits.

commit 01796b0e9180f92ed23aa8dc2261857b9dec7d13
tree a993c92293f2ea7afbac1e637167830d7f003d7d
parent 89d21f4b649d5d31b18da3220608cb349f29e650
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 12:07:00 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 12:07:00 -0700

    Make "revision.h" slightly better to use.
    
     - mark_reachable() can be more generic, marking the reachable revisions
       with an arbitrary mask.
     - date parsing will parse to a date of 0 rather than ULONG_MAX for the
       bad old case, sorting the dates correctly.

commit 89d21f4b649d5d31b18da3220608cb349f29e650
tree 1222f754aebb8effa4083edc21bae56e1b9fd4b9
parent 7223a88ce7795f38f47812ebca4433e7f8b82a30
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 11:39:18 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 11:39:18 -0700

    Move "parse_commit()" into common revision.h file.
    
    This also drops the old-style date parsing. We just don't care
    enough, since we dropped that format pretty early.
    
    Yes, this could do with some cleanup, and a common library file.
    Some day.

commit 7223a88ce7795f38f47812ebca4433e7f8b82a30
tree f55c811b9064810830cc746ac4d201abcd6a5f3c
parent e8871e88adca0637eb0299a41d85400beac928bd
author Brad Roberts <braddr@puremagic.com> Sun, 17 Apr 2005 10:55:12 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 10:55:12 -0700

    [PATCH] fix for memory leak in write-tree.c
    
    Fix a memory leak in write-tree.c, not freeing the directory buffer.
    

commit e0a3ec6041f249b94280e41ab17753f00cb5ce69
tree 1763085e35015d41db0a6b89dbd8a96cb65028f1
parent 954562bf7cfd3f31bc415cfc99131db8fbd8df89
author Petr Baudis <pasky@ucw.cz> Sun, 17 Apr 2005 19:32:34 +0200
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 19:32:34 +0200

    The -b argument of git merge is not compulsory anymore; merge-base
    will be used to automagically determine the base in case it is missing.

commit 954562bf7cfd3f31bc415cfc99131db8fbd8df89
tree 6f608f0b134f7214ee64fdd0eeba7ef39fde4eac
parent 6616d1835e81ac0d2304702102d210451c04832a
author Daniel Barkalow <barkalow@iabervon.org> Sun, 17 Apr 2005 11:51:59 -0400
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 19:32:02 +0200

    [2.1/5] Add merge-base
    
    merge-base finds one of the best common ancestors of a pair of commits. In
    particular, it finds one of the ones which is fewest commits away from the
    further of the heads.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 6616d1835e81ac0d2304702102d210451c04832a
tree 7c1f9aa894ce91928d982a0b197ab596375825a3
parent e30dd6c68e576d37bddd011aa7131a6d30297b4c
parent e8871e88adca0637eb0299a41d85400beac928bd
author Petr Baudis <pasky@ucw.cz> Sun, 17 Apr 2005 19:30:32 +0200
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 19:30:32 +0200

    Merging: d72ff74f5fd172c6ec9630ee8e08895a0525dcfe
    
    Merge with Linus. Nothing particularily interesting.

commit e30dd6c68e576d37bddd011aa7131a6d30297b4c
tree 7a2c887ef3b65a49c584e74aa5fe244eb3268ba2
parent 6cc896495a53cb3136f6239c2d41a3a4c6661c00
author Daniel Barkalow <barkalow@iabervon.org> Sun, 17 Apr 2005 10:24:20 -0400
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 19:19:38 +0200

    [1/5] Parsing code in revision.h
    
    This adds support to revision.h for parsing commit records (but not going
    any further than parsing a single record). Something like this is needed
    by anything that uses revision.h, but older programs open-code it.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    
    Fixed rev->date comment.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 6cc896495a53cb3136f6239c2d41a3a4c6661c00
tree 5c769967ad14485c9430438c9b28789a93dfdf56
parent c2bc1634ea7fe32d4c6e7e71124719a891bc8d15
author Petr Baudis <pasky@ucw.cz> Sun, 17 Apr 2005 19:12:58 +0200
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 19:12:58 +0200

    Reverted fb594d5af276dfeb18bacf2a7144481e45f9d58d (Brad Roberts'
    fix for off-by-one in show-diff). I actually merged Junio's fix
    for the same thing before, and it seems better.

commit e8871e88adca0637eb0299a41d85400beac928bd
tree 81ab899c3e71a2f9d8c75cd0620c9e7ea9182afc
parent c747fc6facdbbde4386418cfe6ad7e231a1b4eaf
author Petr Baudis <pasky@ucw.cz> Sun, 17 Apr 2005 10:04:48 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 10:04:48 -0700

    [PATCH] Fix +x-related show-diff false positives
    
    This fixes show-diff listing all +x files as differring.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>
    
    [ That's what I get for working on a G5 - my testing was all
      big-endian in the first place.  -- Linus ]
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    

commit c747fc6facdbbde4386418cfe6ad7e231a1b4eaf
tree 47b1c42d316f9eace8e55e2b8d5336e0cbfcbb3e
parent a38800fde24a44b12a9ed14852339466de1cb9c9
author Junio C Hamano <junkio@cox.net> Sun, 17 Apr 2005 10:02:22 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 10:02:22 -0700

    [PATCH] Remove unused arguments from index_fd()
    
    The function index_fd() in update-cache.c takes 5 arguments, but
    two is not necessary and one that is a pointer to a structure
    really needs to be a pointer to one member of that structure.
    This patch cleans it up.
    
    Also it removes printf() apparently left after initial
    debugging.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit a38800fde24a44b12a9ed14852339466de1cb9c9
tree 3698891b68fda449e3ba7fe859a5b65d54e60c79
parent fa06d442c6c5113fcff9991f349157bdb0c4b989
author Junio C Hamano <junkio@cox.net> Sun, 17 Apr 2005 10:02:21 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 10:02:21 -0700

    [PATCH] Better error message from checkout-cache for unmerged files.
    
    The checkout-cache command says "file is not in the cache" when
    an unmerged path is given.  This patch adds code to distinguish
    the unmerged and the nonexistent cases and gives an appropriate
    error message.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit fa06d442c6c5113fcff9991f349157bdb0c4b989
tree aadcae71d6f2b24b78822cc077c012febee593ea
parent c4e3cca1f71d34e69bdbfa0de0144ddb00f75505
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 09:55:36 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 09:55:36 -0700

    Fix total permission bogosity in "checkout-cache.c".
    
    Use the proper octal mode naming instead of random decimal
    crud, and don't reset the mode after the create with fchmod:
    the whole point was to let "umask" do its thing.
    
    Duh.

commit c4e3cca1f71d34e69bdbfa0de0144ddb00f75505
tree ea208e8b6d59f8a367af2886a381cb000d42713b
parent 8f41523fc1a8cd127ff39fa111b3b5bb5105cc84
author Junio C Hamano <junkio@cox.net> Sun, 17 Apr 2005 09:53:35 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 09:53:35 -0700

    [PATCH] update-cache --remove marks the path merged.
    
    When update-cache --remove is run, resolve unmerged state for
    the path.  This is consistent with the update-cache --add
    behaviour.  Essentially, the user is telling us how he wants to
    resolve the merge by running update-cache.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    
    Fixed to do the right thing at the end.
    
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 8f41523fc1a8cd127ff39fa111b3b5bb5105cc84
tree 09a4bda3819aee51dc12935ef7c5d0ecdef7856b
parent e44794706eeb57f2ee38ed1604821aa38b8ad9d2
author Junio C Hamano <junkio@cox.net> Sun, 17 Apr 2005 09:53:35 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 17 Apr 2005 09:53:35 -0700

    [PATCH] show-diff.c: do not include unused header file
    
    This is my bad.  I added #include <ctype.h> to the file,
    which I ended up not using and failed to remove it.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit c2bc1634ea7fe32d4c6e7e71124719a891bc8d15
tree 92116b0e70c967882274061e8d1cb41ef8bababa
parent 85eb3d54aeec1d0f4cf3d2de257b8d7e29816147
author Brad Roberts <braddr@puremagic.com> Sun, 17 Apr 2005 07:53:52 -0700
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 18:03:24 +0200

    [patch] Fix off by one error in show-diff.c:sq_expand
    
    Fix off by one error in sq_expand, forgot space for the null.
    
    Signed-off-by: Brad Roberts <braddr@puremagic.com>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 85eb3d54aeec1d0f4cf3d2de257b8d7e29816147
tree 5c769967ad14485c9430438c9b28789a93dfdf56
parent dde4739cd81822cc5aba3843f12d78b9a94a55e0
author Daniel Barkalow <barkalow@iabervon.org> Sun, 17 Apr 2005 10:37:37 -0400
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 17:49:26 +0200

    [5/5] Add commit-id to version
    
    For people who run intermediate versions of git, it is useful to know
    exactly which post-release version you've installed. This adds the
    commit-id to the version info, so you can tell exactly, provided you make
    sure to commit before installing.
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit dde4739cd81822cc5aba3843f12d78b9a94a55e0
tree 841c6be486f106fb988d2e7390f782c51d4c2b91
parent 287941e413c99f0cff673b00b75cfbfa13a36d43
author Junio C Hamano <junkio@cox.net> Sun, 17 Apr 2005 00:04:14 -0700
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 16:00:09 +0200

    [PATCH] Trivial typofix in file creation mode.
    
    This patch fixes an obvious typo whose consequence is rather
    disastrous in the file creation mode.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 287941e413c99f0cff673b00b75cfbfa13a36d43
tree f892674d7de8ef52a79e7fc756abe041b6c20905
parent eb1255d106026d3c32d4e9aea9ffb005bc907dd1
author Brad Roberts <braddr@puremagic.com> Sun, 17 Apr 2005 03:21:59 -0700
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 15:50:11 +0200

    [patch] fix for memory leak in write-tree.c
    
    Fix a memory leak in write-tree.c not freeing the directory buffer.
    
    Signed-off-by: Brad Roberts <braddr@puremagic.com>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit eb1255d106026d3c32d4e9aea9ffb005bc907dd1
tree 2ea9bc870e3b1c625790d2170658c46cf5a8d5cd
parent 43f566dc3b5be4c832735b9fd01f654e3edb3401
author Junio C Hamano <junkio@cox.net> Sat, 16 Apr 2005 21:56:29 -0700
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 15:31:25 +0200

    The patch to introduce shell safety to show-diff has an
    off-by-one error.  Here is an fix.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 43f566dc3b5be4c832735b9fd01f654e3edb3401
tree 41252bc5b45eddfc0a8827ce9bfcbbed284baede
parent de4c457fbac5ab8dfcaf72dea3611291317f1f8b
author Brad Roberts <braddr@puremagic.com> Sun, 17 Apr 2005 04:40:59 -0700
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 15:28:05 +0200

    [patch] fork optional branch point normazilation
    
    gitfork needs to normalize the optional third parameter before using it.
    
    Signed-off-by: Brad Roberts <braddr@puremagic.com>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit de4c457fbac5ab8dfcaf72dea3611291317f1f8b
tree cd9cadbb8d82251d80bfe9172ea7b651c5811ea6
parent 045a209bf8901357e9be1dd029aeffec92bbbea6
author Petr Baudis <pasky@ucw.cz> Sun, 17 Apr 2005 13:45:43 +0200
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 13:45:43 +0200

    Fix show-diff listing all +x files as differring.

commit 045a209bf8901357e9be1dd029aeffec92bbbea6
tree 08198cf70b3335a07f5f9b1a47c1b4732901e20f
parent 96e50584b763c151d5844f54c9421f2b0c5330cd
parent e44794706eeb57f2ee38ed1604821aa38b8ad9d2
author Petr Baudis <pasky@ucw.cz> Sun, 17 Apr 2005 13:41:49 +0200
committer Petr Baudis <xpasky@machine> Sun, 17 Apr 2005 13:41:49 +0200

    Merging: 85dd8bdfbbc6b1431230ebadc7e0af2ca94fed9f
    
    Merge with Linus. Includes modes handling sanitization (only +x difference
    matters now) and plenty of show-diff changes by Junio.

commit e44794706eeb57f2ee38ed1604821aa38b8ad9d2
tree c49cd3e4f1dfe4ccbf2b8d00188beaa251fee028
parent 9fec8b26eff58e1f595e8619abf1e42c07645ff8
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 22:26:31 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 22:26:31 -0700

    Be much more liberal about the file mode bits.
    
    We only really care about the difference between a file being executable
    or not (by its owner). Everything else we leave for the user umask to
    decide.

commit 9fec8b26eff58e1f595e8619abf1e42c07645ff8
tree 0776ebe16d603a16a3540ae78504abe6b0920ac0
parent d2522a6528a1212933e71c592950097bcfe64e7d
author Junio C Hamano <junkio@cox.net> Sat, 16 Apr 2005 21:29:45 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 21:29:45 -0700

    [PATCH] Do not run useless show-diff on unmerged paths repeatedly.
    
    When run on unmerged dircache, show-diff compares the working
    file with each non-empty stage for that path.  Two out of three
    times, this is not very helpful.  This patch makes it report the
    unmergedness only once per each path and avoids running the
    actual diff.
    
    Upper layer SCMs like Cogito are expected to find out mode/SHA1
    for each stage by using "show-files --stage" and run the diff
    itself.  This would result in more sensible diffs.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit d2522a6528a1212933e71c592950097bcfe64e7d
tree c9a4eba919aaf1bd98209dfaad43776fae171951
parent b70c8942d3fab4dff86461919a8c18eb3d020cea
author Junio C Hamano <junkio@cox.net> Sat, 16 Apr 2005 21:29:45 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 21:29:45 -0700

    [PATCH] show-diff style fix.
    
    This fixes some stylistic problems introduced by my previous set
    of patches.  I'll be sending my last patch to show-diff next,
    which depends on this cleanup.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit b70c8942d3fab4dff86461919a8c18eb3d020cea
tree 5d374ca6970d503b3d1a93170d65a02ec5d6d4ff
parent 9bd94cafdf104e613d7609401e60711cd08e209c
author Junio C Hamano <junkio@cox.net> Sat, 16 Apr 2005 21:29:45 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 21:29:45 -0700

    [PATCH] Rename confusing variable in show-diff
    
    The show-diff command uses a variable "new" but it is always
    used to point at the original data recorded in the dircache
    before the user started editing in the working file.  Rename it
    to "old" to avoid confusion.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 9bd94cafdf104e613d7609401e60711cd08e209c
tree 2660be985a85b5a96b9de69050375ac5e436c957
parent d94c6128e6df3161b111e7af73a7ef782eb4b63e
author Junio C Hamano <junkio@cox.net> Sat, 16 Apr 2005 21:29:45 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 21:29:45 -0700

    [PATCH] show-diff shell safety
    
    The command line for running "diff" command is built without
    taking shell metacharacters into account.  A malicious dircache
    entry "foo 2>bar" (yes, a filename with space) would result in
    creating a file called "bar" with the error message "diff: foo:
    No such file or directory" in it.
    
    This is not just a user screwing over himself.  Such a dircache
    can be created as a result of a merge with tree from others.
    
    Here is a fix.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit d94c6128e6df3161b111e7af73a7ef782eb4b63e
tree cc2df043a780ba35f1ad458d4710a4ea42fc9c17
parent b8f80925e3cdf229f03245f2ebb02323ddd98118
author Junio C Hamano <junkio@cox.net> Sat, 16 Apr 2005 21:29:45 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 21:29:45 -0700

    [PATCH] show-diff -z option for machine readable output.
    
    This patch adds the -z option to the show-diff command,
    primarily for use by scripts.  The information emitted is
    similar to that of -q option, but in a more machine readable
    form.  Records are terminated with NUL instead of LF, so that
    the scripts can deal with pathnames with embedded newlines.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit b8f80925e3cdf229f03245f2ebb02323ddd98118
tree 0e70cb482c7d76069b93da00d3fac97526b9aeee
parent 0f2303f71957ec68c92487f185435fbec6bd1c79
author Junio C Hamano <junkio@cox.net> Sat, 16 Apr 2005 21:29:45 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 21:29:45 -0700

    [PATCH] Optionally tell show-diff to show only named files
    
    SCMs have ways to say "I want diff only this particular file",
    or "I want diff files under this directory".  This patch teaches
    show-diff to do something similar.  Without command line
    arguments, it still examines everything in the dircache as
    before.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 96e50584b763c151d5844f54c9421f2b0c5330cd
tree 0e076e7d0f8e7f3fa827cf4a693fd511d10ef9d6
parent 780c71c5beb005d1450c3662c78a4af4c2a1f20c
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 23:27:23 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 23:27:23 +0200

    Fix a tiny mistake in README - s/addbranch/addremote/.
    Pointed out by Bram Cohen.

commit 780c71c5beb005d1450c3662c78a4af4c2a1f20c
tree 7ef6e31ff51ae7a6511fd35fd423679e29e4bab4
parent a9138408dea37f51bc9795014ada83001b60e4be
parent eec8c633c117c83a9fd2be7054b169d3cee5806d
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 23:26:24 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 23:26:24 +0200

    Merging: 8165e68ff7258e8e49f8462553def0763c281036
    
    Merge with Linus. We are getting the new cool index-merge
    (but I will need to update git merge to use it).

commit 0f2303f71957ec68c92487f185435fbec6bd1c79
tree e022421aad3c90ef550eaa69b388df25ceb1686b
parent eec8c633c117c83a9fd2be7054b169d3cee5806d
author Junio C Hamano <junkio@cox.net> Sat, 16 Apr 2005 13:57:39 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 13:57:39 -0700

    [PATCH] Un unoptimize ls-tree behaviour
    
    ls-tree unconditionally called read_sha1_file() for all paths
    even when not needed, which was a mistake introduced by me.
    Rectify this by first checking S_ISDIR(mode) and read the tree
    contents only when it is a tree and we are recursive.  There is
    no need to read it in any other cases.
    
    The patch also removes the confusing comment that led to this
    incorrect implementation.
    
    Thanks to Peter Baudis for noticing this problem.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit a9138408dea37f51bc9795014ada83001b60e4be
tree b409c90fa06c778236fb3cf1f05183002cc9cecb
parent dee8276bdeb0102984ceb19a99ab0e42df23d916
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 22:45:24 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 22:45:24 +0200

    s/me/commit/ in git log output.

commit eec8c633c117c83a9fd2be7054b169d3cee5806d
tree 59c9ea857e563de5e3bb27f0cb6133a6f22c8964
parent 2fbdd1317480d2f14756d94e41a8eb07442d4841
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 12:43:32 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 12:43:32 -0700

    Add "--unmerged" flag to "show-files", which does what the name implies.
    
    The flag also implies "--stage", since unmerged file information doesn't
    make sense without the full output.

commit 2fbdd1317480d2f14756d94e41a8eb07442d4841
tree a851ce1b68aad8616fd4eed75dc02c3de77b4802
parent 7b937ca33142ff5ecc655f2be61678a512352122
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 12:24:12 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 12:24:12 -0700

    Remove "merge-tree.c"
    
    It's there in the history if somebody wants to resurrect it, but it
    seems to have been successfully superceded by the new and improved
    index-merge thing, where we do all merging entirely in the index.

commit 7b937ca33142ff5ecc655f2be61678a512352122
tree cf88c1fea1b31ac3c7a9606681672c64d4140b79
parent 43f91266a493c4888b4ff2a7997ccc4a381e7238
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 12:05:45 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 12:05:45 -0700

    When inserting a index entry of stage 0, remove all old unmerged entries.
    
    This allows you to actually tell git that you've resolved a conflict.

commit 43f91266a493c4888b4ff2a7997ccc4a381e7238
tree 26f176413928139d69d2249c78f24d7be4b0d9fd
parent aee461985f52857fa04999b2a988986dd8c84aba
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 09:11:49 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 09:11:49 -0700

    Make 'read-tree' do a few more of the trivial merge cases.
    
    This cuts down the work for the "real merge" to stuff where
    people might actually disagree on the algorithm. The trivial
    cases would seem to be totally independent of any policy.

commit aee461985f52857fa04999b2a988986dd8c84aba
tree b474d669fad6d037c18c0d232aef579a65ae101b
parent fcf712e60e3221a7971cb2ad89e61c565172f524
author Junio C Hamano <junkio@cox.net> Sat, 16 Apr 2005 08:33:23 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 08:33:23 -0700

    [PATCH] Add --stage to show-files for new stage dircache.
    
    This adds --stage option to show-files command.  It shows
    file-mode, SHA1, stage and pathname.  Record separator follows
    the usual convention of -z option as before.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit fcf712e60e3221a7971cb2ad89e61c565172f524
tree a4944100a4832f8fce1494e2e8cbea74e349f731
parent d99082e0e3436f5fcf259aa1a4189473f6bb5ce3
author Junio C Hamano <junkio@cox.net> Sat, 16 Apr 2005 08:30:20 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 16 Apr 2005 08:30:20 -0700

    [PATCH] Byteorder fix for read-tree, new -m semantics version.
    
    The ce_namelen field has been renamed to ce_flags and split into
    the top 2-bit unused, next 2-bit stage number and the lowest
    12-bit name-length, stored in the network byte order.  A new
    macro create_ce_flags() is defined to synthesize this value from
    length and stage, but it forgets to turn the value into the
    network byte order.  Here is a fix.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit dee8276bdeb0102984ceb19a99ab0e42df23d916
tree 48a665c0fc14baffb5940f310fb3c026a64b1fc7
parent ca5385acec502278943ace3b19632f96091ebd53
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 16:41:57 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 16:41:57 +0200

    Add rsync and s/OpenSSL/libssl/ (GNUTLS should do too) in the
    dependencies list. Idea my Martin Mares.

commit d99082e0e3436f5fcf259aa1a4189473f6bb5ce3
tree 8156e162365f85a1712373132bd8bb3ba0209537
parent 95fd5bf82ae28da47dcbf8e6e4570e64d71dc532
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 22:53:45 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 22:53:45 -0700

    Make "read-tree" merge the trees it reads by giving them consecutive states.
    
    Normally you'd use state 0 for the "merged" state, and start out with
    state 1 being "origin", state 2 being "first tree" and state 3 being
    "second tree".
    
    Once all the index entries are back in state 0, we have a successful
    merge and can write the result tree back.

commit 95fd5bf82ae28da47dcbf8e6e4570e64d71dc532
tree 192f84588c8e47a2d8ca3d0c6e50641b7a2491b8
parent c347ea5d6fc6bae6b6ea3196013c4df7ec4406a8
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 22:51:44 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 22:51:44 -0700

    Make cache entry comparison take the new "state" flag into account.
    
    This is what allows us to have multiple states of the same file in
    the index, and what makes it always sort correctly.

commit c347ea5d6fc6bae6b6ea3196013c4df7ec4406a8
tree 905781d15f6cb171e9c4360465905c7c27f835ee
parent f5cabd13d814bb5c547a13af03bcc42122531141
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 22:04:54 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 22:04:54 -0700

    write-tree: refuse to write out trees with unmerged index entries.
    
    Of course, we can't even generate such an index yet, but give me
    some time. This is a cunning plan. Let's see if it actually works.
    
    (I feel like Wile E Coyote, waiting for the big rock to fall).

commit f5cabd13d814bb5c547a13af03bcc42122531141
tree 6795adc096e36c7a7f8e6a407297727e61d4d083
parent 13e897e58072678cdae3ec1db51cc91110dc559d
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 21:45:38 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 21:45:38 -0700

    Encode a few extra flags per index entry.
    
    This will allow us to have the same name in different "states" in the
    index at the same time. Which in turn seems to be a very simple way to
    merge.

commit 13e897e58072678cdae3ec1db51cc91110dc559d
tree f2745cc464cc08214719d9f6ac71fdda9d6417a9
parent d07f651c25ce3980e9519872f772af12a12c8d26
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 21:42:34 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 21:42:34 -0700

    Simplify show-diff cache entry name handling.
    
    The cache-entry names are all proper strings, no need to worry about
    their length.

commit ca5385acec502278943ace3b19632f96091ebd53
tree dd40f9cef51dd9d34737a45cea90eb2c4fcd4c80
parent e100cb33eb31f9033ed87533346d0823dcb16fab
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 04:32:40 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 04:32:40 +0200

    Massive cleanup of git export. It now also makes use of git lntree
    and avoids messing with our precious current working tree index.

commit e100cb33eb31f9033ed87533346d0823dcb16fab
tree 4e0fda4120afabd2d3ea5b087bde548c1f614277
parent c5f589a5b88a413828b18db7a53bfd603d50ef12
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 04:27:06 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 04:27:06 +0200

    Fixed mising TREE_ID parameter for git export in the help.

commit d07f651c25ce3980e9519872f772af12a12c8d26
tree 420f7beb8c3b0e8b7a5e6e8dad92e1246e1dcfb3
parent 6cbd72f8d5d794112eab68f7e7222c9a0c5d6587
author Junio C Hamano <junkio@cox.net> Fri, 15 Apr 2005 19:20:42 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 19:20:42 -0700

    [PATCH] Add '-z' to merge-tree.c
    
    This adds '-z' to merge-tree and changes its default line termination to
    LF to make it consistent with your other recent changes. 
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit c5f589a5b88a413828b18db7a53bfd603d50ef12
tree 12969901d0828751e0854ccf67e5f9226f8d2d7a
parent 05c41f4daacf5bb810ae7c7433e237081e444a86
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 04:17:54 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 04:17:54 +0200

    Added git branch, which will take a given commit and set up a branch
    pointing to it, or set up a branch pointing to the current commit
    and set the tree to follow that branch.

commit 05c41f4daacf5bb810ae7c7433e237081e444a86
tree 54531b3d36390a6485bff3eba9bf7f46fccd6a5a
parent 70aa2961a2ca4163c231b4e6837cc70aaf13aa26
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 04:09:18 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 04:09:18 +0200

    The sanity check testing whether we actually move between different
    commits in git update now wraps only the moving of the tree itself,
    the HEAD retargetting is always done. This is because you can have
    e.g. two branches having the same commit as their head, but after
    git up branch2 you want your working tree HEAD following branch2.

commit 70aa2961a2ca4163c231b4e6837cc70aaf13aa26
tree e6cf71ccfb02ec9e0471f282da87ab8fdb491fc0
parent 46167b1f7d10fa1c49f837400bc94ae4ba85d53a
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 04:02:44 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 04:02:44 +0200

    Introduced git update, by which you can "seek" to an arbitrary
    commit with your working tree.

commit 46167b1f7d10fa1c49f837400bc94ae4ba85d53a
tree b51d912d9fc2eef17bcff852ead3b15bf34b194f
parent 9578923e82774b8a0c6637ce914d89b1ceb9d068
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 03:43:42 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 03:43:42 +0200

    git fork now optionally takes the commit ID to set HEAD to.

commit 9578923e82774b8a0c6637ce914d89b1ceb9d068
tree 8ca5b64ad8d6fb14f51776a53c19208d1682536b
parent 9c3408f6b1795e3033b63289950922eceaea4300
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 03:26:00 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 03:26:00 +0200

    Fixed chmod applying in git apply. Inspired by Martin Schlemmer.

commit 9c3408f6b1795e3033b63289950922eceaea4300
tree 12b013ce3361ce82faf003c469d2ddd01ef5f385
parent c988b7025a140e5f447ffaae85b2e6966f1a29ac
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 03:16:15 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 03:16:15 +0200

    Fixed adding of files in git apply - now -p1 is correctly applied
    on their names.

commit c988b7025a140e5f447ffaae85b2e6966f1a29ac
tree 87871fcdd38070a90fd4b8e01bdd6dc963cf3d79
parent cfd6fb2d6502685619c064e4495acfae22055fcf
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 03:13:14 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 03:13:14 +0200

    Make the "git" multiplexer work even outside of a GIT working
    tree, so that we can actually do git init or git clone.

commit cfd6fb2d6502685619c064e4495acfae22055fcf
tree 6183e657dc5f6266c6c5b4362affff75eec3e9f3
parent 3c4347c8b64fb516bc097ab174c3247113b7603d
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 03:12:33 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 03:12:33 +0200

    Added git clone command, for cloning remote GIT repositories.
    It clones a repository, naming the remote repository "origin",
    checking it out and making the master tree tracking it.

commit 3c4347c8b64fb516bc097ab174c3247113b7603d
tree 01afbfadf2861dd24659ebb138a8a06955712278
parent 555492e0af080c7c7beea920ddbea6e31d15838a
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 02:57:24 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 02:57:24 +0200

    Added git fork, which will create a new branch in a given new
    directory, with the object cache shared with your current branch.
    The "first" branch originating from the object cache is called
    "master". .git/HEAD is now just a symlink to .git/heads/$branch.

commit 555492e0af080c7c7beea920ddbea6e31d15838a
tree 0d1f342544590e9dffe667d11c778693403359ba
parent 88a95e5d99d76a60f2d9205d6d1dae719a01a9ce
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 02:37:56 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 02:37:56 +0200

    git addremote and git pull now take some time to verify the name
    of the branch the user passes them.

commit 88a95e5d99d76a60f2d9205d6d1dae719a01a9ce
tree 6017b511fb59ce7c4627b6619c88653071118a66
parent 979d2bebbfb99a45557e39b1759c17951dff5da4
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 02:14:58 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 02:14:58 +0200

    Manage .git/HEAD carefully enough so that it could be a symlink.

commit 979d2bebbfb99a45557e39b1759c17951dff5da4
tree 1b127e97e912d4fcf56475a6a4065f07efc18b48
parent c02b5f40ede96875a4dd02af1c2428f86a1483fa
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 02:07:52 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 02:07:52 +0200

    Revert the active_cache leak "fix" in update-cache.
    active_cache members may be mmap()ed.

commit c02b5f40ede96875a4dd02af1c2428f86a1483fa
tree a48a9d415094437f7ca04e5b7299bd9a56084855
parent b571edd2109fb4c6abdde65208dfaaa07439f075
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 02:02:44 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 02:02:44 +0200

    Fixed compilation error with -DNSEC in read-cache.

commit b571edd2109fb4c6abdde65208dfaaa07439f075
tree a00c765ec90012b30c9459f273ef1fb180a2585a
parent f8a519f3e81db177386e25aea4bf938ef47b5d16
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 01:47:16 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 01:47:16 +0200

    Plug memory leak in update-cache (w.r.t. active_cache tracking).
    Inspired by Martin Schlemmer.

commit f8a519f3e81db177386e25aea4bf938ef47b5d16
tree 819ff9a637e558d5b2d83f93dd940f2c861a1b1f
parent 9048424ffca2d0b0867d5832b0972c254ad7294e
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 01:38:50 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 01:38:50 +0200

    Oops, fixed forgotten bit from the latest merge with Linus.
    diff-tree usage changes, so updated the scripts to match it.
    Also add missing -r in the diff-tree invocation.

commit 9048424ffca2d0b0867d5832b0972c254ad7294e
tree aecfb67054b2da4563f8c9f62d4c86cfa6116ecb
parent dccaf320048d1d6049f916de148ec8084c317239
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 01:35:58 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 01:35:58 +0200

    Synchronize the usage string in diff-tree.

commit dccaf320048d1d6049f916de148ec8084c317239
tree 8adf376e7bca01372d2016a66229c6ece43d2912
parent a82e6d5c50ac5bbadde80a89d438adb480979eb3
parent 6cbd72f8d5d794112eab68f7e7222c9a0c5d6587
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 01:33:28 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 01:33:28 +0200

    Merging: 028c5948257e763b3deb391e567b624eb7975ec2
    
    Merge with Linus.

commit a82e6d5c50ac5bbadde80a89d438adb480979eb3
tree fe90dd9718147d4352b19ab693df9474f77768f9
parent 63998f82fe50e8685c2e43c37e88f2087f8d8947
author Petr Baudis <pasky@ucw.cz> Sat, 16 Apr 2005 00:25:20 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 00:25:20 +0200

    In git commit, pass the arguments to update-cache through xargs
    since there may be a *lot* of them.
    
    Pointed out by Mike Taht <mike.taht@timesys.com>.

commit 63998f82fe50e8685c2e43c37e88f2087f8d8947
tree e4a56fa726d32066451c453724e59bb101078897
parent 97ec569cb33a76114f5836648892a44a3cfe255f
author Pavel Roskin <proski@gnu.org> Thu, 14 Apr 2005 23:35:00 -0400
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 00:12:09 +0200

    [PATCH] Misc fixes for git-pasky
    
    * cache.h: Include unistd.h.  Needed for close() definition.  While
    current zlib.h header includes unistd.h, it's not guaranteed to be so in
    other zlib versions.
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>

commit 6cbd72f8d5d794112eab68f7e7222c9a0c5d6587
tree 75a725933087584bb4de417b38588f2b3dcc2943
parent ca2a0798656aa1219c6ff4fa66cd0f3340ddd5be
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 15:11:57 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 15:11:57 -0700

    Make "diff-tree" have similar behaviour as "ls-tree" wrt line termination.
    
    Default to the human-readable '\n', but make the scriptable "-z" flag
    do the old '\0' behaviour.

commit 97ec569cb33a76114f5836648892a44a3cfe255f
tree 9a13a17e6852448996971d5fb0dcc983d61837b2
parent b8a35dac0842253fdb8a68341157f0a50c6641bf
author Pavel Roskin <proski@gnu.org> Thu, 14 Apr 2005 23:35:00 -0400
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 00:10:32 +0200

    [PATCH] Misc fixes for git-pasky
    
    * README: spell checked
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>

commit b8a35dac0842253fdb8a68341157f0a50c6641bf
tree 6642357975f3e6e3330253890cde2867b54d91ea
parent 552c2d23982fb36812e10fc7ce7a25453bdfd9e2
author Pavel Roskin <proski@gnu.org> Thu, 14 Apr 2005 23:35:00 -0400
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 00:09:04 +0200

    Convert a C++ comment to C one, for consistency.
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>

commit ca2a0798656aa1219c6ff4fa66cd0f3340ddd5be
tree b9be893a0014c33d0b825cd9588566825c129a4b
parent b83c83457eb647a54fee7dd8a89f1787226c1be7
author Junio C Hamano <junkio@cox.net> Fri, 15 Apr 2005 15:08:09 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 15:08:09 -0700

    [PATCH] Add "-q" option to show-diff.c
    
    This adds the '-q' option for show-diff.c to squelch complaints for
    missing files.
    
    It is handy if you want to run it in the merge temporary directory after
    running merge-trees with its minimum checkout mode, which is the
    default, because you would not find any files other than the ones that
    needs human validation after the merge there. 
    
    It also fixes the argument parsing bug Paul Mackerras noticed in
    <16991.42305.118284.139777@cargo.ozlabs.ibm.com> but slightly
    differently.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 552c2d23982fb36812e10fc7ce7a25453bdfd9e2
tree dd4d28b2441359c1ba0919aca5fe625d9012dd57
parent 78a53747f23c644fba092039d784a6c510483c83
author Pavel Roskin <proski@gnu.org> Thu, 14 Apr 2005 23:35:00 -0400
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 00:08:07 +0200

    [PATCH] Misc fixes for git-pasky
    
    * show-diff.c: Fix handling of more than one option of the command line.
    
    Signed-off-by: Pavel Roskin <proski@gnu.org>

commit 78a53747f23c644fba092039d784a6c510483c83
tree 78af2de2f8bd0d32940074d53b79dfab4778cadd
parent 3aa00f4f0e14b374b43ddb7fbe947351a310af46
author Martin Schlemmer <azarah@nosferatu.za.org> Fri, 15 Apr 2005 10:28:38 +0200
committer Petr Baudis <xpasky@machine> Sat, 16 Apr 2005 00:05:15 +0200

    Enter commit message, terminated by ctrl-D on a separate line:
    The egrep regex should not escape the '{' and '}', and also add a check
    for ' \t' so that we do not pickup stuff like '+----', etc.  Fix typo in
    assignment.  Fix typo in line removing temp files.
    
    Signed-off-by: Martin Schlemmer <azarah@gentoo.org>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 3aa00f4f0e14b374b43ddb7fbe947351a310af46
tree 9eb2b6e003ab3a28388fafd346d8bf01ba95afcb
parent eea8899407c9431bb825e5fe64ce6ad25bfcb5f0
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 23:19:36 +0200
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 23:19:36 +0200

    "this" is now synonymous to an empty string in commit/tree IDs.

commit eea8899407c9431bb825e5fe64ce6ad25bfcb5f0
tree c3620c22d1a14382dd7a9d6805fe1aca60cffca4
parent 278beed70d791503e9022fa38b33cc594c9fdd83
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 22:52:08 +0200
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 22:52:08 +0200

    Add OpenSSL to the software dependencies list. Pointed out by Pavel Machek.

commit 278beed70d791503e9022fa38b33cc594c9fdd83
tree 1b57efd0bd90f6eade2f502f461463f985c967d2
parent 4c3af1e307abdb6969214e031071e17992b52805
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 21:43:07 +0200
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 21:43:07 +0200

    git merge now accepts -a parameter specifying that it should
    do a complete checkout in the temporary merge tree.
    

commit 4c3af1e307abdb6969214e031071e17992b52805
tree cd8a0010533870bfd8f48af40b8f2ab0ed8b0c7a
parent ab2c262ca56d8495884169762223528a1692913d
parent b83c83457eb647a54fee7dd8a89f1787226c1be7
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 21:40:28 +0200
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 21:40:28 +0200

    Merging: 461aef08823a18a6c69d472499ef5257f8c7f6c8
    
    Merge with Linus. This is big since it involves plenty of changes
    w.r.t. the endianity - mostly different identifier names.

commit ab2c262ca56d8495884169762223528a1692913d
tree edda58ad570cfe4a2fd737f663600c780ea97d17
parent cb28ed06518622946894ee00237cf84914fafdc8
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 21:02:14 +0200
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 21:02:14 +0200

    Introduced git init, which will initialize a fresh repository properly.

commit cb28ed06518622946894ee00237cf84914fafdc8
tree 59a9389108a32de2e309059397846a447e907b40
parent a9bf931ec1d28f3dddec58e6126aecfa14865a0d
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 20:23:27 +0200
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 20:23:27 +0200

    git commit now checks for empty commits (involving call for $(tree-id)
    which requires HEAD) only if not doing the initial commit.

commit a9bf931ec1d28f3dddec58e6126aecfa14865a0d
tree 44dc407350d375a845cfe9827768f98c7af433d1
parent f9e73d7437804b305bb79ec059954df12a1f4451
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 20:18:53 +0200
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 20:18:53 +0200

    git commit now does fine even in the absence of HEAD. That is the
    case for the initial commit.

commit b83c83457eb647a54fee7dd8a89f1787226c1be7
tree 07c2d8f92d55b9ab885c10bfa862e652dcc40ee5
parent 9945d9805130fdb752a91fcfae7084b219b9dec3
author Junio C Hamano <junkio@cox.net> Fri, 15 Apr 2005 11:11:01 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 11:11:01 -0700

    [PATCH] Add -z option to show-files
    
    This adds NUL-terminated output (-z) to show-files.  This is necessary
    for merge-trees script to deal with filenames with embedded newlines.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 9945d9805130fdb752a91fcfae7084b219b9dec3
tree 1e474a8671630eca49f3a94145045903a22ffed1
parent ccc4feb579265266d0a4a73c0c9443ecc0c26ce3
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 11:08:33 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 11:08:33 -0700

    Add "--cacheinfo" option to update-cache.
    
    This allows scripts to manually add entries to the cache explicitly.
    
    Need to do some way to remove them too, even if the path exists.

commit ccc4feb579265266d0a4a73c0c9443ecc0c26ce3
tree 9999cff451d3a833ca39981d6868fdb452449f13
parent 27de946d0ee70fad497253bbaab76d2fa7b1c77c
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 10:44:27 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 10:44:27 -0700

    Convert the index file reading/writing to use network byte order.
    
    This allows using a git tree over NFS with different byte order, and
    makes it possible to just copy a fully populated repository and have
    the end result immediately usable (needing just a refresh to update
    the stat information).

commit f9e73d7437804b305bb79ec059954df12a1f4451
tree 5aaa629bcb0ffa32531aecd0ec4016149873fa13
parent b218f7c1a08f1c7150ae9684376947d253a997a2
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 18:27:43 +0200
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 18:27:43 +0200

    Put HEAD to the temporary merge tree, so that we can do git log
    and stuff there.

commit b218f7c1a08f1c7150ae9684376947d253a997a2
tree 8d2240257f47574f68cbfbf67de08456b5f297f3
parent dede46d80dcc439995e7d7118163ad88d982a2b5
parent 27de946d0ee70fad497253bbaab76d2fa7b1c77c
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 19:10:04 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 19:10:04 -0700

    Merging: 14d1dd18e3fdf7225ded957e916b8890045232ce
    
    Merge with Linus.

commit dede46d80dcc439995e7d7118163ad88d982a2b5
tree b742f1cb15b82c0a1c9c383378d105db7a8397fa
parent cf3d601af32ddc437fb3134d35fc7a3df08f780f
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 19:04:01 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 19:04:01 -0700

    Fixed write-tree's directory handling, introduced by me at some point
    in the past. Pointed out by Junio C Hamano.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 27de946d0ee70fad497253bbaab76d2fa7b1c77c
tree 53cbeeb5b30e9a9e0759fad94a9e2d24aaeff53d
parent aa1c48df8172f844455cc12f25aa49be8ffdd828
author David Woodhouse <dwmw2@infradead.org> Fri, 15 Apr 2005 08:39:57 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 08:39:57 -0700

    [PATCH] Simplify date handling and make it more reliable
    
    This make all dates be stores as seconds since UTC epoch, with the
    author's or committer's timezone as auxiliary data so that dates can be
    pretty-printed in the original timezone later if anyone cares.  I left
    the date parsing in rev-tree.c for backward compatibility but it can be
    dropped when we change to base64 :)
    
    commit-tree now eats RFC2822 dates as AUTHOR_DATE because that's
    what you're going to want to feed it.
    
    Yes, glibc sucks and strptime is a pile of crap. We have to parse it
    ourselves.
    

commit aa1c48df8172f844455cc12f25aa49be8ffdd828
tree 0965df45db7cf28dba93b554bdf26b61e8b950f7
parent 33deb63a36f523c513cf29598d9c05fe78a23cac
author Junio C Hamano <junkio@cox.net> Fri, 15 Apr 2005 08:37:05 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 15 Apr 2005 08:37:05 -0700

    [PATCH] ls-tree enhancements
    
    This adds '-r' (recursive) option and '-z' (NUL terminated)
    option to ls-tree.  I need it so that the merge-trees (formerly
    known as git-merge.perl) script does not need to create any
    temporary dircache while merging.  It used to use show-files on
    a temporary dircache to get the list of files in the ancestor
    tree, and also used the dircache to store the result of its
    automerge.  I probably still need it for the latter reason, but
    with this patch not for the former reason anymore.
    
    It is relative to bb95843a5a0f397270819462812735ee29796fb4
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>
    

commit cf3d601af32ddc437fb3134d35fc7a3df08f780f
tree a408a75edaec3f9a198558512e714022995da505
parent d9b789f2055c480cf00202b685a717bb940fed7c
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 02:46:58 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 02:46:58 -0700

    git cancel now also removes any files which were git add'd.

commit d9b789f2055c480cf00202b685a717bb940fed7c
tree 56a6c4e835c451f38db4e23fcfcdc855e6c489ce
parent e971610bc5d7547338a41674dfaea94ab92a8ac0
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 02:43:15 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 02:43:15 -0700

    Fixed git cancel to do the right thing in the temporary merge
    trees (which is completely different to what it does normally).
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit e971610bc5d7547338a41674dfaea94ab92a8ac0
tree 5a062f84abcc69a46b80b0fe865339cd4da77230
parent a47cd4220fffeef86d962e45a9f86482c8a8e9e2
author Martin Schlemmer <azarah@nosferatu.za.org> Wed, 31 Dec 1969 16:59:59 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 02:15:33 -0700

    Rather use checkout-cache to sync our tree, as should do the right thing
    instead of diffing (cancel imply just blow away everything).
    
    Signed-off-by: Martin Schlemmer <azarah@nosferatu.za.org>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit a47cd4220fffeef86d962e45a9f86482c8a8e9e2
tree 32f07cebd6eba7182c847bccb822e419d7513cfd
parent 14ebb908e10f068dc1901d35f4b716bc69143d19
author Daniel Barkalow <barkalow@iabervon.org> Wed, 31 Dec 1969 16:59:59 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 02:11:47 -0700

    [PATCH] Clean up Makefile
    
    Use a pattern rule for building executables, and a list of common objects
    (which could be made into a library).
    
    Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 14ebb908e10f068dc1901d35f4b716bc69143d19
tree 943f7212b3f27d06e9c896046187dab93f49f4e5
parent f6a032645736266f53d2cfeb3bae695b0d1ba400
author Darren Williams <dsw@gelato.unsw.edu.au> Wed, 31 Dec 1969 16:59:59 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 01:55:16 -0700

    [PATCH] Git pasky include commit-id in Makefile
    
    Currently the commit-id script is not install with
    make install, this patches includes it in the SCRIPT
    target. This patch is against git-pasky-0.4
    
    Signed-off-by Darren Williams <dsw@gelato.unsw.edu.au>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit f6a032645736266f53d2cfeb3bae695b0d1ba400
tree 6ba3f15c037be7464d26e27d939e1e4b91c7cf4e
parent 781754a0084743c84a0cf7d7e89386e3ed8b598f
author Martin Schlemmer <azarah@nosferatu.za.org> Wed, 31 Dec 1969 16:59:59 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 01:52:19 -0700

    [patch pasky] refresh cache after changing tracked tree
    
    I see the latest gitdiff-do does the right thing regarding modes, but we
    still need to refresh the cache.
    
    
    Signed-off-by: Martin Schlemmer <azarah@nosferatu.za.org>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 781754a0084743c84a0cf7d7e89386e3ed8b598f
tree 8a1be3865d3d90747d4aec86e1188e39d55042ef
parent cd4f9fea7fa43ba2ecb8512fcdeab51ff42a9c10
author Russell King <rmk@arm.linux.org.uk> Wed, 31 Dec 1969 16:59:59 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 01:28:41 -0700

    Change the cache directory endianity to the "network" order
    (big endian) from host-dependent. This makes it possible to share
    it between boxes with different architectures (e.g. over NFS).
    
    This means that after getting this, you will have to rebuild
    your cache, e.g. with
            read-tree $(tree-id)
            update-cache --refresh
    Sorry, but there was no other (sensible) way.
    
    Signed-off-by: Russell King <rmk@arm.linux.org.uk>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit cd4f9fea7fa43ba2ecb8512fcdeab51ff42a9c10
tree 8ff75438943f2d30ec7bc3823c3fefabc834bf42
parent af5e60e9d6016fc7ed092a43e8064020c7bc5514
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 01:13:41 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 01:13:41 -0700

    Use st_[cm]time instead of st_[cm]tim.tv_sec. This should make git
    compile even on systems with non bleeding edge libc.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit af5e60e9d6016fc7ed092a43e8064020c7bc5514
tree 6d456383d350c19f65944649f869fc373906f6e2
parent 9b7b2e669c9b8d1c770c68379476a896946eb822
author Tony Luck <tony.luck@intel.com> Wed, 31 Dec 1969 16:59:59 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 01:02:26 -0700

    [PATCH 1/1] git: remove redundant getenv() in init-db
    
    init-db calls getenv(DB_ENVIRONMENT) twice.  Once should be enough.
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 9b7b2e669c9b8d1c770c68379476a896946eb822
tree da770c088b12d615424e2313623b658c7bb4c595
parent 366abd66359bfdf9622282f6cdd827b46a8f4bb6
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 00:54:33 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 00:54:33 -0700

    Poor man's support for out-of-tree merges.
    
    git merge now creates a ,,merge subdirectory, where it checks out only
    the modified files. You finish the merge there and then do git commit
    in that subdirectory to record it. Your working directory will be
    updated automatically.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 366abd66359bfdf9622282f6cdd827b46a8f4bb6
tree 61b4f50565f5df324e45175b2dcebe1ee7a33134
parent ca16a9df3222bc970134b4128d63e24a6ffa3290
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 00:47:34 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 00:47:34 -0700

    Fix swapped +++ and --- lines processing in git apply.
    I can't imagine how did it actually slip through so far.
    It *seemed* to do the right thing, but git merge unleashed
    the deficiency thankfully.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit ca16a9df3222bc970134b4128d63e24a6ffa3290
tree 2e8da9574b52a169d1f33ff43c630033e7c6ca69
parent 86b85b2ade7ab281b8084d890b852f7618a1b59f
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 00:46:01 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 00:46:01 -0700

    Oops, forgotten bit of merge with Linus. My merging tool is still
    buggy. ;-)

commit 86b85b2ade7ab281b8084d890b852f7618a1b59f
tree b57ba69782392fcaf432bd3b4a8909dce3e532ff
parent b62947786772db6435b9aea81e9bfeba4b790410
parent 33deb63a36f523c513cf29598d9c05fe78a23cac
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 00:32:47 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 00:32:47 -0700

    Merging: bb95843a5a0f397270819462812735ee29796fb4
    
    Merge with Linus.

commit b62947786772db6435b9aea81e9bfeba4b790410
tree 8fd59c4f95631d70ba3a8381cea2b37932fc013f
parent 23b99aee717cf9a0be656f83adf867983668d78e
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 00:31:35 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 00:31:35 -0700

    When show-diff is passed -q, it does not even output the ENOENT
    error message for non-existing files - being really silent about
    them.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 23b99aee717cf9a0be656f83adf867983668d78e
tree 48ba43e5eea7ad7afa9b38bf131a4dfd926e0501
parent ee7bcf6d7aeb805bfdaf81b9d01ab744b36ed439
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 00:28:50 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 00:28:50 -0700

    Change the -r option of show-diff to -q, as agreed on the ml.
    (-r could imply recursivity.)
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit ee7bcf6d7aeb805bfdaf81b9d01ab744b36ed439
tree fc11af5002bf6eb8daa1fdd4ce50baf4b0c30aff
parent 4d15081c47b2d5c80929f209ed22bd639e152295
author Junio C Hamano <junkio@cox.net> Wed, 31 Dec 1969 16:59:59 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 00:19:27 -0700

     * show-diff updates to add -r flag to squelch diffs for files not in
       the working directory.  This is mainly useful when verifying the
       result of an automated merge.
    
    Signed-off-by: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 4d15081c47b2d5c80929f209ed22bd639e152295
tree 97f55280c1b2f030b49898710d4602e0b2bc5266
parent 383315dcb8c48364b472c886591ad785675b3b4a
author Petr Baudis <pasky@ucw.cz> Fri, 15 Apr 2005 00:12:19 -0700
committer Petr Baudis <xpasky@machine> Fri, 15 Apr 2005 00:12:19 -0700

    git apply: Fixed touching of files removed by patch. All files
    deleted relative to the index would be touched before.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 383315dcb8c48364b472c886591ad785675b3b4a
tree 5ce679dcf6337a5ba1c6d753be0f4ba9abd38ce5
parent cd1777f1963014e02fba6cd0d3b72b704330a606
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 23:56:34 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 23:56:34 -0700

    Oops. When invoking sh -c, the parameters are numbered from zero,
    not from one! Compensate for that in git apply's | xargs sh -c.

commit cd1777f1963014e02fba6cd0d3b72b704330a606
tree 4d3fa733188d14e65b06ab833c245752fde9b2f3
parent 8b17d354c7e5c9b0abb6f46466cb11d76fce0ca6
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 13:18:26 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 13:18:26 -0700

    Introduced git lntree, which makes a different view of the current
    GIT repository, symlinking to it.

commit 8b17d354c7e5c9b0abb6f46466cb11d76fce0ca6
tree eceab44c579416592f5c71fb6a9cdf7cdf737d7b
parent b0bb73f33fc06cc5ff6fca0d2dfce484c5f191b7
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 12:51:35 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 12:51:35 -0700

    git tag now defaults to HEAD if not passed commit ID.

commit b0bb73f33fc06cc5ff6fca0d2dfce484c5f191b7
tree ae8aa80b91cb37654b41cc69440f4a6fdac2f66d
parent f9e7d46d571aa8f12fa789e9d990ef5b8dc797b8
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 03:07:24 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 03:07:24 -0700

    git-pasky-0.4

commit f9e7d46d571aa8f12fa789e9d990ef5b8dc797b8
tree 921df90487c4377215396fc6f3cede46bb541439
parent 14ec865aa9e11f614d78f06595839c8ed31abd72
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 03:06:06 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 03:06:06 -0700

    Kill gitversion.sh, which is autogenerated and was added errorneously.

commit 14ec865aa9e11f614d78f06595839c8ed31abd72
tree e05417ba8007b53e2baf3b9a2444f0dc1dc190bd
parent dbdc6b7ec7bff6e681adff349b19520121ed2f10
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 03:04:31 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 03:04:31 -0700

    Re-fix one fd leak in the case of a collision conflict (or fstat() failure).
    Not that it would matter that much.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit dbdc6b7ec7bff6e681adff349b19520121ed2f10
tree ba79d451b3fb8f639729294eb626697e2a90e338
parent ed6b846c8f269c768eebd49522eb8b83b214320f
parent f864ba7448564d06e8076d1b6a66eca00a337d8c
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 03:02:12 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 03:02:12 -0700

    Merging: 39021759c903a943a33a28cfbd5070d36d851581
    
    Merge with Linus.

commit ed6b846c8f269c768eebd49522eb8b83b214320f
tree 68be6314f8ff784f980125c627887beccfd92650
parent 119c8227c7578500b78217b4df9863517548be2c
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 02:57:16 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 02:57:16 -0700

    Added git cancel, which will cancel out any local changes to the
    working tree.

commit 119c8227c7578500b78217b4df9863517548be2c
tree b72b06eed50140303706f2ca8727007b589c43ea
parent b1b5aca86ec6d14b1c2a8b89121b813f5037ccf8
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 02:40:02 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 02:40:02 -0700

    Drastically simplified git log by making use of rev-tree. Consequently
    the script is twice as fast now. Idea by Linus.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit b1b5aca86ec6d14b1c2a8b89121b813f5037ccf8
tree 9e265a1d5524436e51ccb0fd36adab39139f5e09
parent 14e4818cfe22f90d666d540059c696487a3598eb
parent bcee6fd8e7164aa7a4170f109af8347d88f0175e
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 02:23:35 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 02:23:35 -0700

    Merging: a006fab45850e20b8a42264c923adbfd08b45580
    
    Merge with Linus.

commit 14e4818cfe22f90d666d540059c696487a3598eb
tree d483707424f55940cbb565ba75220f0e9dde0e76
parent 0ba815be76c5e862a56c06a362e6ad08eb1e2ed8
author Junio C Hamano <junkio@cox.net> Wed, 13 Apr 2005 22:43:50 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 02:01:43 -0700

    [PATCH] Make sure rev-tree commandline commit params are commits.
    
    The rev-tree command expects commandline commit parameters are
    actually commits but does not verify it.
    
    Signed-off-by: Junio C Hamano  <junkio@cox.net>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 0ba815be76c5e862a56c06a362e6ad08eb1e2ed8
tree 9c7143d946781e3b0e6a7c6cc0b5794c4ed4ab2e
parent 7ac872c4064839011a97cb2f2746fdb4516b5eca
author Junio C Hamano <junkio@cox.net> Wed, 13 Apr 2005 21:58:04 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 01:59:58 -0700

    [PATCH] Fix rev-tree --cache parameter.
    
    The hardcoded argv[2] might have been good before --edges
    parameter was added, but not anymore.
    
    Signed-off-by: Junio C Hamano  <junkio@cox.net>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 7ac872c4064839011a97cb2f2746fdb4516b5eca
tree 1b128c4884d58ad6d40d12b0158f502e1823c0a1
parent 185251e89ac45dd488584b5721958264db244542
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 01:44:30 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 01:44:30 -0700

    Rewrote git help to be more detailed. Now lists brief usage
    of all the commands, and what can be used as an "ID".
    
    Inspired by Steven Cole <elenstev@mesatop.com>.

commit 33deb63a36f523c513cf29598d9c05fe78a23cac
tree 298e5d544d67bcc11e95aa6b04f1069a9cd959e6
parent 458754a9fe2c2e889e38d1f4f53d5d457eba6faa
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 14 Apr 2005 01:37:23 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 14 Apr 2005 01:37:23 -0700

    Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful.
    
    It only works one directory level at a time, so lookout..

commit 185251e89ac45dd488584b5721958264db244542
tree 9d8060ba3cfdbd97dc2548a59efa92fa81bf4909
parent abfe82da98e4eba77c892544ea1d56b17721587e
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 01:28:47 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 01:28:47 -0700

    Added git version wrapper for gitversion.sh.
    
    Inspired by Steven Cole <elenstev@mesatop.com>.

commit abfe82da98e4eba77c892544ea1d56b17721587e
tree 1fe705062105622d8c26643015079db47dd48eb0
parent 3dfa48a711beacd2c7690f082623a7d74b42e60c
author Erik van Konijnenburg <ekonijn@xs4all.nl> Wed, 13 Apr 2005 14:09:23 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 01:26:29 -0700

    [PATCH] file descriptor leak
    
    The SHA1 collision detector leaked a fd, leading to a quick exhausion
    on larger-scale operations.
    
    Signed-off-by: <ekonijn@xs4all.nl>

commit 3dfa48a711beacd2c7690f082623a7d74b42e60c
tree fe21cacfa5cf0a410e5a8421858015db3e380fd4
parent 666c76e6fe3b709bdab51751d605a6284c26c147
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 01:00:10 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 01:00:10 -0700

    All the heads are now stored in .git/heads/* instead of .git/HEAD.*.
    The exception is the working tree's head (.git/HEAD) and the "local
    branch" head (.git/HEAD.local, created by git track).
    
    This is done so that the heads/ directory can be shared between several
    git checkouts.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 666c76e6fe3b709bdab51751d605a6284c26c147
tree aee1612b3203966395c4b03bbbeec3dc208dd4b6
parent 3ea7e719e734cee2077498f2332c2d8432c1dd25
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 00:37:53 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 00:37:53 -0700

    [PATCH] Fix writing permissions of directories to trees
    
    In write-tree, directory mode was set rather than |'d width S_IFDIR.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 3ea7e719e734cee2077498f2332c2d8432c1dd25
tree 9adfec3406f7a8f67887726088b713971b1038f7
parent 769ecf9502f92d2bc5473522217ed352006b8a37
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 00:35:54 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 00:35:54 -0700

    [PATCH] Fix up the shell scripts' permissions
    
    This commits tries to fix the shell scripts' permissions to 0755.
    This was mysteriously not passed along the last commit.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 769ecf9502f92d2bc5473522217ed352006b8a37
tree c8ea901308b7230e3dac48d2f62ff4310f0fd959
parent 2845dbe4a451b20f963f872c3914b9184142ff3f
author Petr Baudis <pasky@ucw.cz> Thu, 14 Apr 2005 00:15:08 -0700
committer Petr Baudis <xpasky@machine> Thu, 14 Apr 2005 00:15:08 -0700

    [PATCH] Merge the "git toolkit" set of shell scripts
    
    This is basically a flat-merge of git-pasky (commit
    b44482127ff66768a9bccce478aaa77ea664d485). It consists
    of a set of shell scripts which are supposed to abstract
    git to be usable like a kind of SCM tool.
    
    These scripts consist mainly of my code, but other code contributors
    are in particular:
    	Junio C Hamano <junkio@cox.net>
    	Ingo Molnar <mingo@elte.hu>
    	Christopher Li
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 458754a9fe2c2e889e38d1f4f53d5d457eba6faa
tree b65f86cddbb4086dc6b9b0a14ec8a935c45c6c3d
parent f864ba7448564d06e8076d1b6a66eca00a337d8c
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 13 Apr 2005 21:37:59 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 13 Apr 2005 21:37:59 -0700

    Use common "revision.h" header for both fsck and rev-tree.
    
    It's really a very generic thing: the notion of one sha1 revision
    referring to another one. "fsck" uses it for all nodes, and "rev-tree"
    only tracks commit-node relationships, but the code was already
    the same - now we just make that explicit by moving it to a common
    header file.

commit f864ba7448564d06e8076d1b6a66eca00a337d8c
tree 31f24db6e3e3f70191d95bbe7a06a2b1bb711d99
parent bcee6fd8e7164aa7a4170f109af8347d88f0175e
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 13 Apr 2005 17:47:12 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 13 Apr 2005 17:47:12 -0700

    Fix read-cache.c collission check logic.
    
    Not only did it test the #define the wrong way around, but
    it also leaked file descriptors and VM space. This should
    fix it.

commit bcee6fd8e7164aa7a4170f109af8347d88f0175e
tree 747fe6bdc82aff5407221eff645656932c66ae63
parent 2845dbe4a451b20f963f872c3914b9184142ff3f
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 13 Apr 2005 16:42:09 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 13 Apr 2005 16:42:09 -0700

    Make 'fsck' able to take an arbitrary number of parents on the
    command line.
    
    "arbitrary" is a bit wrong, since it is limited by the argument
    size limit (128kB or so), but let's see if anybody ever cares.
    Arguably you should prune your tree before you have a few thousand
    dangling heads in your archive.
    
    We can fix it by passing in a file listing if we ever care.

commit 2845dbe4a451b20f963f872c3914b9184142ff3f
tree 8caa89079f408d056c20ae13a2a62cb2148ccd2c
parent d9839e030592292267e6317fba308383e0012001
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 13 Apr 2005 12:35:08 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 13 Apr 2005 12:35:08 -0700

    Make fsck reachability avoid doing unnecessary work for
    parents that we reach multiple ways.
    
    This doesn't matter right now. It _will_ matter once we have
    complex revision graphs.

commit d9839e030592292267e6317fba308383e0012001
tree 928b601edc5e57a3998233b5593de63f90d24671
parent 33b238d128a4f7ada055eac99ae8f9546003e7d0
author Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 13 Apr 2005 09:57:30 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Wed, 13 Apr 2005 09:57:30 -0700

    Make "fsck-cache" use the same revision tracking structure as "rev-tree".
    
    This makes things a lot more efficient, and makes it trivial to do things
    like reachability analysis.
    
    Add command line flags to tell what the head is, and whether to warn
    about unreachable objects.

commit 33b238d128a4f7ada055eac99ae8f9546003e7d0
tree 56763d1f057cdc4bf4e60cbec69b51593f9e3bd0
parent 35bb47855d8a102deda07cfc1732095f45318c02
author Petr Baudis <pasky@ucw.cz> Wed, 13 Apr 2005 02:42:04 -0700
committer Petr Baudis <xpasky@machine> Wed, 13 Apr 2005 02:42:04 -0700

    [PATCH] Change diff-tree output format
    
    Changes diff-tree output format so that fields are separated by tabs instead of
    spaces (readibility, parseability), and tree entry type is listed along the
    entry (avoids having to figure that out from the mode in the scripts).
    
    This is what my scripts expect.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 35bb47855d8a102deda07cfc1732095f45318c02
tree 41bcaba0309c151fb38f82135d9b011e2066d130
parent 5ade862839133563d588627f17cde7d4c4f0f6f2
author Petr Baudis <pasky@ucw.cz> Wed, 13 Apr 2005 02:39:33 -0700
committer Petr Baudis <xpasky@machine> Wed, 13 Apr 2005 02:39:33 -0700

    [PATCH] diff-tree usage
    
    Fix diff-tree usage, since it takes -r instead of -R now.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 5ade862839133563d588627f17cde7d4c4f0f6f2
tree 2031abe6fdaa115800eb0c5cd66ebf265d17b3c3
parent aebb2679085d2ecc4d1c943ecfb2e87c699f00d0
author Petr Baudis <pasky@ucw.cz> Wed, 13 Apr 2005 02:38:44 -0700
committer Petr Baudis <xpasky@machine> Wed, 13 Apr 2005 02:38:44 -0700

    [PATCH] nsec portability
    
    It seems like the nsec portability is limited; in particular, older
    glibcs (<=2.2.4 at least) don't seem to like it. So access the nsec
    fields in struct stat only when -DNSEC.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit aebb2679085d2ecc4d1c943ecfb2e87c699f00d0
tree 0ba51186089993112337d5b34a9ee23fe7cf4fdb
parent 42d545e8ff33f478a4b7b99562ab073d8820b334
author Ingo Molnar <mingo@elte.hu> Tue, 12 Apr 2005 11:36:26 -0700
committer Petr Baudis <xpasky@machine> Wed, 13 Apr 2005 02:35:04 -0700

    [PATCH] Whitespace Fixes
    
    Trivial whitespace fixes.
    
    From: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 42d545e8ff33f478a4b7b99562ab073d8820b334
tree f403f5914294bd2769c9ebab7607d90abee915ab
parent 31cedfb95e7dda1e43aead0107d32f90f85f2160
author Junio C Hamano <junkio@cox.net> Tue, 12 Apr 2005 08:08:12 -0700
committer Petr Baudis <xpasky@machine> Wed, 13 Apr 2005 02:32:13 -0700

    [PATCH] No need to clean temp_git_file_* anymore
    
    Ancient cat-file command used to leave temp_git_file_* and there
    was support to remove them in the clean target of Makefile.  I
    do not think it is needed anymore.
    
    From: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 31cedfb95e7dda1e43aead0107d32f90f85f2160
tree a2438d35e51d7bec87ca5231c0e8f7fb9039ba56
parent 2de381f919829aec1e35d6c7cc33519295dcd053
author Junio C Hamano <junkio@cox.net> Tue, 12 Apr 2005 08:04:17 -0700
committer Petr Baudis <xpasky@machine> Wed, 13 Apr 2005 02:31:06 -0700

    [PATCH] Typofix in git/show-files.
    
    Fixes a typo in usage string.
    
    From: Junio C Hamano <junkio@cox.net>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 2de381f919829aec1e35d6c7cc33519295dcd053
tree 3f703cd0cd32a4aa9892bda84c664c36e40f7921
parent bdd4da595a265a091a859754a22688f7351cddee
author Petr Baudis <pasky@ucw.cz> Wed, 13 Apr 2005 02:28:48 -0700
committer Petr Baudis <xpasky@machine> Wed, 13 Apr 2005 02:28:48 -0700

    [PATCH] Consolidate the error handling
    
    Now there is error() for "library" errors and die() for fatal "application"
    errors. usage() is now used strictly only for usage errors.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit bdd4da595a265a091a859754a22688f7351cddee
tree f519f8e9742f9e2f37cecdf3e93338d843471580
parent 5c2a7fbc362e4227ced84c32c3fdc9682d085962
author Petr Baudis <pasky@ucw.cz> Wed, 13 Apr 2005 02:20:38 -0700
committer Petr Baudis <xpasky@machine> Wed, 13 Apr 2005 02:20:38 -0700

    [PATCH] Make nsec checking optional
    
    The nsec field of ctime/mtime is now checked only with -DNSEC defined during
    compilation. nsec acts broken since it is stored in the icache but apparently
    just gets to zero when flushed to filesystem not supporting it (e.g. ext3),
    creating illusions of false changes. At least that's my impression.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 5c2a7fbc362e4227ced84c32c3fdc9682d085962
tree 958b0946a5082fbc6797209fb225f5d7a786b786
parent 7912c07037cf704394e9bcb7cb24c05ee03aa921
author Petr Baudis <pasky@ucw.cz> Wed, 13 Apr 2005 02:14:06 -0700
committer Petr Baudis <xpasky@machine> Wed, 13 Apr 2005 02:14:06 -0700

    [PATCH] SHA1 naive collision checking
    
    When compiled with -DCOLLISION_CHECK, we will check against SHA1
    collisions when writing to the object database.
    
    From: Christopher Li <chrislgit@chrisli.org>
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 7912c07037cf704394e9bcb7cb24c05ee03aa921
tree 69bfdfa541c368a47a86482dfe66e488b152fe3d
parent c57a3a91f1cc0d037e7b7992cbfa6f4213dcf37e
author Petr Baudis <pasky@ucw.cz> Wed, 13 Apr 2005 02:02:34 -0700
committer Petr Baudis <xpasky@machine> Wed, 13 Apr 2005 02:02:34 -0700

    [PATCH] ls-tree for listing trees
    
    ls-tree tool provides just a way to export the binary tree objects
    to a usable text format. This is bound to be useful in variety
    of scripts, although none of those I have currently uses it.
    But e.g. the simple script I've sent to HPA for purging the object
    database uses it.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit c57a3a91f1cc0d037e7b7992cbfa6f4213dcf37e
tree 0323c14ecfac54b060a52ef54b9ea38377adede0
parent e2e5e98a40d6ed04b7acf791cc2243ff32923db3
author Petr Baudis <pasky@ucw.cz> Wed, 13 Apr 2005 01:46:35 -0700
committer Petr Baudis <xpasky@machine> Wed, 13 Apr 2005 01:46:35 -0700

    [PATCH] Correct show-diff output for deleted files
    
    My convention is that contrary to files trimmed to zero size,
    deleted files always go to /dev/null. This patch turns show-diff
    to abide this.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit e2e5e98a40d6ed04b7acf791cc2243ff32923db3
tree 2ce9f0ac1f9d9035ec6ca90ec4f3922a127c6c02
parent 3d8c7a57903f91decd5e6c531974a1af1aaa3c97
author Petr Baudis <xpasky@machine> Wed, 13 Apr 2005 01:40:09 -0700
committer Petr Baudis <xpasky@machine> Wed, 13 Apr 2005 01:40:09 -0700

    [PATCH] Silent flag for show-diff
    
    This patch adds a -s flag for show-diff, which will surpress the
    actual diffing. This is useful for my scripts when they just want
    to see what needs to be updated in the cache.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>

commit 3d8c7a57903f91decd5e6c531974a1af1aaa3c97
tree 9796e3ff820daee2ce8b2439f237dff900769db5
parent 29d76d4b05bc537ac59fd1e6f849ab3386c01502
author Petr Baudis <pasky@ucw.cz> Tue, 12 Apr 2005 14:37:42 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 12 Apr 2005 14:37:42 -0700

    [PATCH] Fix a crash when doing rev-tree
    
    In parse_commit(), free(buffer) is fed a bogus pointer.
    
    Signed-off-by: Petr Baudis <pasky@ucw.cz>
    Signed-off-by: Linus Torvalds <torvalds@osdl.org>

commit 29d76d4b05bc537ac59fd1e6f849ab3386c01502
tree c48c95c3b53b9a16518955e1271ee3dfeb093f80
parent 40e88b95cdce955059e94d288e8ebdb7d1e9fa88
author Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 12 Apr 2005 14:17:28 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 12 Apr 2005 14:17:28 -0700

    Make "checkout-cache" silently skip up-to-date files.
    
    It used to always overwrite them if forced. Now it just
    realizes that they are already ok, and don't need to be
    touched.

commit 40e88b95cdce955059e94d288e8ebdb7d1e9fa88
tree 5b009b1f6683c4e167d4d13816a7303a4d74fe1a
parent 727ff277878490f50a3acefdd1ce6a94b3c9f4c2
author Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 12 Apr 2005 13:40:03 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 12 Apr 2005 13:40:03 -0700

    Make "rev-tree" able to read its own output again from the cache.
    
    Also, add "date" information to the output so that you can do something
    like this:
    
    	rev-tree `cat .git/HEAD` | sort -nr | cut -d' ' -f2 | while read i; do cat-file commit $i; done
    
    which basically becomes a "git log" (aka "git changes") where things are
    sorted by time.

commit 727ff277878490f50a3acefdd1ce6a94b3c9f4c2
tree 7ab8bf31e1f8df4e485bbf198c2579fc6b2b5cb9
parent c0fb976aa779c508314305f309f240fa6bfc3128
author David Woodhouse <dwmw2@infradead.org> Tue, 12 Apr 2005 12:35:11 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 12 Apr 2005 12:35:11 -0700

    [PATCH] rev-tree support for "in X but not in Y".
    
    To do the automated commit-mailing I need to be able to answer the
    question "which commits are here today but weren't yesterday"...  i.e. 
    given two commit-ids $HEAD and $YESTERDAY I want to be able to do:
    
    	rev-tree $HEAD ^$YESTERDAY
    
    to list those commits which are in the tree now but weren't
    ancestors of yesterday's head.
    
    Yes, I could probably do this with 
    	rev-tree $HEAD $YESTERDAY | egrep -v ^[a-z0-9]*:3
    but I prefer not to.
    

commit c0fb976aa779c508314305f309f240fa6bfc3128
tree 41fa9643de0044c75ac654ab2dd2319f1bf3b640
parent 5e76011c0dd9e3f7f6eb766e8c28dd8fcd4adcf9
author Christopher Li <git@chrisli.org> Tue, 12 Apr 2005 02:04:44 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 12 Apr 2005 02:04:44 -0700

    [PATCH] show-diff show deleted files as diff as well.
    
    The ideas is that using the show-diff to generate the
    patch including deleted and new file (in the next patch).
    So we don't have to do the temp new file diff dance on the
    script.
    
    The cache index now contain enough information to generate
    the whole patch. So the GIT SCM don't need separate command
    for check out file to edit or delete. Just do the edit and
    remove and GIT will generate the correct patch.
    
    It still require tell GIT to add new files.
    

commit 5e76011c0dd9e3f7f6eb766e8c28dd8fcd4adcf9
tree fd8bcb6bf8499aca79300df577d2c9b8cc898f1b
parent 74b46e32cb3907a4a062a0f11de5773054b7c71a
author Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 12 Apr 2005 02:01:12 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 12 Apr 2005 02:01:12 -0700

    Remove the annoying "ok" printout from show-diff.
    
    It used to be useful before I wrote "show-files", so that
    show-diff would also tell what the cached files were. Now
    it's just annoying.

commit 74b46e32cb3907a4a062a0f11de5773054b7c71a
tree 8294109a769dc1f2ae9c4c622c2cf3f82531d80a
parent 8695c8bfe181677ca112502c1eef67930d84a75d
author Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 12 Apr 2005 00:23:14 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue, 12 Apr 2005 00:23:14 -0700

    Add a "check-files" command, which is useful for scripting
    patches.
    
    In particular, it verifies that all the listed files are up-to-date
    in the cache (or don't exist and are ready to be added).

commit 8695c8bfe181677ca112502c1eef67930d84a75d
tree 0ff673eb3c120d8d2f2c327e7a772f2e4f902809
parent 3607c27f5fa144992c7962bb8817b950e033fe94
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 18:55:38 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 18:55:38 -0700

    Add "show-files" command to show the list of managed (or non-managed) files.
    
    You want things like this to check in a patch..

commit 3607c27f5fa144992c7962bb8817b950e033fe94
tree ac0272a74f3bf08bdc6c403dd624048521c89021
parent 771364af0ebc34ba968590eeebf0b78ee148f0a5
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 18:02:00 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 18:02:00 -0700

    Allow zero-sized files to be checked in.
    
    The kernel may not want it, but others probably do.
    
    Noted (again) by Junio Hamano.

commit 771364af0ebc34ba968590eeebf0b78ee148f0a5
tree 5b140cab879595232bb13fe3007cdb14ed267db6
parent 28258afe912303f717fcdccaca124c1ae3e8e004
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 17:40:58 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 17:40:58 -0700

    Make the rev-tree output more regular. This is the last
    change. Promise.
    
    It now always outputs all the revisions as <sha1>:<reachability>, where the
    reachability is the bitmask of how that revision was reachable from the
    commits in the argument list.
    
    Trivially, if there is only one commit, the reachability will always be
    (1 << 0) == 1 for all reachable revisions, and there won't be any edges
    (so the "--edges" flag only makes sense with multiple commit keys).

commit 28258afe912303f717fcdccaca124c1ae3e8e004
tree 832c112baac6645c09b4b30f79c263c679e54994
parent 97d9c3cdeafb9f48075987c76373a71e6874c6eb
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 17:23:58 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 17:23:58 -0700

    Make "rev-tree" capable of showing the difference in reachability between two
    or more commit points.
    
    This is important both to know what the difference between two commit
    points is, but also to figure out where to try to merge from.

commit 97d9c3cdeafb9f48075987c76373a71e6874c6eb
tree 60f9d89665bd7623ef43c2b2dec7645bbb08c778
parent 4bb04f2190d526f8917663f0be62d8026e1ed100
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 16:42:13 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 16:42:13 -0700

    Make "rev-tree" more efficient and more useful.
    
    Slight change of output format: it now lists all parents on the same line.
    
    This allows it to work on initial commits too (which have no parents), and
    also makes the output format a lot more intuitive.

commit 4bb04f2190d526f8917663f0be62d8026e1ed100
tree 5f7966de3b4b60260db3b510e6efeab94e55f37a
parent 9614b8dcf8f295b6063d2a85bf8ec53960b072b6
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 15:47:57 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 15:47:57 -0700

    Rename ".dircache" directory to ".git"
    
    I started out calling the tool "dircache". That's clearly moronic.

commit 9614b8dcf8f295b6063d2a85bf8ec53960b072b6
tree 6ce87c726d7f7724a6441a1a94f2fc18314c5cd4
parent 84fe972055398ba0790ac0a8f159c79c83efcef4
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 15:39:26 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 15:39:26 -0700

    Fix stale index.lock file removal using "atexit()".
    
    Problem noted by Randy Dunlap.

commit 84fe972055398ba0790ac0a8f159c79c83efcef4
tree 426bfebd8064b754e1f6ab7ad6ab81801310043d
parent 0dcad32ae239906217065b6a2b0fca41962e5d57
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 13:55:10 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 13:55:10 -0700

    Add a "rev-tree" helper, which calculates the revision
    tree graph.
    
    It's quite fast when the commit-objects are cached, but since
    it has to walk every single commit-object, it also allows you
    to cache an old state and just add on top of that.

commit 0dcad32ae239906217065b6a2b0fca41962e5d57
tree 364de08062838733978d41da581fcdbb73c4f1b9
parent 32d197f18d0be74a4d82e8c42513d83423091a22
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 13:53:49 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 13:53:49 -0700

    Fix "usage()" to do the missing line termination.
    
    It got broken when I changed it to use stdarg.

commit 32d197f18d0be74a4d82e8c42513d83423091a22
tree e31297f6bcdec878e0054ae10066e2aaa0495fcd
parent cfd88e2b7a1a1d2b0f22173a5cc128adce7391e3
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 11:33:58 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 11:33:58 -0700

    Fix "update-cache" not fixing up the size field as appropriate.
    
    The size field isn't in the tree information, so we need to
    update it if the sha1 matches.

commit cfd88e2b7a1a1d2b0f22173a5cc128adce7391e3
tree 10344b81045df0a2cea3e76d325df5156c0294ab
parent 075b845a8572006d8c80f8500a0652166a0fba00
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 10:24:41 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 10:24:41 -0700

    Make the default directory permissions more lax.
    
    After all, if you want to not allow others to read your
    stuff, set your "umask" appropriately or make sure the
    parent directories aren't readable/executable.

commit 075b845a8572006d8c80f8500a0652166a0fba00
tree 5c9ee24e27939640e18088e56f40373fa2620b0c
parent 711cf3a026a539f68ab647e012f145a03e12a5e7
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 10:18:16 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 10:18:16 -0700

    Add a COPYING notice, making it explicit that the license is GPLv2.
    
    Let's bite the v3 bullet when it comes, although if people want to,
    they can just state "or later at discretion of Linus" in their copyright
    messages.

commit 711cf3a026a539f68ab647e012f145a03e12a5e7
tree 5cc4753bc199ac4d595e416e61b7dfa2dfd50379
parent bf16c71e2f9fc9ca44273f7f4637dce194a49cce
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 09:39:21 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 09:39:21 -0700

    Make "update-cache --refresh" do what it really should do: just
    refresh the "stat" information.
    
    We need this after having done a "read-tree", for example, when the
    stat information does not match the checked-out tree, and we want to
    start getting efficient cache matching against the parts of the tree
    that are already up-to-date.

commit bf16c71e2f9fc9ca44273f7f4637dce194a49cce
tree cc4cf7c0e5833fdfc4999d33d5b652afa4858bb9
parent 91af81a98ea5c5594c67a63abc933250e05c13c6
author Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 08:37:17 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Mon, 11 Apr 2005 08:37:17 -0700

    Fix up commit-tree/diff-tree user interface issues.
    
    No, this doesn't make them easy to use, but makes diff-tree use
    the "-r" flag for "recursive" (not "-R") and makes commit-tree
    use AUTHOR_xxx environment flags (not COMMITTER_xxx) to match what
    it actually does.

commit 91af81a98ea5c5594c67a63abc933250e05c13c6
tree d32ad1f96650d7da0d9b7043eeece8235da67b82
parent f1257f3a33c49ea4f3fd43c7aed97d8a270190dd
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 23:33:52 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 23:33:52 -0700

    Oops. Fix bad initialization of the "seen" array, causing us to not
    properly clear the reference count at init time. It happened to work
    for me by pure luck.
    
    Until it broke, and my unreferenced commit suddenly looked referenced
    again. Fixed.

commit f1257f3a33c49ea4f3fd43c7aed97d8a270190dd
tree 18e4bb98e1e685dfdd798048ada57c925ee87aee
parent 8ba0bbb237af3de317f8d009302500e9a7e2b3c3
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 23:22:59 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 23:22:59 -0700

    Oops, the actual 'printf' for missing objects was missing.
    
    Which made fsck very quiet about objects it hadn't found. So add
    it. 
    
    We'll need to make things like these optional, because it's
    perfectly ok to have partial history if you don't want it,
    and don't want to go backwards. But for development, it's best
    to always complain about missing sha1 object files that are
    referenced from somewhere else.

commit 8ba0bbb237af3de317f8d009302500e9a7e2b3c3
tree 6dfeb7c11933067d0517ee8f862430e83ae33d29
parent 76e7f4ec485f24b167b76db046dc2ca4562debd4
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 23:13:09 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 23:13:09 -0700

    Add connectivity tracking to fsck.
    
    This shows that I've lost track of one commit already. Most likely
    because I forgot to update the .dircache/HEAD file when doing a
    commit, so that the next commit referenced not the top-of-tree, but
    the one older commit.
    
    Having dangling commits is fine (in fact, you should always have
    at least _one_ dangling commit in the top-of-tree). But it's
    good to know about them.

commit 76e7f4ec485f24b167b76db046dc2ca4562debd4
tree 3d00c15360e1aea2a51558e5f56b95d11e9d7010
parent 262e82b4a7ec708d8c9e641421509b16b8ec69f1
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 22:06:50 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 22:06:50 -0700

    Fix off-by-one error in removal of cache entry.
    
    Also make the return value of "cache_name_pos()" be sane: positive
    or zero if we found it (it's the index into the cache array), and
    "-pos-1" to indicate where it should go if we didn't.

commit 262e82b4a7ec708d8c9e641421509b16b8ec69f1
tree 6bb02c5dc7e827fd0fb0d36ae92d14e25318bffa
parent eeb7991695b0944e4e8d6474b8f7cd2da8830b20
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 21:49:26 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 21:49:26 -0700

    Fix diff-tree recursion.
    
    And, perhaps more importantly, fix the fact that if a filename changed from a
    directory to a file (or vice versa), we must consider it a delete and an add,
    not a "filechange".

commit eeb7991695b0944e4e8d6474b8f7cd2da8830b20
tree 7cb7710ccdcb867bf190b70d4586593bbad49499
parent 73134b6d3f700bb9e6c66aa2f099de644c6b8d09
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 15:08:02 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 15:08:02 -0700

    Simplify "diff-tree" output, and only keep track of one single name-base.
    
    During original development I had different name-bases for source and
    destination, so that I could make the output show how it got removed 
    from "tree a" and added to "tree b", but we don't want that. We only
    do recursive diffs on anything where the bases are exactly the same,
    so we might as well just work with a single base.
    
    Also, make the output for "changed" be a single line, since people
    hated the separate '<' / '>' format. They were right. It sucked.

commit 73134b6d3f700bb9e6c66aa2f099de644c6b8d09
tree 5588456a03dc45bc5cc026a7e61ecb86bdd10c38
parent 121481abf8d752ef871821d4ab9a3747595d86ae
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 14:03:58 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 14:03:58 -0700

    Add "-R" flag to "diff-tree", so that it will recursively traverse a tree of trees
    as it diffs them.
    
    This makes diff-tree usable again in the new world order.

commit 121481abf8d752ef871821d4ab9a3747595d86ae
tree 6722a6e40e1edeeec7cd4c527a16a51553074130
parent d6d3f9d0125a7215f3cdc2600b2307ca55b69536
author Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 11:32:54 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sun, 10 Apr 2005 11:32:54 -0700

    Make "update-cache" a bit friendlier to use (and harder to mis-use).
    
    It now requires the "--add" flag before you add any new files, and
    a "--remove" file if you want to mark files for removal. And giving
    it the "--refresh" flag makes it just update all the files that it
    already knows about.

commit d6d3f9d0125a7215f3cdc2600b2307ca55b69536
tree a869cb0789d8ad87f04d28dd9b703f3ff343a4a7
parent 4e6616ab77ed6a53f857d4b1082c4dc4140f34f5
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 17:09:34 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 17:09:34 -0700

    This implements the new "recursive tree" write-tree.
    
    It's got some debugging printouts etc still in it, but testing on the
    kernel seems to show that it does indeed fix the issue with huge tree
    files for each commit.

commit 4e6616ab77ed6a53f857d4b1082c4dc4140f34f5
tree 10b554bd1513e33b7054c02eba9cda69bc29e187
parent f768846e34997fb847c9b875615867d4716d632f
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 15:47:03 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 15:47:03 -0700

    Make fsck-cache warn about old-style tree objects that have full
    pathnames in them. We're migrating away from that.
    
    This will cause tons of warnings for the current "sparse" archive,
    but hell, better now than later.

commit f768846e34997fb847c9b875615867d4716d632f
tree 5f3fcd81f68f4031cbcfcadd5c368104ca0969a0
parent 16d4d1ba6c1de7a414a6826eb6f363d4b20345bf
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 15:36:41 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 15:36:41 -0700

    Teach "fsck" and "read-tree" about recursive tree-nodes.
    
    This is totally untested, since we can't actually _write_ things that
    way yet, but I'll get to that next, I hope. That should fix the
    huge wasted space for kernel-sized tree objects.

commit 16d4d1ba6c1de7a414a6826eb6f363d4b20345bf
tree 5319e4d609cdd282069cc4dce33c1db559539b03
parent 9174026cfe69d73ef80b27890615f8b2ef5c265a
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 13:02:30 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 13:02:30 -0700

    Make "fsck-cache" print out all the root commits it finds.
    
    Once I do the reference tracking, I'll also make it print out all the
    HEAD commits it finds, which is even more interesting.

commit 9174026cfe69d73ef80b27890615f8b2ef5c265a
tree d4a96ba891017d0d26c15e509b4e6515e40d75ee
parent 79517a067a293ddf19867e363f0d9237c7ef8e22
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 13:00:54 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 13:00:54 -0700

    Add "diff-tree" program to show which files have changed between two trees.
    
    Very useful for creating diffs efficiently, and in general to see what has
    changed in the namespace.

commit 79517a067a293ddf19867e363f0d9237c7ef8e22
tree 989bf717d47f36c9ba4c17a5e3ce1495c34ebf43
parent 83adac3c57ad8cd2c8d44b525414b949950e316d
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 12:59:11 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 12:59:11 -0700

    Export "cache_name_compare()" helper function.
    
    The "diff-tree" program needs it.

commit 83adac3c57ad8cd2c8d44b525414b949950e316d
tree 314297184c51fc558a83b8701a83f28a0e740d7a
parent 197ee8c97076ee784db9f4b5a9294e86f42d068c
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 12:11:25 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 12:11:25 -0700

    Make "read-tree" read the tree into the current directory cache.
    
    It will no longer update the actual working directory, just the
    cache. To update the working directory, you need to use "checkout-cache".

commit 197ee8c97076ee784db9f4b5a9294e86f42d068c
tree ccba05512dc3b5f46c5fd5caadb40ce79ffb944b
parent 8d3af1d53255ac36494492720ebb83e932b0c0bc
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 12:09:27 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 12:09:27 -0700

    Make "write_cache()" and friends available as generic routines.
    
    This is needed for the change to make "read-tree" just read into the
    cache (and then you do a "checkout-cache" to update your current dir
    contents).

commit 8d3af1d53255ac36494492720ebb83e932b0c0bc
tree 09c369f30a7ec350dc98496c5cb752280f6dfe51
parent f7391ce3bd306c5731bc8206f8a0fa0947ca9474
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 11:24:41 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 11:24:41 -0700

    Fix "checkout-cache.c" mis-use of read_sha1_file() interface.
    
    It's supposed to test the returned file type, not think that read_sha1_file()
    tests it. Confusion from "cat-file" command line usage.

commit f7391ce3bd306c5731bc8206f8a0fa0947ca9474
tree 67d4a7bf52c33e679b6e398d1113a33b072d942c
parent 33db5f4d9027a10e477ccf054b2c1ab94f74c85a
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 09:59:44 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 09:59:44 -0700

    Fix up "checkout-cache" a bit
    
    Make the warnings have newlines, and don't stop "checkout-cache -a"
    just because a file already exists.

commit 33db5f4d9027a10e477ccf054b2c1ab94f74c85a
tree 83941fd0e146733198bcc5fe8c06d50dc9e6c225
parent 734aab758cc2b9f5e2ed43375dbfec1b5bfde43b
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 09:53:05 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 09:53:05 -0700

    Add a "checkout-cache" command which does what the name suggests.
    
    I'll also eventually change "read-tree" to only update the cache
    information, instead of doing a checkout of the tree. Much nicer.

commit 734aab758cc2b9f5e2ed43375dbfec1b5bfde43b
tree 6c8b42ad4851c05a0a093af5468bdcec6367b7e8
parent eb38c22f535c7c973f27b62845c5136c4be0ae49
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 09:48:20 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 09:48:20 -0700

    Make the cache stat information comparator public.
    
    Like the cache filename finder, it's a generically useful function,
    rather than something specific to the current "show-diff" thing.

commit eb38c22f535c7c973f27b62845c5136c4be0ae49
tree dd229923a70e17998038996d66d4562df16f6d28
parent 59c1e249808c6ba38194733fa00efddb9e0eb488
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 09:26:55 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 09:26:55 -0700

    Make "cache_name_pos()" available to others.
    
    It finds the cache entry position for a given name, and is
    generally useful. Sure, everybody can just scan the active
    cache array, but since it's sorted, you actually want to
    search it with a binary search, so let's not duplicate that
    logic all over the place.

commit 59c1e249808c6ba38194733fa00efddb9e0eb488
tree 8bd5667ce5588ab02c103c9aa8d8f1c6e90da56f
parent 1ea34e365b1ea233be332245bc34a8df415a7d61
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 00:25:22 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat, 09 Apr 2005 00:25:22 -0700

    Fix missing return values and some error tests for empty index files
    
    Patches from Dave Jones and Ingo Molnar, but since I don't have any
    infrastructure in place to use the old patch applicator scripts I
    am trying to build up, I ended up fixing the thing by hand instead.
    
    Credit where credit is due, though. Nice to see that people are
    taking a look at the project even in this early stage.

commit 1ea34e365b1ea233be332245bc34a8df415a7d61
tree c084af1ee14b234a73d47e2bb3fbf3617837e16d
parent 94261677654d493f6a6219c78aae986a146f92d4
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 17:11:14 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 17:11:14 -0700

    Make fsck-cache start parsing the object types, and checking their
    internal format.
    
    This doesn't yet check the reachability information, but we're getting
    there.. Slowly.

commit 94261677654d493f6a6219c78aae986a146f92d4
tree a384894f34b2360404231ed72b3beb136876e16b
parent 7660a188dfd0c5e52884790bebf5637d24f990d4
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 15:31:19 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 15:31:19 -0700

    Add "-lz" to link line to get in zlib.
    
    Not all Linux distributions seem to need it (notably not YDL on ppc64), but
    enough ones obviously do.

commit 7660a188dfd0c5e52884790bebf5637d24f990d4
tree eeb0c5958781ed3ed29c42b488a556676cd71ab7
parent 20222118ae4cbd0a7ba91a7012574cd2f91101ec
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 15:04:51 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 15:04:51 -0700

    Add new fsck-cache to Makefile.
    
    This is what happens when there are no nice tools to tell you to do things
    properly.

commit 20222118ae4cbd0a7ba91a7012574cd2f91101ec
tree e03fa31365b953db15f3dec6810aac4a58678e6f
parent 2ade9340262cb87163b5c5c270268175ff3b3c15
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 15:02:42 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 15:02:42 -0700

    Add first cut at "fsck-cache" that validates the SHA1 object store.
    
    It doesn't complain about mine. But it also doesn't yet check for
    inter-object reachability etc.

commit 2ade9340262cb87163b5c5c270268175ff3b3c15
tree d64c721c31719eda098badb4a45913c7e61c9ef1
parent 24778e335a6450e34257a311d0bf4a12bdb3006c
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 15:01:15 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 15:01:15 -0700

    Add "check_sha1_signature()" helper function
    
    And fix up header declarations.

commit 24778e335a6450e34257a311d0bf4a12bdb3006c
tree db8e952afe1ad62c4bc5989ef3d2292ef4aa4d4f
parent 19b2860cba5742ab31fd682b80fefefac19be141
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 14:42:29 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 14:42:29 -0700

    Factor out "read_sha1_file" into mapping/inflating/unmapping.
    
    This allows us to also actually check the sha1 hash using these
    routines. Needed for the "fsck" thing.

commit 19b2860cba5742ab31fd682b80fefefac19be141
tree 406548bda4dfb72566db6e515e38604a7641ec15
parent bf0c6e839c692142784caf07b523cd69442e57a5
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 09:59:28 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 09:59:28 -0700

    Use "-Wall -O2" for the compiler to get more warnings.
    
    And fix up the warnings that it pointed out. Let's keep the tree
    clean from early on.
    
    Not that the code is very beautiful anyway ;)

commit bf0c6e839c692142784caf07b523cd69442e57a5
tree 82e9dc75087c715ef4a9da6fc89674aa74efee1c
parent e497ea2a9b6c378f01d092c210af20cbee762475
author Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 09:16:38 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Fri, 08 Apr 2005 09:16:38 -0700

    Make "cat-file" output the file contents to stdout.
    
    New syntax: "cat-file -t <sha1>" shows the tag, while "cat-file <tag> <sha1>"
    outputs the file contents after checking that the supplied tag matches.

commit e497ea2a9b6c378f01d092c210af20cbee762475
tree 4cec02b6467ecc33662b8b691c604d1a80ac4a1b
parent 8bc9a0c769ac1df7820f2dbf8f7b7d64835e3c68
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 07 Apr 2005 21:03:28 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 07 Apr 2005 21:03:28 -0700

    Make read-tree actually unpack the whole tree.
    
    I needed this to make a "sparse" archive conversion from my old
    BitKeeper tree data. The scripts to do the conversion are just
    incredibly ugly, but they seem to validate the notion that you
    can actually use this silly 'git' thing to save your history in.

commit 8bc9a0c769ac1df7820f2dbf8f7b7d64835e3c68
tree 4f856748145b27bc669a98cd4d66574dfd01b083
parent e83c5163316f89bfbde7d9ab23ca2e25604af290
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 07 Apr 2005 15:16:10 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 07 Apr 2005 15:16:10 -0700

    Add copyright notices.
    
    The tool interface sucks (especially "committing" information, which is just
    me doing everything by hand from the command line), but I think this is in
    theory actually a viable way of describing the world. So copyright it.

commit e83c5163316f89bfbde7d9ab23ca2e25604af290
tree 2b5bfdf7798569e0b59b16eb9602d5fa572d6038
author Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 07 Apr 2005 15:13:13 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Thu, 07 Apr 2005 15:13:13 -0700

    Initial revision of "git", the information manager from hell

