aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* csum-file: add "sha1fd()" to create a SHA1 csum file from an existing file ↵Linus Torvalds2005-06-28
| | | | | | descriptor We'll use this soon to write pack-files to stdout.
* Duh. Fix transposed characters in git-pull-scriptLinus Torvalds2005-06-28
| | | | I'd stupidly only tested the non-branch-name version.
* Teach packing about "tag" objectsLinus Torvalds2005-06-28
| | | | | (And teach sha1_file and unpack-object know how to unpack them too, of course)
* [PATCH] git-cat-file: '-s' to find out object size.Junio C Hamano2005-06-28
| | | | | | | | | | We use sha1_object_info() now, and getting size is also trivial. I admit that this is more of "because we can" not "because I see immediate need for it", though. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] git-cat-file: use sha1_object_info() on '-t'.Junio C Hamano2005-06-28
| | | | | | | | When trying to find out the type of the object, there is no need to uncompress the whole object. Just use sha1_object_info(). Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Obtain sha1_file_info() for deltified pack entry properly.Junio C Hamano2005-06-28
| | | | | | | | | | | | | The initial one was not doing enough to figure things out without uncompressing too much. It also fixes a potential segfault resulting from missing use_packed_git() call. We would need to introduce unuse_packed_git() call and do proper use counting to figure out when it is safe to unmap, but currently we do not unmap packed file yet. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Teach git-pull-script about pulling tagsLinus Torvalds2005-06-27
|
* Fix another test that broke with the recent git-init-db updateLinus Torvalds2005-06-27
| | | | | t5300-pack-object.sh test 8 expected to have to create the "pack" directory itself, and was unhappy when it already existed.
* [PATCH] Skip writing out sha1 files for objects in packed git.Junio C Hamano2005-06-27
| | | | | | | | | | | Now, there's still a misfeature there, which is that when you create a new object, it doesn't check whether that object already exists in the pack-file, so you'll end up with a few recent objects that you really don't need (notably tree objects), and this patch fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] replace sha1sum with sum in t/t1002Mark Allen2005-06-27
| | | | | | | | | | | | | | This replaces sha1sum(1) with sum(1) in t/t1002. GNU sum(1) runs in "BSD compatibility" mode by default, and not all systems have GNU coreutils. On any system without GNU coreutils (or sha1sum) t1002 will fail. This patch should make t1002 complete successfully everywhere that sum(1) runs. I've tested this on Darwin and Linux; it works on both platforms. Signed-off-by: Mark Allen <mrallen1@yahoo.com> Acked-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Fix up test that counted subdirectories in ".git/objects"Linus Torvalds2005-06-27
| | | | Now there are 257 of them (256 numeric ones, and the new "pack" directory)
* git-init-db: create "pack" subdirectory under objectsLinus Torvalds2005-06-27
| | | | | Don't make the user have to mkdir it just because he's excited about the new object pack functionality, do it for him.
* Merge rsync://rsync.kernel.org/pub/scm/gitk/gitkLinus Torvalds2005-06-27
|\
| * Add a menu item for creating tags.Paul Mackerras2005-06-27
| |
| * Fix a bug where we would corrupt the stuff read from git-rev-list.Paul Mackerras2005-06-27
| | | | | | | | | | | | | | | | | | | | | | | | If we have a very long commit message, and we end up getting a bufferfull of data from git-rev-list that all belongs to one commit, we ended up throwing away the data from a previous read that should have been included. The result was a error message about not being able to parse the output of git-rev-list. Also, if the git-rev-list output that we can't parse is long, only put the first 80 chars in the error message. Otherwise we end up with an enormous error window.
| * Add a menu entry for generating a patch between any two commits.Paul Mackerras2005-06-27
| |
| * Fix behaviour in the case where we have no commits to display.Paul Mackerras2005-06-27
| | | | | | | | | | I had code in there to put "No commits selected" on the canvas but it needed some globals.
| * Check for the existence of the git directory on startup.Paul Mackerras2005-06-27
| | | | | | | | | | | | Check that $GIT_DIR (or .git, if GIT_DIR is not set) is a directory. This means we can give a more informative error message if the user runs gitk somewhere that isn't a git repository.
| * Clear the SHA1 entry field when we go to paste something into itPaul Mackerras2005-06-25
| | | | | | | | | | If the user pastes in the selection (with the middle mouse button) and it already has 40 characters in it, clear it before pasting.
| * Add commit row context menu and handle left-click on graph linesPaul Mackerras2005-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right-click on a context row now brings up a menu allowing the user to generate a diff between that row and the selected row. Left-click on a graph line shows the parent and children connected by the line in the details pane. Left-click on a circle in the graph selects that commit. Left-click elsewhere in the graph does nothing. When displaying a diff, the bottom-right file list box behaves slightly differently now; instead of eliding all other files' diffs, it now just scrolls the details pane so that the selected file's diff starts at the top of the pane. Since the diffs can be rather large, arrange for an update to be done every 100ms while reading diffs. Also removed the CVS revision keywords and bumped the version number to 1.2.
* | csum-file: fix missing buf pointer updateLinus Torvalds2005-06-27
| | | | | | | | This would create broken pack archives for anything nontrivial.
* | [PATCH] Teach read_sha1_file() and friends about packed git object store.Junio C Hamano2005-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GIT_OBJECT_DIRECTORY and GIT_ALTERNATE_OBJECT_DIRECTORIES can have the "pack" subdirectory that houses "packed GIT" files produced by git-pack-objects (e.g. .git/objects/pack/foo.pack and .git/objects/pack/foo.idx; always store them as pairs). The following functions in sha1_file.c can then read object contents from such packed file: - sha1_object_info() - has_sha1_file() - read_sha1_file() Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Enhance sha1_file_size() into sha1_object_info()Junio C Hamano2005-06-27
| | | | | | | | | | | | | | | | This lets us eliminate one use of map_sha1_file() outside sha1_file.c, to bring us one step closer to the packed GIT. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Remove "delta" object representation.Junio C Hamano2005-06-27
| | | | | | | | | | | | | | | | | | | | | | Packed delta files created by git-pack-objects seems to be the way to go, and existing "delta" object handling code has exposed the object representation details to too many places. Remove it while we refactor code to come up with a proper interface in sha1_file.c. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] git-ssh-pull: commit-id consistencySven Verdoolaege2005-06-27
| | | | | | | | | | | | | | | | | | | | In contrast to other plumbing tools, git-ssh-push only allow a very restrictive form of commit-id filenames. This patch removes this restriction. Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | git-checkout-script: use "--verify --revs-only" to parse revsLinus Torvalds2005-06-27
| | | | | | | | | | | | Sven Verdoolaege points out that I added the --verify option to git-rev-parse exactly for things like this, but didn't update the users.
* | csum-file interface updates: return resulting SHA1Linus Torvalds2005-06-26
| | | | | | | | | | | | | | | | | | | | | | Also, make the writing of the SHA1 as a end-header be conditional: not every user will necessarily want to write the SHA1 to the file itself, even though current users do (but we migh end up using the same helper functions for the object files themselves, that don't do this). This also makes the packed index file contain the SHA1 of the packed data file at the end (just before its own SHA1). That way you can validate the pairing of the two if you want to.
* | git-pack-objects: write the pack files with a SHA1 csumLinus Torvalds2005-06-26
| | | | | | | | | | | | | | | | | | | | We want to be able to check their integrity later, and putting the sha1-sum of the contents at the end is a good thing. The writing routines are generic, so we could try to re-use them for the index file, instead of having the same logic duplicated. Update unpack-objects to know about the extra 20 bytes at the end of the index.
* | Add "--pretty=full" format that also shows committer.Linus Torvalds2005-06-26
| | | | | | | | | | | | Also move the common implementation of parsing the --pretty argument format into commit.c rather than having duplicates in diff-tree.c and rev-list.c.
* | Add git-verify-tag scriptJan Harkes2005-06-26
| | | | | | | | | | | | Here is a script to simplify validating the gpg signature created by git-tag-script. Might be useful to add to the git tree so that people don't have to search for the right post in the git mailinglist archives
* | git-pack-objects: use name information (if any) to sort objects for packing.Linus Torvalds2005-06-26
| | | | | | | | This is incredibly cheezy. But it's cheap, and it works pretty well.
* | Ooh. Make git-rev-list --object associate a name with objects.Linus Torvalds2005-06-26
| | | | | | | | | | The name isn't unique, it's just the first name that object is reached through, so it's really nothing more than a hint.
* | git-pack-objects: do the delta search in reverse size orderLinus Torvalds2005-06-26
| | | | | | | | | | | | | | | | | | | | | | Starting from big objects and going backwards means that we end up picking a delta that goes from a bigger object to a smaller one. That's advantageous for two reasons: the bigger object is likely the newer one (since things tend to grow, rather than shrink), and doing a delete tends to be smaller than doing an add. So the deltas don't tend to be top-of-tree, and the packed end result is just slightly smaller.
* | [PATCH] Add git-relink-script to fix up missing hardlinksRyan Anderson2005-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | This will scan 2 or more object repositories and look for common objects, check if they are hardlinked, and replace one with a hardlink to the other if not. This version warns when skipping files because of size differences, and handle more than 2 repositories automatically. Signed-off-by: Ryan Anderson <ryan@michonline.com> Cheered-on-by: Jeff Garzik <jgarzik@pobox.com> Acked-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | git-rev-parse: add "--not" flag to mark subsequent heads negativeLinus Torvalds2005-06-26
| | | | | | | | | | | | | | | | | | | | | | | | If you have two lists of heads, and you want to see ones reachable from list $a but not from list $b, just do git-rev-list $(git-rev-parse $a --not $b) which is useful for both bisecting (where "b" would be the list of known good revisions, and "a" would be the latest found bad head) and for just seeing what the difference between two sets of heads are if you want to generate a pack-file for the difference.
* | git-unpack-objects: start removing debug outputLinus Torvalds2005-06-26
| | | | | | | | At least the least interesting one.
* | Fix object packing/unpacking.Linus Torvalds2005-06-26
| | | | | | | | | | | | | | This actually successfully packed and unpacked a git archive down to 1.3MB (17MB unpacked). Right now unpacking is way too noisy, lots of debug messages left.
* | [PATCH] Finish initial cut of git-pack-object/git-unpack-object pair.Junio C Hamano2005-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finishes the initial round of git-pack-object / git-unpack-object pair. They are now good enough to be used as a transport medium: - Fix delta direction in pack-objects; the original was computing delta to create the base object from the object to be squashed, which was quite unfriendly for unpacker ;-). - Add a script to test the very basics. - Implement unpacker for both regular and deltified objects. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Add "--depth=N" parameter to git-pack-objects to limit maximum delta depthLinus Torvalds2005-06-25
| | | | | | | | It too defaults to 10. A nice round random number.
* | git-pack-objects: make "--window=x" semantics more logical.Linus Torvalds2005-06-25
| | | | | | | | | | | | | | | | | | | | | | A zero disables delta generation (like before), but we make the window be one bigger than specified, since we use one entry for the one to be tested (it used to be that "--window=1" was meaningless, since we'd have used up the single-entry window with the entry to be tested, and had no chance of actually ever finding a delta). The default window remains at 10, but now it really means "test the 10 closest objects", not "test the 9 closest objects".
* | Add a "max_size" parameter to diff_delta()Linus Torvalds2005-06-25
| | | | | | | | | | | | | | Anything that generates a delta to see if two objects are close usually isn't interested in the delta ends up being bigger than some specified size, and this allows us to stop delta generation early when that happens.
* | Fix delta "sliding window" codeLinus Torvalds2005-06-25
| | | | | | | | | | | | | | | | | | When Junio fixed the lack of a successful error code from try_delta(), that uncovered an off-by-one error in the caller. Also, some testing made it clear that we now find a lot more deltas, because we used to (incorrectly) break early on bogus "failure" cases.
* | [PATCH] (patchlet) pack-objects.c: try_delta()Junio C Hamano2005-06-25
| | | | | | | | | | | | | | | | | | Return value of try_delta is checked for negativeness, but the success path does not return anything, letting compiler warn and presumably return garbage. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Add a bit of developer documentation to pull.hJunio C Hamano2005-06-25
| | | | | | | | | | | | | | | | Describe what to implement in fetch() and fetch_ref() for pull backend writers a bit better. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] http-pull: documentation updates.Junio C Hamano2005-06-25
| | | | | | | | | | | | | | Describe -w option. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Fix oversimplified optimization for add_cache_entry().Junio C Hamano2005-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An earlier change to optimize directory-file conflict check broke what "read-tree --emu23" expects. This is fixed by this commit. (1) Introduces an explicit flag to tell add_cache_entry() not to check for conflicts and use it when reading an existing tree into an empty stage --- by definition this case can never introduce such conflicts. (2) Makes read-cache.c:has_file_name() and read-cache.c:has_dir_name() aware of the cache stages, and flag conflict only with paths in the same stage. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] git-merge-one-file-script: do not misinterpret rm failure.Junio C Hamano2005-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a merge adds a file DF and removes a directory there by deleting a path DF/DF, git-merge-one-file-script can be called for the removal of DF/DF when the path DF is already created by "git-read-tree -m -u". When this happens, we get confused by a failure return from 'rm -f -- "$4"' (where $4 is DF/DF); finding file DF there the "rm -f" command complains that DF is not a directory. What we want to ensure is that there is no file DF/DF in this case. Avoid getting ourselves confused by first checking if there is a file, and only then try to remove it (and check for failure from the "rm" command). Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] Add more tests for read-tree --emu23.Junio C Hamano2005-06-25
| | | | | | | | | | | | | | | | | | | | | | This adds more tests for --emu23. One is to show how it can carry forward more local changes than the straightforward two-way fast forward, and another is to show the recent overeager optimization of directory/file conflict check broke things, which will be fixed in the next commit. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] git-rebase-script: rebase local commits to new upstream head.Junio C Hamano2005-06-25
| | | | | | | | | | | | | | | | | | Using git-cherry, forward port local commits missing from the new upstream head. This also depends on "-m" flag support in git-commit-script. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] git-cherry: find commits not merged upstream.Junio C Hamano2005-06-25
| | | | | | | | | | | | | | | | | | | | | | The git-cherry command helps the git-rebase script by finding commits that have not been merged upstream. Commits already included in upstream are prefixed with '-' (meaning "drop from my local pull"), while commits missing from upstream are prefixed with '+' (meaning "add to the updated upstream"). Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-26 19:53:01 +0000