summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-06-05Merge branch 'js/alias' into nextLibravatar Junio C Hamano9-73/+213
* js/alias: git alias: try alias last. If you have a config containing something like this: builtin-push: don't pass --thin to HTTP transport pack-objects: improve path grouping heuristics. rev-list: fix process_tree() conversion. Fix typo in tutorial-2.txt Fix Documentation/everyday.txt: Junio's workflow Add example xinetd(8) configuration to Documentation/everyday.txt read-tree: fix eye-candy. gitview: Add some useful keybindings.
2006-06-05git alias: try alias last.Libravatar Junio C Hamano1-6/+14
This disables alias "foo" from being used for git-foo, and when we do use alias we check the built-in and then existing command names first and then alias as the fallback. This avoids the problem of common commands used in scripts getting clobbered by user specific aliases. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05If you have a config containing something like this:Libravatar Johannes Schindelin1-0/+111
[alias] l = "log --stat -M ORIG_HEAD.." you can call git l and it will do the same as git log --stat -M ORIG_HEAD.. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05builtin-push: don't pass --thin to HTTP transportLibravatar Nick Hengeveld1-9/+11
git-http-push does not currently use packs to transfer objects. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05pack-objects: improve path grouping heuristics.Libravatar Linus Torvalds1-50/+19
This trivial patch not only simplifies the name hashing, it actually improves packing for both git and the kernel. The git archive pack shrinks from 6824090->6622627 bytes (a 3% improvement), and the kernel pack shrinks from 108756213 to 108219021 (a mere 0.5% improvement, but still, it's an improvement from making the hashing much simpler!) We just create a 32-bit hash, where we "age" previous characters by two bits, so the last characters in a filename count most. So when we then compare the hashes in the sort routine, filenames that end the same way sort the same way. It takes the subdirectory into account (unless the filename is > 16 characters), but files with the same name within the same subdirectory will obviously sort closer than files in different subdirectories. And, incidentally (which is why I tried the hash change in the first place, of course) builtin-rev-list.c will sort fairly close to rev-list.c. And no, it's not a "good hash" in the sense of being secure or unique, but that's not what we're looking for. The whole "hash" thing is misnamed here. It's not so much a hash as a "sorting number". [jc: rolled in simplification for computing the sorting number computation for thin pack base objects] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05rev-list: fix process_tree() conversion.Libravatar Linus Torvalds1-2/+2
The tree-walking conversion of the "process_tree()" function broke packing by using an unrelated variable from outer scope. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05Fix typo in tutorial-2.txtLibravatar Linus Torvalds1-1/+1
This should be obvious enough. I didn't actually _test_ the tutorial, but if the old command worked, something is really wrong! Signed-off-by: Linus "Duh!" Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05Fix Documentation/everyday.txt: Junio's workflowLibravatar Horst H. von Brand1-7/+12
The workflow for Junio was badly formatted. Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05Add example xinetd(8) configuration to Documentation/everyday.txtLibravatar Horst H. von Brand1-0/+23
Many Linux distributions use xinetd(8), not inetd(8). Give a sample configuration file. Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05read-tree: fix eye-candy.Libravatar Linus Torvalds1-0/+1
Anton Blanchard spotted that watching checkout stage of a clone on a slow terminal takes ages because it forgot to clear the "once a second happened" flag, so instead of updates the percentage output for every file it checks out after the first second has passed. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-04gitview: Add some useful keybindings.Libravatar Aneesh Kumar K.V2-0/+21
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-04Fix earlier mismerges.Libravatar Junio C Hamano1-4/+2
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-04Merge branch 'new' of git://git.kernel.org/pub/scm/gitk/gitk into nextLibravatar Junio C Hamano1-384/+1078
* 'new' of git://git.kernel.org/pub/scm/gitk/gitk: gitk: Show branch name(s) as well, if "show nearby tags" is enabled gitk: Show nearby tags gitk: Add a goto next/previous highlighted commit function gitk: Provide ability to highlight based on relationship to selected commit gitk: Fix bug in highlight stuff when no line is selected gitk: Move "pickaxe" find function to highlight facility gitk: Improve the text window search function gitk: First cut at a search function in the patch/file display window gitk: Highlight paths of interest in tree view as well gitk: Highlight entries in the file list as well gitk: Make a row of controls for controlling highlighting
2006-06-04Merge branch 'vb/sendemail' into nextLibravatar Junio C Hamano35-70/+76
* vb/sendemail: Cleanup git-send-email.perl:extract_valid_email read-tree --reset: update working tree file for conflicted paths. Documentation: Spelling fixes Builtin git-rev-parse. fetch: do not report "same" unless -verbose.
2006-06-04Cleanup git-send-email.perl:extract_valid_emailLibravatar Horst H. von Brand1-6/+3
- Fix the regular expressions for local addresses - Fix the fallback regexp for non-local addresses, simplify the logic Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-03Merge branch 'lt/tree-2'Libravatar Junio C Hamano16-216/+293
* lt/tree-2: fetch.c: do not call process_tree() from process_tree(). tree_entry(): new tree-walking helper function adjust to the rebased series by Linus. Remove "tree->entries" tree-entry list from tree parser Switch "read_tree_recursive()" over to tree-walk functionality Make "tree_entry" have a SHA1 instead of a union of object pointers Add raw tree buffer info to "struct tree" Remove last vestiges of generic tree_entry_list Convert fetch.c: process_tree() to raw tree walker Convert "mark_tree_uninteresting()" to raw tree walker Remove unused "zeropad" entry from tree_list_entry fsck-objects: avoid unnecessary tree_entry_list usage Remove "tree->entries" tree-entry list from tree parser builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec() Switch "read_tree_recursive()" over to tree-walk functionality Make "tree_entry" have a SHA1 instead of a union of object pointers Make "struct tree" contain the pointer to the tree buffer
2006-06-03Merge branch 'sp/reflog'Libravatar Junio C Hamano26-242/+755
* sp/reflog: fetch.c: do not pass uninitialized lock to unlock_ref(). Test that git-branch -l works. Verify git-commit provides a reflog message. Enable ref log creation in git checkout -b. Create/delete branch ref logs. Include ref log detail in commit, reset, etc. Change order of -m option to update-ref. Correct force_write bug in refs.c Change 'master@noon' syntax to 'master@{noon}'. Log ref updates made by fetch. Force writing ref if it doesn't exist. Added logs/ directory to repository layout. General ref log reading improvements. Fix ref log parsing so it works properly. Support 'master@2 hours ago' syntax Log ref updates to logs/refs/<ref> Convert update-ref to use ref_lock API. Improve abstraction of ref lock/write.
2006-06-03Merge branch 'ff/svnimport'Libravatar Junio C Hamano1-2/+9
* ff/svnimport: git-svnimport: Improved detection of merges.
2006-06-03read-tree --reset: update working tree file for conflicted paths.Libravatar Junio C Hamano1-10/+14
The earlier "git reset --hard" simplification stopped removing leftover working tree files from a failed automerge, when switching back to the HEAD version that does not have the paths. This patch, instead of removing the unmerged paths from the index, drops them down to stage#0 but marks them with mode=0 (the same "to be deleted" marker we internally use for paths deleted by the merge). one_way_merge() function and the functions it calls already know what to do with them -- if the tree we are reading has the path the working tree file is overwritten, and if it doesn't the working tree file is removed. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-03Merge branch 'jc/fmt-patch'Libravatar Junio C Hamano4-39/+113
* jc/fmt-patch: Update documentation for git-format-patch format-patch: resurrect extra headers from config format-patch --signoff
2006-06-03Documentation: Spelling fixesLibravatar Horst H. von Brand28-47/+47
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-03Builtin git-rev-parse.Libravatar Christian Couder4-6/+8
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-03fetch: do not report "same" unless -verbose.Libravatar Junio C Hamano1-1/+4
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-04gitk: Show branch name(s) as well, if "show nearby tags" is enabledLibravatar Paul Mackerras1-11/+43
This is a small extension to the code that reads the complete commit graph, to make it compute descendent heads as well as descendent tags. We don't exclude descendent heads that are descendents of other descendent heads as we do for tags, since it is useful to know all the branches that a commit is on. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-06-03gitk: Show nearby tagsLibravatar Paul Mackerras1-23/+247
This adds a feature to the diff display window where it will show the tags that this commit follows (is a descendent of) and precedes (is an ancestor of). Specifically, it will show the tags for all tagged descendents that are not a descendent of another tagged descendent of this commit, and the tags for all tagged ancestors that are not ancestors of another tagged ancestor of this commit. To do this, gitk reads the complete commit graph using git rev-list and performs a couple of traversals of the tree. This is done in the background, but since it can be time-consuming, there is an option to turn it off in the `edit preferences' window. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-06-02Merge branch 'jc/fmt-patch' into nextLibravatar Junio C Hamano1-34/+35
* jc/fmt-patch: Update documentation for git-format-patch
2006-06-02Merge branch 'ds/doc' into jc/fmt-patchLibravatar Junio C Hamano7-101/+152
* ds/doc: Update documentation for git-format-patch sha1_file: avoid re-preparing duplicate packs handle concurrent pruning of packed objects http: prevent segfault during curl handle reuse Remove possible segfault in http-fetch. gitk: show_error fix [PATCH] gitk: start-up bugfix [PATCH] gitk: Replace "git-" commands with "git " [PATCH] gitk: Display commit messages with word wrap gitk: Fix bug where page-up/down wouldn't always work properly gitk: Fix display of "(...)" for parents/children we haven't drawn send-email: only 'require' instead of 'use' Net::SMTP Allow multiple -m options to git-commit.
2006-06-02Update documentation for git-format-patchLibravatar Dennis Stosberg1-34/+35
[jc: adjusted for recently resurrected features] Signed-off-by: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-02Merge branch 'master' into nextLibravatar Junio C Hamano1-6/+24
* master: sha1_file: avoid re-preparing duplicate packs handle concurrent pruning of packed objects
2006-06-02Merge branch 'lt/tree-2' into nextLibravatar Junio C Hamano1-3/+10
* lt/tree-2: fetch.c: do not call process_tree() from process_tree().
2006-06-02fetch.c: do not call process_tree() from process_tree().Libravatar Junio C Hamano1-3/+10
This function reads a freshly fetched tree object, and schedules the objects pointed by it for further fetching, so doing lookup_tree() and process_tree() recursively from there does not make much sense. We need to use process() on it to make sure we fetch it first, and leave the recursive processing to later stages. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-02Merge branch 'jc/fmt-patch' into nextLibravatar Junio C Hamano3-3/+26
* jc/fmt-patch: format-patch: resurrect extra headers from config
2006-06-02sha1_file: avoid re-preparing duplicate packsLibravatar Jeff King1-0/+6
When adding packs, skip the pack if we already have it in the packed_git list. This might happen if we are re-preparing our packs because of a missing object. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-02handle concurrent pruning of packed objectsLibravatar Jeff King1-6/+18
This patch causes read_sha1_file and sha1_object_info to re-examine the list of packs if an object cannot be found. It works by re-running prepare_packed_git() after an object fails to be found. It does not attempt to clean up the old pack list. Old packs which are in use can continue to be used (until unused by lru selection). New packs are placed at the front of the list and will thus be examined before old packs. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-02Merge branch 'nh/http'Libravatar Junio C Hamano2-5/+8
* nh/http: http: prevent segfault during curl handle reuse Remove possible segfault in http-fetch.
2006-06-02format-patch: resurrect extra headers from configLibravatar Johannes Schindelin3-3/+26
Once again, if you have [format] headers = "Origamization: EvilEmpire\n" format-patch will add these headers just after the "Subject:" line. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-31Merge branch 'master' into nextLibravatar Junio C Hamano1-48/+54
* master: gitk: show_error fix [PATCH] gitk: start-up bugfix [PATCH] gitk: Replace "git-" commands with "git " [PATCH] gitk: Display commit messages with word wrap gitk: Fix bug where page-up/down wouldn't always work properly gitk: Fix display of "(...)" for parents/children we haven't drawn
2006-05-31Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano1-48/+54
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: show_error fix [PATCH] gitk: start-up bugfix [PATCH] gitk: Replace "git-" commands with "git " [PATCH] gitk: Display commit messages with word wrap gitk: Fix bug where page-up/down wouldn't always work properly gitk: Fix display of "(...)" for parents/children we haven't drawn
2006-05-31Merge branch 'master' into nextLibravatar Junio C Hamano2-8/+31
* master: send-email: only 'require' instead of 'use' Net::SMTP Allow multiple -m options to git-commit.
2006-05-31Merge branch 'nh/http' into nextLibravatar Junio C Hamano1-3/+6
* nh/http: http: prevent segfault during curl handle reuse
2006-05-31http: prevent segfault during curl handle reuseLibravatar Nick Hengeveld1-3/+6
If a curl handle is configured with special options, they may reference information that is freed after the request is complete which can cause a segfault if the curl handle is reused for a different type of request. This patch resets these options to a safe state when a transfer slot is assigned to a new request. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-31send-email: only 'require' instead of 'use' Net::SMTPLibravatar Johannes Schindelin1-1/+1
This was proposed by Eric Wong and fixes the test. (Of course, git-send-email does not work, if there is no Net::SMTP here, but it will say what is wrong when you actually try to use send-email.) Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-31Allow multiple -m options to git-commit.Libravatar Shawn Pearce1-7/+30
I find it very convenient to be able to supply multiple paragraphs of text on the command line with a single git-commit call. This change permits multiple -m/--message type options to be supplied to git-commit with each message being added as its own paragraph of text in the commit message. The -m option is still not permitted with -c/-C/-F nor are multiple occurrences of these options permitted. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-31Merge branch 'sp/reflog' into nextLibravatar Junio C Hamano1-4/+7
* sp/reflog: fetch.c: do not pass uninitialized lock to unlock_ref().
2006-05-31fetch.c: do not pass uninitialized lock to unlock_ref().Libravatar Junio C Hamano1-4/+7
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-31Merge branch 'jc/fmt-patch' into nextLibravatar Junio C Hamano3-2/+52
* jc/fmt-patch: format-patch --signoff
2006-05-31format-patch --signoffLibravatar Junio C Hamano3-2/+52
This resurrects --signoff option to format-patch. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-31Merge branch 'ff/svnimport' into nextLibravatar Junio C Hamano4-17/+43
* ff/svnimport: git-svnimport: Improved detection of merges. Improved pack format documentation. git_exec_path, execv_git_cmd: ignore empty environment variables execv_git_cmd: Fix stack buffer overflow. Fixed Cygwin CR-munging problem in mailsplit
2006-05-31Merge branch 'lt/tree-2' into nextLibravatar Junio C Hamano11-141/+112
* lt/tree-2: tree_entry(): new tree-walking helper function
2006-05-31git-svnimport: Improved detection of merges.Libravatar Florian Forster1-2/+9
The regexes detecting merges (while still relying on the commit messages, though) have been improved to catch saner (and hopefully more) messages. The old regex was so generic that it often matched something else and missed the actual merge-message. Also, the regex given with the `-M' commandline-option is checked first: Explicitely given regexes should be considered better than the builtin ones, and should therefore be given a chance to match a message first. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 14:26:46 +0000