aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* [PATCH] don't load and decompress objects twice with parse_object()Nicolas Pitre2005-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that parse_object() is loading and decompressing given object to free it just before calling the specific object parsing function which does mmap and decompress the same object again. This patch introduces the ability to parse specific objects directly from a memory buffer. Without this patch, running git-fsck-cache on the kernel repositorytake: real 0m13.006s user 0m11.421s sys 0m1.218s With this patch applied: real 0m8.060s user 0m7.071s sys 0m0.710s The performance increase is significant, and this is kind of a prerequisite for sane delta object support with fsck. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* git-diff-tree: clean up outputLinus Torvalds2005-05-06
| | | | | | This only shows the tree headers when something actually changed. Also, add a "silent" mode, which doesn't actually show the changes at all, just the commit information.
* diff-tree: support list if input trees on stdinLinus Torvalds2005-05-06
| | | | | | | | | | This means that you can do git-rev-list HEAD --max-count=10 | git-diff-tree --stdin update-cache.c to see which (if any) of the last ten commits changed update-cache.c. Use the "-m" flag to see merges too. Normally they are suppressed.
* [PATCH] control/limit output of git-rev-listKay Sievers2005-05-06
| | | | | | | | | | | | | | | gitweb.cgi's default view is the log of the last day and git-rev-list can stop crawling the whole repo if we have all our data to display in the browser. Also the rss-feed query needs only the last 20 items. This will speeds up these queries dramatically. usage: rev-list [OPTION] commit-id --max-count=nr --max-age=epoch --min-age=epoch Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* update-cache: remove compiler warningLinus Torvalds2005-05-06
| | | | "Unused variable len"
* [PATCH] fix compare symlink against readlink not dataKay Sievers2005-05-06
| | | | | | | | | | | | Fix update-cache to compare the blob of a symlink against the link-target and not the file it points to. Also ignore all permissions applied to links. Thanks to Greg for recognizing this while he added our list of symlinks back to the udev repository. Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Steal -t option to git-ls-files from Cogito fork.Petr Baudis2005-05-06
| | | | | | | | This backports the -t option git-ls-files in Cogito added to the Linus version. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Implement -v (verbose) option for pull methods other than local transport.Junio C Hamano2005-05-06
| | | | | | | | | | | This moves the private "say()" function to pull.c, renames it to "pull_say()", and introduces a global variable "get_verbosely" that makes the pull backends report what they fetch. The -v option is added to git-rpull and git-http-pull to match git-local-pull. The documentation is updated to describe these pull commands. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add http and local transport support for git-pull-script.Junio C Hamano2005-05-06
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add documentation for the rest of commands.Junio C Hamano2005-05-05
| | | | | | | This adds descriptions for the core GIT commands that were not mentioned in the previous version. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Adjust core-git documentation to more recent Linus GIT.Junio C Hamano2005-05-05
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Reference documentation for the core git commands.David Greaves2005-05-05
| | | | | Signed-off-by: David Greaves <david@dgreaves.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge of http://members.cox.net/junkio/git-jc.gitLinus Torvalds2005-05-05
|\
| *-----. Octopus merge of the following five patches.Junio C Hamano2005-05-05
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update git-apply-patch-script for symbolic links. Make git-prune-script executable again. Do not write out new index if nothing has changed. diff-cache shows differences for unmerged paths without --cache. Update diff engine for symlinks stored in the cache. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | | | | * Update diff engine for symlinks stored in the cache.Junio C Hamano2005-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the external diff interface engine for the change to store the symbolic links in the cache, recently done by Kay Sievers. The main thing it does is when comparing with the work tree, it prepares the counterpart to the blob being compared by doing a readlink followed by sending that result to a temporary file to be diffed. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | | | * | diff-cache shows differences for unmerged paths without --cache.Junio C Hamano2005-05-05
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While manually resolving a merge conflict, being able to run diff-cache without --cache option between files in the work tree and either of the ancestor trees is helpful to verify the hand merged result. However, diff-cache refuses to handle unmerged paths, even when run without --cache option. This changes the behaviour so that the above use case will report the differences between the compared tree and the magic 0{40} SHA1 (i.e. "look at the work tree"). When there is no corresponding file in the work tree, or when the command is run with "--cache" option, it continues to report "unmerged". Signed-off-by: Junio C Hamano <junkio@cox.net>
| | | * | Do not write out new index if nothing has changed.Junio C Hamano2005-05-05
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | The git-update-cache command, especially with --refresh, may not change anything. In such a case, writing 1.6MB of the same thing is a waste. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * | Make git-prune-script executable again.Junio C Hamano2005-05-05
| | |/ | | | | | | | | | | | | | | | | | | I do not know why the executable bit was lost since the change went in as GIT pull, not via e-mail patch, but here is a fix. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Update git-apply-patch-script for symbolic links.Junio C Hamano2005-05-05
| |/ | | | | | | | | | | | | | | | | | | | | This patch updates the git-apply-patch-script for the symbolic links in the cache, recently added by Kay Sievers. It currently is very anal about symbolic link changes. It refuses to change between a regular file and a symbolic link, and only allows symbolic link changes if the patch is based on the same original. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | [PATCH] create subdirs for symlinksKay Sievers2005-05-05
| | | | | | | | | | | | | | | | We may need to create subdirectories, before we can create a symlink. Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Be more careful about tree entry modes.Linus Torvalds2005-05-05
| | | | | | | | | | | | | | The tree object parsing used to get the executable bit wrong, and didn't know about symlinks. Also, fsck really wants the full mode value so that it can verify the other bits for sanity, so save it all in struct tree_entry.
* | Fix git-resolve-script.Linus Torvalds2005-05-05
| | | | | | | | | | | | I'd stupidly forgotten one merge_head -> merge conversion, and all my tests were for the fast-forward case that never triggered the bug.
* | Fix symlink handlingLinus Torvalds2005-05-05
|/ | | | | We really always want to have S_IFREG there for non-symlinks, otherwise we create corrupt index files.
* [PATCH] git: Mention the '-p' option in the usage help string if git-diff-tree.Thomas Glanzmann2005-05-05
| | | | | | | Mention the '-p' option in the usage help string of git-diff-tree. Signed-Off-by: Thomas Glanzmann <sithglan@stud.uni-erlangen.de> Signed-Off-by: Linus Torvalds <torvalds@osdl.org>
* Split "git-pull-script" into two partsLinus Torvalds2005-05-05
| | | | | | | | Separate out the merge resolve from the actual getting of the data. Also, update the resolve phase to take advantage of the fact that we don't need to do the commit->tree object lookup by hand, since all the actors involved happily just act on a commit object these days.
* git-diff-cache: add "-m" flag to match all non-checked-out files with the index.Linus Torvalds2005-05-05
| | | | | This allows you to work with a directory tree that isn't fully populated, without making diff-cache say that all the files are gone.
* [PATCH] git and symlinks as tracked contentKay Sievers2005-05-05
| | | | | | | | | | Allow to store and track symlink in the repository. A symlink is stored the same way as a regular file, only with the appropriate mode bits set. The symlink target is therefore stored in a blob object. This will hopefully make our udev repository fully functional. :) Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix git rpush.Anton Altaparmakov2005-05-05
| | | | | | | | | Following up from my fix to rpull, please also apply this, which fixes rpush.c to call git-rpull rather than rpull which no longer exists after the Big Rename(TM)... Signed-off-by: Anton Altaparmakov <aia21@cantab.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix git rpull.Anton Altaparmakov2005-05-05
| | | | | | | | This fixes rpull.c to call git-rpush rather than rpush which no longer exists after the Big Rename(TM)... Signed-off-by: Anton Altaparmakov <aia21@cantab.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* git-pull-script: do the diffstat also for the fast-forward caseLinus Torvalds2005-05-05
| | | | This way you always see what the state change was.
* Merge http://members.cox.net/junkio/git-jc.git/Linus Torvalds2005-05-04
|\
| * When the patch tries to create a new file and the file exists, abort.Junio C Hamano2005-05-04
| | | | | | | | | | | | | | | | This fixes an error introduced to git-apply-patch-script in the previous round. We do not invoke patch for create/delete case, so we need to be a bit careful about detecting conflicts like this. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Optimize diff-cache -p --cachedJunio C Hamano2005-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch optimizes "diff-cache -p --cached" by avoiding to inflate blobs into temporary files when the blob recorded in the cache matches the corresponding file in the work tree. The file in the work tree is passed as the comparison source in such a case instead. This optimization kicks in only when we have already read the cache this optimization and this is deliberate. Especially, diff-tree does not use this code, because changes are contained in small number of files relative to the project size most of the time, and reading cache is so expensive for a large project that the cost of reading it outweighs the savings by not inflating blobs. Also this patch cleans up the structure passed from diff clients by removing one unused structure member. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Terminate diff-* on non-zero exit from GIT_EXTERNAL_DIFFJunio C Hamano2005-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (slightly updated from the version posted to the GIT mailing list with small bugfixes). This patch changes the git-apply-patch-script to exit non-zero when the patch cannot be applied. Previously, the external diff driver deliberately ignored the exit status of GIT_EXTERNAL_DIFF command, which was a design mistake. It now stops the processing when GIT_EXTERNAL_DIFF exits non-zero, so the damages from running git-diff-* with git-apply-patch-script between two wrong trees can be contained. The "diff" command line generated by the built-in driver is changed to always exit 0 in order to match this new behaviour. I know Pasky does not use GIT_EXTERNAL_DIFF yet, so this change should not break Cogito, either. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Git-prune-script loses blobs referenced from an uncommitted cache.Junio C Hamano2005-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (updated from the version posted to GIT mailing list). When a new blob is registered with update-cache, and before the cache is written as a tree and committed, git-fsck-cache will find the blob unreachable. This patch adds a new flag, "--cache" to git-fsck-cache, with which it keeps such blobs from considered "unreachable". The git-prune-script is updated to use this new flag. At the same time it adds .git/refs/*/* to the set of default locations to look for heads, which should be consistent with expectations from Cogito users. Without this fix, "diff-cache -p --cached" after git-prune-script has pruned the blob object will fail mysteriously and git-write-tree would also fail. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Short-cut error return path in git-local-pull.Junio C Hamano2005-05-04
| | | | | | | | | | | | | | | | | | When git-local-pull with -l option gets ENOENT attempting to create a hard link, there is no point falling back to other copy methods. With this patch, git-local-pull detects such a case and gives up copying the file early. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Make git-*-pull say who wants them for missing objects.Junio C Hamano2005-05-04
| | | | | | | | | | | | | | | | | | | | This patch updates pull.c, the engine that decides which objects are needed, given a commit to traverse from, to report which commit was calling for the object that cannot be retrieved from the remote side. This complements git-fsck-cache in that it checks the consistency of the remote repository for reachability. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Make "git-prune-script" take all refs into account.Linus Torvalds2005-05-04
| | | | | | | | This avoids pruning the kernel v2.6.11 tree that now has a tag.
* | Teach fsck-cache to accept non-commits for reachability analysis.Linus Torvalds2005-05-04
| | | | | | | | | | In particular, teach it about tags. Also, to make reachability actually work for tags, we need to add the ref to the tagged object.
* | Teach "git-pull-script" about alternate HEAD's to pull..Linus Torvalds2005-05-04
| | | | | | | | People are already starting to use a multi-head model.
* | [PATCH] Fix memory leaks in git-fsck-cacheSergey Vlasov2005-05-04
| | | | | | | | | | | | | | | | This patch fixes memory leaks in parse_object() and related functions; these leaks were very noticeable when running git-fsck-cache. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | git-pull-script: add a final "diffstat" to show the result of the merge.Linus Torvalds2005-05-04
|/ | | | This is useful to verify that you got the right thing.
* sha1_file: make the new sha1 object writing be coda-friendly.Linus Torvalds2005-05-03
| | | | | Coda doesn't like cross-directory hardlinks. So try to fall back on a plain rename instead.
* Improve sha1 object file writing.Linus Torvalds2005-05-03
| | | | | | | | | | | Make it much safer: we write to a temporary file, and then link that temporary file to the final destination. This avoids all the nasty races if several people write the same object at the same time. It should also result in nicer on-disk layout, since it means that objects all get created in the same subdirectory. That makes a lot of block allocation algorithms happier, since the objects will now be allocated from the same zone.
* fsck-cache: fix SIGSEGV on bad tag objectLinus Torvalds2005-05-03
| | | | | | | | | | | fsck_tag() failes to notice that the parsing of the tag may have failed in the parse_object() call on the object that it is tagging. Noticed by Junio. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Automatic merge of /home/torvalds/junkio/.git/Linus Torvalds2005-05-03
|\
| * Update git-merge-one-file-script.Junio C Hamano2005-05-01
| | | | | | | | | | | | | | | | | | With this change, git-merge-one-file-script ceases to smudge files in the work tree when recording the trivial merge results (conflicting auto-merge failure case does not touch the work tree file as before). Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Implement git-update-cache --force-remove <path>Junio C Hamano2005-05-01
| | | | | | | | | | | | | | | | This new flag tells git-update-cache to remove the named path even when the work tree still happens to have the file. It is used to update git-merge-one-file-script not to smudge the work tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Add git-write-blob.Junio C Hamano2005-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A new command, git-write-blob, is introduced. This registers the contents of any file on the filesystem as a blob in the object database and reports its SHA1 to the standard output. To implement it, the patch promotes index_fd() from a static function in update-cache.c to extern and moves it to a library source, sha1_file.c. This command is used to update git-merge-one-file-script so that it does not smudge the work tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Make git-apply-patch-script executable.Junio C Hamano2005-05-01
| |
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-03 12:09:24 +0000