aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* svn import: unlink downlaoded filesMatthias Urlichs2005-10-10
| | | | | | | 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-10
| | | | | | | | 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-10
| | | | | | | | | 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-10
| | | | | | | 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-10
| | | | | | 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-10
| | | | | | Tagging was 100% broken. :-/ Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
* svn import: remove debuggingMatthias Urlichs2005-10-10
| | | | | | 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-10
| | | | | | 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-10
| | | | | | | 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-10
| | | | | | 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-10
| | | | | | 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-10
| | | | | | | 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-10
| | | | | | | | | 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-10
| | | | | | | 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-10
| | | | | | 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-10
| | | | | | | | | | 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-10
| | | | | | | | 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>
* Record which tree the patch applies to.Junio C Hamano2005-10-04
| | | | | | Also note which version of GIT produced the patch. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-applypatch: cleanup.Junio C Hamano2005-10-04
| | | | | | | | - 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>
* git-apply: retire unused/unimplemented --no-merge flag.Junio C Hamano2005-10-04
| | | | | | | | 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>
* git-apply: allow operating in sparsely populated working tree.Junio C Hamano2005-10-04
| | | | | | | | 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>
* Return error when not checking out an entry due to dirtiness.Junio C Hamano2005-10-04
| | | | | | | | | 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>
* Merge branch 'fixes'Junio C Hamano2005-10-04
|\
| * Add missing documentation.Junio C Hamano2005-10-04
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Remove useless use of sed in git-format-patch.Junio C Hamano2005-10-04
| | | | | | | | | | | | | | | | | | 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>
| * Leave an empty line between log and sign-off.Junio C Hamano2005-10-03
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Remove unused external-diff script.Junio C Hamano2005-10-03
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * [PATCH] Limit the number of requests outstanding in ssh-fetch.Daniel Barkalow2005-10-03
| | | | | | | | | | | | | | | | 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>
* | On Cygwin, use symbolic ref, not a symbolic link, to express .git/HEADJunio C Hamano2005-10-03
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'fixes'Junio C Hamano2005-10-03
|\ \ | |/
| * Avoid compiler warning.Junio C Hamano2005-10-03
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Make sure get_sha1 does not accept ambiguous sha1 prefix (again).Junio C Hamano2005-10-03
| | | | | | | | | | | | | | | | 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>
* | Merge with master.kernel.org:/pub/scm/git/git.gitPeter Anvin2005-10-03
|\ \
| * \ Merge branch 'fixes'Junio C Hamano2005-10-03
| |\ \ | | |/
| | * git-pull: do not barf on -a flag meant for git-fetch.Junio C Hamano2005-10-03
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * [PATCH] Random documentation fixesJonas Fonseca2005-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Error message from get_sha1() on ambiguous short SHA1.Junio C Hamano2005-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * [PATCH] Enable and fix support for base less merges.Fredrik Kuivinen2005-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Make sure get_sha1 does not accept ambiguous sha1 prefix.Junio C Hamano2005-10-02
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Fix minor DOS in rev-list.Junio C Hamano2005-10-02
| | | | | | | | | | | | | | | | | | | | | 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>
* | | [PATCH] Merging the Cygwin changesJunio C Hamano2005-10-03
| | | | | | | | | | | | | | | | | | Fix mismerge typo. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge with master.kernel.org:/pub/scm/git/git.gitPeter Anvin2005-10-03
|\ \ \ | |/ /
| * | Post 0.99.8 master branchJunio C Hamano2005-10-02
| |/ | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * GIT 0.99.8v0.99.8Junio C Hamano2005-10-02
| | | | | | | | | | | | | | | | 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>
| * [PATCH] Update git-clone documentationEric W. Biederman2005-10-02
| | | | | | | | | | | | | | | | | | 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>
| * Handle really trivial case inside git-merge.Junio C Hamano2005-10-02
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * read-tree: --trivialLinus Torvalds2005-10-02
| | | | | | | | | | | | | | | | 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>
| * [PATCH] Teach git-ls-files about '--' to denote end of options.Fredrik Kuivinen2005-10-02
| | | | | | | | | | | | | | 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>
| * [PATCH] Teach the recursive merge strategy about renames.Fredrik Kuivinen2005-10-02
| | | | | | | | | | | | | | | | | | 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>
| * read-tree: remove --head option.Junio C Hamano2005-10-02
| | | | | | | | | | | | | | 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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-04 14:20:13 +0000