summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2005-10-10svn import: add libsvn-core-perl to Debian's control fileMatthias Urlichs
Added libsvn-core-perl to debian/control, "Recommends:" section. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
2005-10-10svn import: fixed two pipe open calls.Matthias Urlichs
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>
2005-10-10svn import: copy path informationMatthias Urlichs
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>
2005-10-10SVN import: No modesMatthias Urlichs
svn doesn't seem to save file modes: removed the code that analyzes them. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
2005-10-10svn import: add eval()Matthias Urlichs
Trying to downlaod a file that's really a subdirectory doesn't work too well. Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
2005-10-10New: git-svnimport.Matthias Urlichs
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>
2005-10-10cvsimport: report merge parentsMatthias Urlichs
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>
2005-10-05Record which tree the patch applies to.Junio C Hamano
Also note which version of GIT produced the patch. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05git-applypatch: cleanup.Junio C Hamano
- Defined variable $INFO was not used properly. - Make sure there is an empty line between the sign-off and the log message. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05git-apply: retire unused/unimplemented --no-merge flag.Junio C Hamano
The original plan was to do 3-way merge between local working tree, index and the patch being applied, but that was never implemented. Retire the flag to control its behaviour. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05git-apply: allow operating in sparsely populated working tree.Junio C Hamano
This patch teaches 'git-apply --index' to automatically check out a file being patched. This happens only when the working tree does not have it checked out. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05Return error when not checking out an entry due to dirtiness.Junio C Hamano
Without -f flag, 'git-checkout-index foo.c' issued an error message when foo.c already existed in the working tree and did not match index. However it did not return an error from the underlying checkout_entry() function and resulted in a successful exit(0). Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-05Merge branch 'fixes'Junio C Hamano
2005-10-05Add missing documentation.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-04Remove useless use of sed in git-format-patch.Junio C Hamano
There was a leftover use of sed that attempted to remove the commit ID output from git-diff-tree, which turned into an expensive no-op when git-diff-tree output header format changed about three months ago. Drop it. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-04Leave an empty line between log and sign-off.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-04Remove unused external-diff script.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-04[PATCH] Limit the number of requests outstanding in ssh-fetch.Daniel Barkalow
This completes fetches if there are more than 100 outstanding requests and there are more to prefetch. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-04On Cygwin, use symbolic ref, not a symbolic link, to express .git/HEADJunio C Hamano
H. Peter Anvin says that Samba "promotes" symlinks to hardlinks while Cygwin itself uses .lnk files to emulate symlinks. Avoid using symbolic link for .git/HEAD on Cygwin. This does not help the symlinks recorded in trees as user data, but at least we do not use them for our own bookkeeping. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-04Merge branch 'fixes'Junio C Hamano
2005-10-04Avoid compiler warning.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-04Make sure get_sha1 does not accept ambiguous sha1 prefix (again).Junio C Hamano
The earlier fix incorrectly dropped the code the original had to ensure the found SHA1 is at least unique within the same pack. Restore the check. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03Merge with master.kernel.org:/pub/scm/git/git.gitPeter Anvin
2005-10-03Merge branch 'fixes'Junio C Hamano
2005-10-03[PATCH] Merging the Cygwin changesJunio C Hamano
Fix mismerge typo. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03git-pull: do not barf on -a flag meant for git-fetch.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03[PATCH] Random documentation fixesJonas Fonseca
The fixes focuses on improving the HTML output. Most noteworthy: - Fix the Makefile to also make various *.html files depend on included files. - Consistently use 'NOTE: ...' instead of '[ ... ]' for additional info. - Fix ending '::' for description lists in OPTION section etc. - Fix paragraphs in description lists ending up as preformated text. - Always use listingblocks (preformatted text wrapped in lines with -----) for examples that span empty lines, so they are put in only one HTML block. - Use '1.' instead of '(1)' for numbered lists. - Fix linking to other GIT docs. - git-rev-list.txt: put option descriptions in an OPTION section. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03Merge with master.kernel.org:/pub/scm/git/git.gitPeter Anvin
2005-10-03Error message from get_sha1() on ambiguous short SHA1.Junio C Hamano
Unlike cases where "no such object exists", the case where specified prefix is ambiguous would confuse the user if we say "no such commit" or such. Give an extra error message from the uniqueness check if there are more than one objects that match the given prefix. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03[PATCH] Enable and fix support for base less merges.Fredrik Kuivinen
Let the merge strategies handle the base less case if they are able to do it. It also fixes git-resolve.sh to die if no common ancestors exists, instead of doing the wrong thing. Furthermore, it contains a small independent fix for git-merge.sh and a fix for a base less code path in gitMergeCommon.py. With this it's possible to use git merge -s recursive 'merge message' A B to do a base less merge of A and B. [jc: Thanks Fredrik for fixing the brown-paper-bag in git-merge. I fixed a small typo in git-merge-resolve fix; 'test' equality check is spelled with single equal sign -- C-style double equal sign is bashism.] Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03Make sure get_sha1 does not accept ambiguous sha1 prefix.Junio C Hamano
The original code did not even check alternates, and was confused if an unpacked object was uniquely found when there was another object that shares the same prefix in the pack. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-03Fix minor DOS in rev-list.Junio C Hamano
A carefully crafted pathname can be used to disrupt downstream git-pack-objects that uses 'git-rev-list --objects' output. Prevent this. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02Post 0.99.8 master branchJunio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02GIT 0.99.8v0.99.8Junio C Hamano
GIT already did everything I wanted it to do since mid 0.99.7, and it has almost everything I want it to have now, except a couple of minor tweaks and enhancements. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02[PATCH] Update git-clone documentationEric W. Biederman
The documentation for git-clone is behind the actual command. I have been getting tired of reading the shell script to see what the arguments are so here is an update of the actual documentation. Signed-off-by: Eric Biederman <ebiederman@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02Handle really trivial case inside git-merge.Junio C Hamano
Using Linus' --trivial option, this handles really trivial case inside git-merge itself, without using any strategy modules. A 'really trivial case' is: - we are merging one branch into the current branch; - there is only one merge base between the branches; - there is no file-level merge required. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02read-tree: --trivialLinus Torvalds
This adds an option --trivial to restrict 3-way 'read-tree -m -u' to happen only if there is no file-level merging required. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02[PATCH] Teach git-ls-files about '--' to denote end of options.Fredrik Kuivinen
Useful if you have a file whose name starts with a dash. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02[PATCH] Teach the recursive merge strategy about renames.Fredrik Kuivinen
It will now merge cases where a file was renamed in one branch and modified in the other branch cleanly. We also detect a couple of conflict cases now that wasn't detected before. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02read-tree: remove --head option.Junio C Hamano
Initially it was to allow specifying more than one remote to allow creation of an Octopus, but it is not being used. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02Customize git command for installations that lack certain commands.Junio C Hamano
When the platform lacks certain git subcommands, omit them from the list of subcommands that are available from "git" wrapper. Noticed by Geert Bosch. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02[PATCH] git on OpenBSDHan Boetes
iconv is installed in /usr/local. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02[PATCH] Re-instate index file write optimizationLinus Torvalds
This makes "git-update-index" avoid the new index file write if it didn't make any changes to the index. It still doesn't make things like "git status" be read-only operations in general, but if the index file doesn't need refreshing, it now will at least avoid making unnecessary changes. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02[PATCH] Better error reporting for "git status"Linus Torvalds
Instead of "git status" ignoring (and hiding) potential errors from the "git-update-index" call, make it exit if it fails, and show the error. In order to do this, use the "-q" flag (to ignore not-up-to-date files) and add a new "--unmerged" flag that allows unmerged entries in the index without any errors. This also avoids marking the index "changed" if an entry isn't actually modified, and makes sure that we exit with an understandable error message if the index is corrupt or unreadable. "read_cache()" no longer returns an error for the caller to check. Finally, make die() and usage() exit with recognizable error codes, if we ever want to check the failure reason in scripts. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02More portability.Junio C Hamano
- The location of openssl development files got customizable. - The location of iconv development files got customizable. - Pass $TAR down to t5000 test so that the user can override with 'gmake TAR=gtar'. - Solaris 'bc' does not seem to grok "define abs()". There is no reason to use bc there -- expr would do. Signed-off-by: Junio C Hamano <junio@twinsun.com>
2005-10-02Add git-symbolic-refJunio C Hamano
This adds the counterpart of git-update-ref that lets you read and create "symbolic refs". By default it uses a symbolic link to represent ".git/HEAD -> refs/heads/master", but it can be compiled to use the textfile symbolic ref. The places that did 'readlink .git/HEAD' and 'ln -s refs/heads/blah .git/HEAD' have been converted to use new git-symbolic-ref command, so that they can deal with either implementation. Signed-off-by: Junio C Hamano <junio@twinsun.com>
2005-10-02Use resolve_ref() to implement read_ref().Junio C Hamano
Symbolic refs are understood by resolve_ref(), so existing read_ref() users will automatically understand them as well. Signed-off-by: Junio C Hamano <junio@twinsun.com>
2005-10-02[PATCH] Allow reading "symbolic refs" that point to other refsLinus Torvalds
This extends the ref reading to understand a "symbolic ref": a ref file that starts with "ref: " and points to another ref file, and thus introduces the notion of ref aliases. This is in preparation of allowing HEAD to eventually not be a symlink, but one of these symbolic refs instead. [jc: Linus originally required the prefix to be "ref: " five bytes and nothing else, but I changed it to allow and strip any number of leading whitespaces to match what update-ref.c does.] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02Teach update-ref about a symbolic ref stored in a textfile.Junio C Hamano
A symbolic ref is a regular file whose contents is "ref:", followed by optional leading whitespaces, followed by a GIT_DIR relative pathname, followed by optional trailing whitespaces (the optional whitespaces are unconditionally removed, so you cannot have leading nor trailing whitespaces). This can be used in place of a traditional symbolic link .git/HEAD that usually points at "refs/heads/master". You can instead have a regular file .git/HEAD whose contents is "ref: refs/heads/master". [jc: currently the code does not enforce the symbolic ref to begin with refs/, unlike the symbolic link case. It may be worthwhile to require either case to begin with refs/ and not have any /./ nor /../ in them.] Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-02[PATCH] git fetch --tagsLinus Torvalds
You can do git fetch --tags <linus-kernel-repo> and it should fetch all my tags automatically. [jc: The original by Linus fetched and overwrote branch heads with --all, which felt dangerous and wrong, so I removed it. Also this version does not use any refs that resulted as --tags for later merge. ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>