summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ref-format documentation.Junio C Hamano2005-10-163-2/+66
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Sparse-directory safety fix.Junio C Hamano2005-10-161-1/+1
| | | | | | | | This will be removed when merging the second phase of Linus' "Create object subdirectories on demand" change anyway, but the code to recreate the empty .git/objects/??/ directory was confused. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'fixes'Junio C Hamano2005-10-161-0/+7
|\
| * whatchanged: document -m option from git-diff-tree.Junio C Hamano2005-10-151-0/+7
| | | | | | | | | | | | | | | | | | The documentation for git-whatchanged is meant to describe only the most frequently used options from git-diff-tree. Because "why doesn't it show merges" was asked more than once, we'd better describe '-m' option there. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | We do not depend on patch.Junio C Hamano2005-10-161-2/+2
| | | | | | | | | | | | | | | | | | Deb packaging claim we depend on patch, but I think we use git-apply where it matters. When a patch does not apply with git-apply, using GNU patch still is helpful sometimes. So demote it from "Depends" to "Suggests". Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'svn' of http://netz.smurf.noris.de/git/gitJunio C Hamano2005-10-165-5/+859
|\ \ | | | | | | | | | | | | | | | | | | [jc: I have my pre-commit hook enabled to catch trailing whitespaces, and fixed them up while merging.] Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | svn commit: re-word the exit-due-to-memory-leak messageMatthias Urlichs2005-10-161-1/+2
| | | | | | | | | | | | | | | | | | Reworded the exit message, as per Kalle Valo's suggestion (but shorter). Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | Makefile entry for git-svnimport contained a small typo.Kalle Valo2005-10-161-1/+1
| | | | | | | | | | | | Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: copy directoriesMatthias Urlichs2005-10-111-13/+56
| | | | | | | | | | | | | | | | | | Import SVN-copied and -referenced directories correctly. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: Add direct HTTP accessMatthias Urlichs2005-10-112-19/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some SVN repositories that are accessible through HTTP don't like when I retrieve files using SVN methods ("internal server error"). Therefore, I added an option to get the contents using (persistent) HTTP directly. This also reduces round-trip time, from two or three requests down to one. Also corrected error handling a bit. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: remove some CVS cruftMatthias Urlichs2005-10-111-35/+4
| | | | | | | | | | | | | | | | | | Some remains of CVS still lingered. Removed. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: make -s option actually optionalMatthias Urlichs2005-10-111-1/+2
| | | | | | | | | | | | | | | | | | The -s option was accidentally not optional. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: typo fixMatthias Urlichs2005-10-111-1/+1
| | | | | | | | | | | | | | | | | | Fixed a minor typo Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: get all revisionsMatthias Urlichs2005-10-101-1/+1
| | | | | | | | | | | | | | | | | | Not skipping the last revision is generally seen as Good Thing. ;-) Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: unlink downlaoded filesMatthias Urlichs2005-10-101-0/+1
| | | | | | | | | | | | | | | | | | | | | Actually removing the files that have been checked out of SVN, after checking them into git of course, is a good idea... Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: Add a loop limit optionMatthias Urlichs2005-10-102-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | The svn library has a serious memory leak. Added a new option (-l NUM) which causes git-svnimport to exit cleanly after fetching that many changes, in order to . Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: incremental importsMatthias Urlichs2005-10-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Incremental imports skipped a revision. Also improve interrupt safety -- ^C while writing a tag caused the tag to be skipped. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: skip initial revisionsMatthias Urlichs2005-10-102-7/+12
| | | | | | | | | | | | | | | | | | | | | Add a flag to skip initial revisions: some SVN repositories have initial setup cruft in their logs which we might want to ignore. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: Do not create empty tagsMatthias Urlichs2005-10-101-120/+125
| | | | | | | | | | | | | | | | | | If a tag is "clean", do not create a commit for it. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: Fix tagging.Matthias Urlichs2005-10-101-16/+12
| | | | | | | | | | | | | | | | | | Tagging was 100% broken. :-/ Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: remove debuggingMatthias Urlichs2005-10-101-2/+0
| | | | | | | | | | | | | | | | | | Removed debugging output used to identify the too-many-connections problem. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: wrong file open modeMatthias Urlichs2005-10-101-1/+1
| | | | | | | | | | | | | | | | | | There are multiple | characters in Unicode. Don't use the wrong one ... Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: avoid reconnectingMatthias Urlichs2005-10-101-5/+6
| | | | | | | | | | | | | | | | | | | | | Perl's eval() sets $@ to empts, not undef, when it succeeds. That caused excessive reconnect attempts. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn improt needs SVN::Core 1.2.1 or betterMatthias Urlichs2005-10-101-0/+2
| | | | | | | | | | | | | | | | | | Die with a warning if Perl's svn module is too old. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: add libsvn-core-perl to Debian's control fileMatthias Urlichs2005-10-101-1/+1
| | | | | | | | | | | | | | | | | | Added libsvn-core-perl to debian/control, "Recommends:" section. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: fixed two pipe open calls.Matthias Urlichs2005-10-101-4/+4
| | | | | | | | | | | | | | | | | | | | | Perl's magic "different semantics of open() based on the number of arguments" is really annoying at times... Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: copy path informationMatthias Urlichs2005-10-101-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug in the SVN library, path information is freed as soon as the callback returns, even if it still refers to the data. Workaround: Copy it. (Also fix a wrong-method-name bug while we're at it.) Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | SVN import: No modesMatthias Urlichs2005-10-101-25/+0
| | | | | | | | | | | | | | | | | | | | | svn doesn't seem to save file modes: removed the code that analyzes them. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | svn import: add eval()Matthias Urlichs2005-10-101-5/+11
| | | | | | | | | | | | | | | | | | Trying to downlaod a file that's really a subdirectory doesn't work too well. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
| * | New: git-svnimport.Matthias Urlichs2005-10-103-1/+772
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the name suggests, this script imports from SVN. Only "normal" SVN repositories (with single trunk/, branches/, and tags/ subdrectories) are supported. Incremental imports require preserving the file .git/svn2git. Signed-Off-by: Matthias Urlichs <smurf@smurf.noris.de>
| * | cvsimport: report merge parentsMatthias Urlichs2005-10-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Matching and reporting merge parents happens in a subprocess. Re-open stdout before redirecting stdout to the pipe, so that printing verbose messages doesn't go to the wrong place. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* | | Squelch compiler warnings from connect.cJunio C Hamano2005-10-161-0/+1
| | | | | | | | | | | | | | | | | | Forgot to include necessary header file to get the function declaration. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Disable hooks during tests.Junio C Hamano2005-10-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Individual tests for hooks would want to have their own tests when written. Also we should not pick up from random templates the user happens to have. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Sparse fixes for http-fetchPeter Hagervall2005-10-161-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch cleans out all sparse warnings from http-fetch.c I'm a bit uncomfortable with adding extra #ifdefs to avoid either 'mixing declaration with code' or 'unused variable' warnings, but I figured that since those functions are already littered with #ifdefs I might just get away with it. Comments? [jc: I adjusted Peter's patch to address uncomfortableness issues.] Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Show peeled onion from upload-pack and server-info.Junio C Hamano2005-10-153-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates git-ls-remote to show SHA1 names of objects that are referred by tags, in the "ref^{}" notation. This would make git-findtags (without -t flag) almost trivial. git-peek-remote . | sed -ne "s:^$target "'refs/tags/\(.*\)^{}$:\1:p' Also Pasky could do: git-ls-remote --tags $remote | sed -ne 's:\( refs/tags/.*\)^{}$:\1:p' to find out what object each of the remote tags refers to, and if he has one locally, run "git-fetch $remote tag $tagname" to automatically catch up with the upstream tags. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Introduce notation "ref^{type}".Junio C Hamano2005-10-151-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing "tagname^0" notation means "dereference tag zero or more times until you cannot dereference it anymore, and make sure it is a commit -- otherwise barf". But tags do not necessarily reference commit objects. This commit introduces a bit more generalized notation, "ref^{type}". Existing "ref^0" is a shorthand for "ref^{commit}". If the type is empty, it just dereferences tags until it hits a non-tag object. With this, "git-rev-parse --verify 'junio-gpg-pub^{}'" shows the blob object name -- there is no need to manually read the tag object and find out the object name anymore. "git-rev-parse --verify 'HEAD^{tree}'" can be used to find out the tree object name of the HEAD commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Ignore funny refname sent from remoteJunio C Hamano2005-10-156-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the remote side (most notably, upload-pack) to show additional information without affecting the downloader. Peek-remote does not ignore them -- this is to make it useful for Pasky's automatic tag following. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Refuse to create funny refs in clone-pack, git-fetch and receive-pack.Junio C Hamano2005-10-153-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | Using git-check-ref-format, make sure we do not create refs with funny names when cloning from elsewhere (clone-pack), fast forwarding local heads (git-fetch), or somebody pushes into us (receive-pack). Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-check-ref-format: reject funny ref names.Junio C Hamano2005-10-156-38/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update check_ref_format() function to reject ref names that: * has a path component that begins with a ".", or * has a double dots "..", or * has ASCII control character, "~", "^", ":" or SP, anywhere, or * ends with a "/". Use it in 'git-checkout -b', 'git-branch', and 'git-tag' to make sure that newly created refs are well-formed. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'fixes'Junio C Hamano2005-10-153-23/+218
|\ \ \ | | |/ | |/|
| * | tutorial: update the initial commit example.Junio C Hamano2005-10-131-6/+8
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Adapt tutorial to cygwin and add test caseJohannes Schindelin2005-10-132-19/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lacking reliable symlinks, the instructions in the tutorial did not work in a cygwin setup. Also, a few outputs were not correct. This patch fixes these, and adds a test case which follows the instructions of the tutorial (except git-clone, -fetch and -push, which I have not done yet). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | rsh.c: typo fixRalf Baechle2005-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | Example in a comment used a wrong environment variable. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Show curl error a bit better.Junio C Hamano2005-10-151-1/+3
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Some curl versions lack curl_easy_duphandle()Johannes Schindelin2005-10-151-16/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi, On Fri, 14 Oct 2005, Junio C Hamano wrote: > Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: > > > This patch looks bigger than it really is: The code to get the > > default handle was refactored into a function, and is called > > instead of curl_easy_duphandle() if that does not exist. > > I'd like to take Nick's config file patch first, which > unfortunately interferes with your patch. I'd hate to ask you > this, but could you rebase it on top of Nick's patch, [...] No need to hate it. Here comes the rebased patch, and this time, I actually tested it a bit. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Unlocalized isspace and friendsLinus Torvalds2005-10-1416-14/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | Do our own ctype.h, just to get the sane semantics: we want locale-independence, _and_ we want the right signed behaviour. Plus we only use a very small subset of ctype.h anyway (isspace, isalpha, isdigit and isalnum). Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Use config file settings for httpNick Hengeveld2005-10-141-21/+88
| | | | | | | | | | | | | | | | | | | | | | | | Use "http." config file settings if they exist. Environment variables still work, and they will override config file settings. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-http-fetch: Remove size limit for objects/info/{packs,alternates}Sergey Vlasov2005-10-141-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-http-fetch received objects/info/packs into a fixed-size buffer and started to fail when this file became larger than the buffer. Change it to grow the buffer dynamically, and do the same thing for objects/info/alternates. Also add missing free() calls for these buffers. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | debian packagingAneesh Kumar2005-10-141-1/+1
| | | | | | | | | | | | | | | | | | Make it build with stable testing and unstable. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Support git+ssh:// and ssh+git:// URLLinus Torvalds2005-10-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seemed to be such a stupid syntax. It's both what "ssh://" means, and it's what not specifying a protocol at _all_ means. But hey, since we already have two ways of saying "use ssh with pack-files", here's two more. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status