summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* INSTALL: duplicate python requirements from MakefileJunio C Hamano2005-11-111-0/+12
| | | | | | | ... and refer the reader to Makefile for other things that can be tweaked. Signed-off-by: Junio C Hamano <junkio@cox.net>
*-. Merge branches 'jc/sb' and 'jc/mb'Junio C Hamano2005-11-114-16/+202
|\ \
| | * Add test case for merge-base.Junio C Hamano2005-11-111-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | Although it was shown that the "full contamination" was not really full during the list discussion, the series improves things without incurring extra parsing cost, and here is a test to check that. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * merge-base: avoid unnecessary postprocessing.Junio C Hamano2005-11-111-34/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | When we have only one merge-base candidates in the result list, there is no point going back to mark the reachable commits again. And that is the most common case, so try not to waste time on it. Suggested by Linus. Signed-off-by: Junio C Hamano <junkio@cox.net>
| | * merge-base: fully contaminate the well.Junio C Hamano2005-11-111-1/+77
| |/ |/| | | | | | | | | | | | | The discussion on the list demonstrated a pathological case where an ancestor of a merge-base can be left interesting. This commit introduces a postprocessing phase to fix it. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * t1200: use --topo-order to keep the show-branch output stable.Junio C Hamano2005-11-111-2/+2
| | | | | | | | | | | | | | | | Because a batch-oriented script creates many commits within a second on a fast machine, show-branch output of the test results are unstable without topo-order. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fully detect uninteresting commits.Junio C Hamano2005-11-111-11/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | With the change in the previous round, we are guaranteed to come up with the list of all relevant merge bases, but sometimes we do not fully mark unintersting ones due to a horizon effect. Add a phase to postprocess, so that we mark all ancestor of "interesting" commit. This also changes the default ordering of shown commits back to chronological order, and adds --topo-order flag to show them in topological order. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * git-show-branch: tighten merge-base computation.Junio C Hamano2005-11-111-2/+2
|/ | | | | | | | | | This makes the merge-base computation resistant to the pathological case discussed on the list earlier, by doing the same logic as git-merge-base. As a side effect, it breaks the command's primary function to list non-merge commit sequences, which needs to be fixed separately. Signed-off-by: Junio C Hamano <junkio@cox.net>
* RPM: arch submodule needs tla.Junio C Hamano2005-11-111-1/+1
| | | | | | Noticed by Horst von Brand. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-clone: Allow cloning into directories other than child of current dir.Andreas Ericsson2005-11-111-1/+2
| | | | | | | | This patch adds -p to mkdir and an explicit check to see if the target directory exists (since mkdir -p doesn't throw an error if it does). Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-clone: Keep remote names when cloning unless explicitly told not to.Andreas Ericsson2005-11-112-5/+9
| | | | | | | | | | | | | | | With this patch the following commands all clone into the local directory "repo". If repo exists, it will still barf. git-clone git://host.xz/repo.git git-clone /path/to/repo/.git git-clone host.xz:repo.git I ended up doing the same source-to-target sed'ing for all our company projects, so it was easier to add it directly to git-clone. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* specfile cleanupsChris Wright2005-11-111-11/+39
| | | | | | | | | | | | | | | Some specfile cleanups after the split. - zlib dependency fix, current method is inconsistent, you can potentially build a package that you can't install on machine you built it on - Add proper defattr - Remove trailing '.' in summary - Add docs to split up packages - Add git-core dependency for each subpackage - Move arch import to separate package as well Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* archimport: handle pika escapingMartin Langhoff2005-11-111-0/+5
| | | | | | | | | | | | | Arch uses pika escaping in some places (but not all!). Specifically, commits of the type 'patch' use pika escaping in the log entries, which we parse to know what to add/delete and what to commit. This patch checks for hints of pika escaping and asks tla to unescape for us. Originally implemented by Penny Leach <penny@catalyst.net.nz> Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-clone: quote destination directory namePavel Roskin2005-11-111-2/+2
| | | | | | | | | | | git-clone doesn't quote the full path to the destination directory, which causes it to fail if the path contains spaces or other characters interpreted by the shell. [jc: obviously I was not careful enough. Pavel, thanks for catching.] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add --no-commit-id option for git-diff-tree, use it in gitkPavel Roskin2005-11-112-2/+12
| | | | | | | | | | This patch introduces -no-commit-id option for git-diff-tree, which suppresses commit ID output. [jc: dropped gitk part for now.] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* octopus: do not do AND'ed merge base.Junio C Hamano2005-11-111-5/+20
| | | | | | | | | When doing an octopus, we incorrectly used the previous merge base as the reference to compute next merge base. This was unnecessary, because that can never be better than using the original HEAD. And that is far simpler as well ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add --pretty=fullerJunio C Hamano2005-11-112-7/+31
| | | | | | | | | git log without --pretty showed author and author-date, while with --pretty=full showed author and committer but no dates. The new formatting option, --pretty=fuller, shows both name and timestamp for author and committer. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Do not lose author name information to locale gotchas.Junio C Hamano2005-11-113-3/+3
| | | | | | | | | | | | I noticed format-patch loses authorship information of Lukas' patch when I run git tools with LC_LANG set to ja_JP. It turns out that the sed script to set environment variables were not working on his name (encoded in UTF-8), which is unfortunate but technically correct. Force sed invocation under C locale because we always want literal byte semantics. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: "host:path/to/repo" is git native over ssh.Junio C Hamano2005-11-111-1/+1
| | | | | | | | | | You could also spell it ssh://host:/path/to/repo (or git+ssh, ssh+git), but without method:// is shorter to type, so mention only that one in the short and sweet list. Noticed by Pasky. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Let git-clone/git-fetch follow HTTP redirectionsJosef Weidendorfer2005-11-103-2/+4
| | | | | | | | | | | Otherwise, git-clone silently failed to clone a remote repository where redirections (ie. a response with a "Location" header line) are used. This includes the fixes from Nick Hengeveld. Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix confusing git-update-ref error messagePetr Baudis2005-11-101-1/+1
| | | | | | | | | When git-update-ref has hit the "Ref %s changed to %s" error, I just stare at it, left puzzled. This patch attempts to reword that to a more useful and less confusing error message. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add missing git-core and cvsps RPM dependencies.Jim Radford2005-11-101-2/+3
| | | | | Signed-off-by: Jim Radford <radford@blackbean.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Make git-recursive the default strategy for git-pull.Junio C Hamano2005-11-091-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does two things: - It changes the hardcoded default merge strategy for two-head git-pull from resolve to recursive. - .git/config file acquires two configuration items. pull.twohead names the strategy for two-head case, and pull.octopus names the strategy for octopus merge. IOW you are paranoid, you can have the following lines in your .git/config file and keep using git-merge-resolve when pulling one remote: [pull] twohead = resolve OTOH, you can say this: [pull] twohead = resolve twohead = recursive to try quicker resolve first, and when it fails, fall back to recursive. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use 'merge-base --all' where applicable.Junio C Hamano2005-11-091-2/+9
| | | | | | | It may get extra merge base on truly pathological commit histories, but is a lot easier to understand, explain, and prove correctness. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'hold/svn'Junio C Hamano2005-11-091-54/+109
|\
| * Fix a couple of obvious and insignificant typo.Junio C Hamano2005-11-081-2/+2
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Lift the default limit of number of revs.Yaacov Akiba Slama2005-11-081-6/+6
| | | | | | | | | | | | | | | | | | Now that the leak is gone, there is by default no limit of revisions to import. No more message about leak when the limit (given by the -l parameter) is reached. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Handle a revision that only creates a new tag correctly.Yaacov Akiba Slama2005-11-081-0/+5
| | | | | | | | | | | | | | | | Fix an error when a svn revision consists only of the creation of a new tag directory (/tags/this_is_a_tag). Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Bundle file copies from multiple branches into a merge.Yaacov Akiba Slama2005-11-081-6/+16
| | | | | | | | | | | | | | | | When copying files and/or directories from several branches in one single revision, all these branches are used as parents of the commit. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * copy_dir becomes copy_path and handles both files and directoriesYaacov Akiba Slama2005-11-081-37/+53
| | | | | | | | | | | | | | The A (Add) and R (Replace) actions handling are unified. Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Don't output error on changes in the nodes /, /tags or /branchesYaacov Akiba Slama2005-11-081-1/+6
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Add node_kind function to differentiate between file and directoryYaacov Akiba Slama2005-11-081-3/+18
| | | | | | | | | | Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Use svn pools to solve the memory leak problem.Yaacov Akiba Slama2005-11-081-2/+6
| | | | | | | | | | Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'hold/rpm'Junio C Hamano2005-11-091-6/+44
|\ \
| * | Separate RPMS for programs with non-standard dependencies.Jim Radford2005-11-081-6/+44
| |/ | | | | | | | | Signed-off-by: Jim Radford <radford@blackbean.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-apply: do not fail on binary diff when not applying nor checking.Junio C Hamano2005-11-091-6/+19
| | | | | | | | | | | | | | | | | | | | | | We run git-apply with --stat and --summary at the end of the pull by default, which causes it to barf when the pull brought in changes to binary files. Just mark them as binary patch and proceed when not applying nor checking. [jc: I almost missed --check until I saw Linus did something similar.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Update INSTALLJunio C Hamano2005-11-091-3/+6
| | | | | | | | | | | | | | Explicitly mention how to install by hand in build-as-user and install-as-root steps. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | merge-recursive: Fix support for branch names containing slashesFredrik Kuivinen2005-11-091-0/+1
| | | | | | | | | | | | | | A branch name could have a slash in it. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | merge-recursive: Fix limited output of rename messagesFredrik Kuivinen2005-11-091-8/+4
| | | | | | | | | | | | | | The previous code did the right thing, but it did it by accident. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix cvsexportcommit syntax errorAlexander Litvinov2005-11-081-1/+1
| | | | | | | | | | | | There is a syntax error in cvsexport script: Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Update howto using-topic-branchesLuck, Tony2005-11-081-7/+7
| | | | | | | | | | | | | | | | "git resolve" is being deprecated in favour of "git merge". Update the documentation to reflect this. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | sparse fixes for http-{fetch,push}.cPeter Hagervall2005-11-082-15/+15
| | | | | | | | | | | | | | | | Make a bunch of needlessly global functions static, and replace two K&R-style declarations. Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-tag -d <tag>: delete tag <tag>Kai Ruemmler2005-11-082-2/+11
| | | | | | | | | | | | | | This adds option '-d' to git-tag.sh and documents it. Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | make tests ignorable with "make -i"Alex Riesen2005-11-081-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Allow failed tests to be ignored using make's "-i". The patch also disables parallel make in t/. This doesn't make the testing any different as before: the tests were run sequentially before. It also allows to run more tests, ignoring the ones usually failing just to figure out if something else broke. (Or to ignore plainly uninteresting situations because of the testing being done on say... cygwin ;) Signed-off-by: Junio C Hamano <junkio@cox.net>
* | fix t5000-tar-tree.sh when $TAR isn't setAlex Riesen2005-11-081-0/+1
| | | | | | | | | | | | | | $TAR isn't set everywhere. Provide a default (tar) Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Clean build annoyance.Junio C Hamano2005-11-082-5/+0
|/ | | | | | | | | As Pasky pointed out, building in templates directory showed list of built template files which was unneeded. This commit also fixes another build annoyance I recently left in by accident. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-am: do not lose already edited final-commit when resuming.Junio C Hamano2005-11-081-12/+19
| | | | | | | The last round stopped munging the patch when resuming, but failed to preserve final-commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
* ls-files and read-tree need core.filemodeAlex Riesen2005-11-082-0/+3
| | | | | | | | | ls-files.c and read-tree.c miss the default configuration, in particular the filemode=false part. The recent +x bit flip made me notice that, because git-merge refused to merge anything saying that git-pull.sh is not up to date. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Debian: packaging updates.Junio C Hamano2005-11-088-12/+18
| | | | | | | | | Do not scatter txt and html documentation into feature subpackages. Do place man pages into them. Capture more cvs stuff into git-cvs package. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Use consistent shell prompts and example style.Jon Loeliger2005-11-081-88/+138
| | | | | Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
View Lorry Controller Status