aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Rewrite synopsis to clarify the two primary uses of git-checkout.Jon Loeliger2006-03-17
| | | | | | | Fix a few typo/grammar problems. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix minor typo.Jon Loeliger2006-03-17
| | | | | Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Reference git-commit-tree for env vars.Jon Loeliger2006-03-17
| | | | | Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Clarify git-rebase example commands.Jon Loeliger2006-03-17
| | | | | Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document the default source of template files.Jon Loeliger2006-03-17
| | | | | | | Also explain a bit more about how the template option works. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Call out the two different uses of git-branch and fix a typo.Jon Loeliger2006-03-17
| | | | | Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add git-show referenceJon Loeliger2006-03-17
| | | | | Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* blame: Fix git-blame <directory>Fredrik Kuivinen2006-03-17
| | | | | | | | | Before this patch git-blame <directory> gave non-sensible output. (It assigned blame to some random file in <directory>) Abort with an error message instead. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* blame: Nicer outputFredrik Kuivinen2006-03-17
| | | | | | | | | | | | | | As pointed out by Junio, it may be dangerous to cut off people's names after 15 bytes. If the name is encoded in an encoding which uses more than one byte per code point we may end up with outputting garbage. Instead of trying to do something smart, just output the entire name. We don't gain much screen space by chopping it off anyway. Furthermore, only output the file name if we actually found any renames. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* fix imap-send for OSXRandal L. Schwartz2006-03-15
| | | | | | This patch works... I've been using it to stay current. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Let merge set the default strategy.Mark Hollomon2006-03-15
| | | | | | | | | | If the user does not set a merge strategy for git-pull, let git-merge calculate a default strategy. [jc: with minor stylistic tweaks] Signed-off-by: Mark Hollomon <markhollomon@comcast.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix broken slot reuse when fetching alternatesNick Hengeveld2006-03-15
| | | | | | | | | | When fetching alternates, http-fetch may reuse the slot to fetch non-http alternates if http-alternates does not exist. When doing so, it now needs to update the slot's finished status so run_active_slot waits for the non-http alternates request to finish. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'jc/pack'Junio C Hamano2006-03-13
|\ | | | | | | | | | | * jc/pack: pack-objects: simplify "thin" pack. verify-pack -v: show delta-chain histogram.
| * pack-objects: simplify "thin" pack.Junio C Hamano2006-03-06
| | | | | | | | | | | | | | | | | | | | There was a misguided logic to overly prefer using objects that we are not going to pack as the base object. This was unnecessary. It does not matter to the unpacking side where the base object is -- it matters more to make the resulting delta smaller. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * verify-pack -v: show delta-chain histogram.Junio C Hamano2006-03-05
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/fsck'Junio C Hamano2006-03-13
|\ \ | | | | | | | | | | | | * jc/fsck: fsck-objects: Remove --standalone
| * | fsck-objects: Remove --standaloneJunio C Hamano2006-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fsck-objects command (back then it was called fsck-cache) used to complain if objects referred to by files in .git/refs/ or objects stored in files under .git/objects/??/ were not found as stand-alone SHA1 files (i.e. found in alternate object pools or packed archives stored under .git/objects/pack). Back then, packs and alternates were new curiosity and having everything as loose objects were the norm. When we adjusted the behaviour of fsck-cache to consider objects found in packs are OK, we introduced the --standalone flag as a backward compatibility measure. It still correctly checks if your repository is complete and consists only of loose objects, so in that sense it is doing the "right" thing, but checking that is pointless these days. This commit removes --standalone flag. See also: 23676d407c63a6f67f8ce3ff192199bda03e6a03 8a498a05c3c6b2f53db669b24f36257ab213eb4c Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'nh/http'Junio C Hamano2006-03-13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nh/http: http-push: cleanup http-push: support for updating remote info/refs http-push: improve remote lock management http-push: refactor remote file/directory processing HTTP slot reuse fixes http-push: fix revision walk
| * | | http-push: cleanupNick Hengeveld2006-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More consistent usage string, condense push output, remove extra slashes in URLs, fix unused variables, include HTTP method name in failure messages. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | http-push: support for updating remote info/refsNick Hengeveld2006-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If info/refs exists on the remote, get a lock on info/refs, make sure that there is a local copy of the object referenced in each remote ref (in case someone else added a tag we don't have locally), do all the refspec updates, and generate and send an updated info/refs file. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | http-push: improve remote lock managementNick Hengeveld2006-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Associate the remote locks with the remote repo, add a function to check and refresh all current locks. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | http-push: refactor remote file/directory processingNick Hengeveld2006-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace single-use functions with one that can get a list of remote collections and pass file/directory information to user-defined functions for processing. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | HTTP slot reuse fixesNick Hengeveld2006-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate into http-push a fix related to accessing slot results after the slot was reused, and fix a case in run_active_slot where a finished slot wasn't detected if the slot was reused. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | http-push: fix revision walkNick Hengeveld2006-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The revision walk was not including tags because setup_revisions zeroes out the revs flags. Pass --objects so it picks up all the necessary bits. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'fk/blame'Junio C Hamano2006-03-13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fk/blame: blame: Rename detection (take 2) rev-lib: Make it easy to do rename tracking (take 2) Make it possible to not clobber object.util in sort_in_topological_order (take 2)
| * | | | blame: Rename detection (take 2)Fredrik Kuivinen2006-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | rev-lib: Make it easy to do rename tracking (take 2)Fredrik Kuivinen2006-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prune_fn in the rev_info structure is called in place of try_to_simplify_commit. This makes it possible to do rename tracking with a custom try_to_simplify_commit-like function. This commit also introduces init_revisions which initialises the rev_info structure with default values. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | Make it possible to not clobber object.util in sort_in_topological_order ↵Fredrik Kuivinen2006-03-10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | (take 2) Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | annotate-tests: override VISUAL when running tests.Mark Wooding2006-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests hang for me waiting for Emacs with its output directed somewhere strage, because I hedged my bets and set both EDITOR and VISUAL to run Emacs. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | imap-send: Add missing #include for macosxJohannes Schindelin2006-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a compile error without that. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | git-diff: -p disables rename detection.Junio C Hamano2006-03-11
| | | |
* | | | imap-send: cleanup execl() call to use NULL sentinel instead of 0Marco Roeland2006-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some versions of gcc check that calls to the exec() family have the proper sentinel for variadic calls. This should be (char *) NULL according to the man page. Although for all other purposes the 0 is equivalent, gcc nevertheless does emit a warning for 0 and not for NULL. This also makes the usage consistent throughout git. The whitespace in function calls throughout imap-send.c has its own style, so I left it that way. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | annotate.perl triggers rpm bugsean2006-03-11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RPM, at least on Fedora boxes, automatically creates a dependency for any perl "use" lines, and one of the help text lines unfortunately begins like this: -S, --rev-file revs-file use revs from revs-file instead of calling git-rev-list RPM gets confused and creates a false dependecy for the nonexistent perl package "revs". Obviously this creates a problem when someone goes to install the git-core rpm. Since other help sentences all start with capital letter, make this one match them by upcasing "Use". As a side effect, RPM stops getting confused. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add git-imap-send, derived from isync 1.0.1.Mike McCormack2006-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-imap-send drops a patch series generated by git-format-patch into an IMAP folder. This allows patch submitters to send patches through their own mail program. git-imap-send uses the following values from the GIT repository configuration: The target IMAP folder: [imap] Folder = "INBOX.Drafts" A command to open an ssh tunnel to the imap mail server. [imap] Tunnel = "ssh -q user@imap.server.com /usr/bin/imapd ./Maildir 2> /dev/null" [imap] Host = imap.server.com User = bob Password = pwd Port = 143
* | | repack: prune loose objects when -d is givenJunio C Hamano2006-03-10
| | | | | | | | | | | | | | | | | | | | | [jc: the request originally came from Martin Atukunda, which was improved further by Alex Riesen] Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | try_to_simplify_commit(): do not skip inspecting tree change at boundary.Junio C Hamano2006-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When git-rev-list (and git-log) collapsed ancestry chain to commits that touch specified paths, we failed to inspect and notice tree changes when we are about to hit uninteresting parent. This resulted in "git rev-list since.. -- file" to always show the child commit after the lower bound, even if it does not touch the file. This commit fixes it. Thanks for Catalin for reporting this. See also: 461cf59f8924f174d7a0dcc3d77f576d93ed29a4 Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Fix t1200 test for breakage caused by removal of full-stop at the end of ↵Junio C Hamano2006-03-09
| | | | | | | | | | | | | | | | | | fast-forward message. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Describe how to add extra mail header lines in mail generated by ↵Mike McCormack2006-03-09
| | | | | | | | | | | | git-format-patch.
* | | Document the --attach flag.Mike McCormack2006-03-09
| | |
* | | allow double click on current HEAD id after git-pullOlaf Hering2006-03-09
|/ / | | | | | | | | | | | | | | | | Double click on to current HEAD commit id is not possible, the dot has to go. [jc: by popular requests.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* | refs.c::do_for_each_ref(): Finish error message lines with "\n"Junio C Hamano2006-03-09
| | | | | | | | | | | | | | | | | | We used fprintf() to show an error message without terminating it with LF; use error() for that. cf. c401cb48e77459a4ccad76888ad31bef252facc5 Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Nicer output from 'git'Fredrik Kuivinen2006-03-09
| | | | | | | | | | | | | | [jc: with suggestions by Jan-Benedict Glaw] Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))Junio C Hamano2006-03-09
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Remove trailing dot after short descriptionFredrik Kuivinen2006-03-09
| | | | | | | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix some inconsistencies in the docsFredrik Kuivinen2006-03-09
| | | | | | | | | | Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | contrib/git-svn: fix a harmless warning on rebuild (with old repos)Eric Wong2006-03-09
| | | | | | | | | | | | | | | | | | It's only for repositories that were imported with very early versions of git-svn. Unfortunately, some of those repos are out in the wild already, so fix this warning. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | contrib/git-svn: remove the --no-stop-on-copy flagEric Wong2006-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | Output a big warning if somebody actually has a pre-1.0 version of svn that doesn't support it. Thanks to Yann Dirson for reminding me it still existed and attempting to re-enable it :) I think I subconciously removed support for it earlier... Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | contrib/git-svn: fix svn compat and fetch argsEric Wong2006-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'svn info' doesn't work with URLs in svn <= 1.1. Now we only run svn info in local directories. As a side effect, this should also work better for 'init' off directories that are no longer in the latest revision of the repository. svn checkout -r<revision> arguments are fixed. Newer versions of svn (1.2.x) seem to need URL@REV as well as -rREV to checkout a particular revision... Add an example in the manpage of how to track directory that has been moved since its initial revision. A huge thanks to Yann Dirson for the bug reporting and testing my original patch. Thanks also to Junio C Hamano for suggesting a safer way to use git-rev-parse. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Don't recurse into parents marked uninteresting.Matthias Urlichs2006-03-09
| | | | | | | | | | | | | | | | revision.c:make_parents_uninteresting() is exponential with the number of merges in the tree. That's fine -- unless some other part of git already has pulled the whole commit tree into memory ... Signed-off-by: Junio C Hamano <junkio@cox.net>
* | diff-delta: bound hash list length to avoid O(m*n) behaviorNicolas Pitre2006-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The diff-delta code can exhibit O(m*n) behavior with some patological data set where most hash entries end up in the same hash bucket. To prevent this, a limit is imposed to the number of entries that can exist in the same hash bucket. Because of the above the code is a tiny bit more expensive on average, even if some small optimizations were added as well to atenuate the overhead. But the problematic samples used to diagnoze the issue are now orders of magnitude less expensive to process with only a slight loss in compression. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-23 04:26:18 +0000