summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2005-11-11merge-base: avoid unnecessary postprocessing.Libravatar Junio C Hamano1-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>
2005-11-11merge-base: fully contaminate the well.Libravatar Junio C Hamano1-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>
2005-11-11RPM: arch submodule needs tla.Libravatar Junio C Hamano1-1/+1
Noticed by Horst von Brand. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-11git-clone: Allow cloning into directories other than child of current dir.Libravatar Andreas Ericsson1-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>
2005-11-11git-clone: Keep remote names when cloning unless explicitly told not to.Libravatar Andreas Ericsson2-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>
2005-11-11specfile cleanupsLibravatar Chris Wright1-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>
2005-11-11archimport: handle pika escapingLibravatar Martin Langhoff1-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>
2005-11-11git-clone: quote destination directory nameLibravatar Pavel Roskin1-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>
2005-11-11Add --no-commit-id option for git-diff-tree, use it in gitkLibravatar Pavel Roskin2-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>
2005-11-11octopus: do not do AND'ed merge base.Libravatar Junio C Hamano1-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>
2005-11-11Add --pretty=fullerLibravatar Junio C Hamano2-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>
2005-11-11Do not lose author name information to locale gotchas.Libravatar Junio C Hamano3-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>
2005-11-11Documentation: "host:path/to/repo" is git native over ssh.Libravatar Junio C Hamano1-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>
2005-11-10Let git-clone/git-fetch follow HTTP redirectionsLibravatar Josef Weidendorfer3-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>
2005-11-10Fix confusing git-update-ref error messageLibravatar Petr Baudis1-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>
2005-11-10Add missing git-core and cvsps RPM dependencies.Libravatar Jim Radford1-2/+3
Signed-off-by: Jim Radford <radford@blackbean.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-09Make git-recursive the default strategy for git-pull.Libravatar Junio C Hamano1-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>
2005-11-09Use 'merge-base --all' where applicable.Libravatar Junio C Hamano1-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>
2005-11-09Merge branch 'hold/svn'Libravatar Junio C Hamano1-54/+109
2005-11-09Merge branch 'hold/rpm'Libravatar Junio C Hamano1-6/+44
2005-11-09git-apply: do not fail on binary diff when not applying nor checking.Libravatar Junio C Hamano1-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>
2005-11-09Update INSTALLLibravatar Junio C Hamano1-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>
2005-11-09merge-recursive: Fix support for branch names containing slashesLibravatar Fredrik Kuivinen1-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>
2005-11-09merge-recursive: Fix limited output of rename messagesLibravatar Fredrik Kuivinen1-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>
2005-11-08Fix cvsexportcommit syntax errorLibravatar Alexander Litvinov1-1/+1
There is a syntax error in cvsexport script: Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08Update howto using-topic-branchesLibravatar Luck, Tony1-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>
2005-11-08sparse fixes for http-{fetch,push}.cLibravatar Peter Hagervall2-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>
2005-11-08git-tag -d <tag>: delete tag <tag>Libravatar Kai Ruemmler2-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>
2005-11-08make tests ignorable with "make -i"Libravatar Alex Riesen1-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>
2005-11-08fix t5000-tar-tree.sh when $TAR isn't setLibravatar Alex Riesen1-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>
2005-11-08Clean build annoyance.Libravatar Junio C Hamano2-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>
2005-11-08Separate RPMS for programs with non-standard dependencies.Libravatar Jim Radford1-6/+44
Signed-off-by: Jim Radford <radford@blackbean.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08Fix a couple of obvious and insignificant typo.Libravatar Junio C Hamano1-2/+2
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08Lift the default limit of number of revs.Libravatar Yaacov Akiba Slama1-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>
2005-11-08Handle a revision that only creates a new tag correctly.Libravatar Yaacov Akiba Slama1-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>
2005-11-08Bundle file copies from multiple branches into a merge.Libravatar Yaacov Akiba Slama1-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>
2005-11-08copy_dir becomes copy_path and handles both files and directoriesLibravatar Yaacov Akiba Slama1-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>
2005-11-08Don't output error on changes in the nodes /, /tags or /branchesLibravatar Yaacov Akiba Slama1-1/+6
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08Add node_kind function to differentiate between file and directoryLibravatar Yaacov Akiba Slama1-3/+18
Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08Use svn pools to solve the memory leak problem.Libravatar Yaacov Akiba Slama1-2/+6
Signed-off-by: Yaacov Akiba Slama <ya@slamail.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08git-am: do not lose already edited final-commit when resuming.Libravatar Junio C Hamano1-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>
2005-11-08ls-files and read-tree need core.filemodeLibravatar Alex Riesen2-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>
2005-11-08Debian: packaging updates.Libravatar Junio C Hamano8-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>
2005-11-08Use consistent shell prompts and example style.Libravatar Jon Loeliger1-88/+138
Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08Add --tags documentation, scraped from JC mail.Libravatar Jon Loeliger1-0/+3
Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08Add support for git-http-push to git-push scriptLibravatar Nick Hengeveld1-2/+7
Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08Tutorial: do not use 'git resolve'.Libravatar Junio C Hamano1-7/+8
Use 'git merge' instead. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08Documentation: fix dependency generation.Libravatar Junio C Hamano2-11/+36
The previous rule misses the case where git.txt or tutorial.txt includes new files. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-07Add bug isolation howto, scraped from Linus.Libravatar Jon Loeliger1-0/+65
Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-07Ignore more generated files.Libravatar Junio C Hamano1-0/+4
List new commands cvsexportcommit and http-push to .gitignore list. Also cover the test programs (test-date and test-delta). Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-19 18:43:39 +0000