git/git.git
15 years agooctopus: do not do AND'ed merge base.
Junio C Hamano [Thu, 10 Nov 2005 06:37:14 +0000 (22:37 -0800)]
octopus: do not do AND'ed merge base.

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>
15 years agoAdd --pretty=fuller
Junio C Hamano [Thu, 10 Nov 2005 06:15:27 +0000 (22:15 -0800)]
Add --pretty=fuller

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>
15 years agoDo not lose author name information to locale gotchas.
Junio C Hamano [Fri, 11 Nov 2005 07:34:08 +0000 (23:34 -0800)]
Do not lose author name information to locale gotchas.

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>
15 years agoDocumentation: "host:path/to/repo" is git native over ssh.
Junio C Hamano [Fri, 11 Nov 2005 01:46:20 +0000 (17:46 -0800)]
Documentation: "host:path/to/repo" is git native over ssh.

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>
15 years agoLet git-clone/git-fetch follow HTTP redirections
Josef Weidendorfer [Thu, 10 Nov 2005 13:12:19 +0000 (14:12 +0100)]
Let git-clone/git-fetch follow HTTP redirections

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>
15 years agoFix confusing git-update-ref error message
Petr Baudis [Thu, 10 Nov 2005 19:55:13 +0000 (20:55 +0100)]
Fix confusing git-update-ref error message

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>
15 years agoAdd missing git-core and cvsps RPM dependencies.
Jim Radford [Thu, 10 Nov 2005 19:03:08 +0000 (11:03 -0800)]
Add missing git-core and cvsps RPM dependencies.

Signed-off-by: Jim Radford <radford@blackbean.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMake git-recursive the default strategy for git-pull.
Junio C Hamano [Tue, 8 Nov 2005 10:00:31 +0000 (02:00 -0800)]
Make git-recursive the default strategy for git-pull.

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>
15 years agoUse 'merge-base --all' where applicable.
Junio C Hamano [Thu, 10 Nov 2005 02:54:14 +0000 (18:54 -0800)]
Use 'merge-base --all' where applicable.

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>
15 years agoMerge branch 'hold/svn'
Junio C Hamano [Thu, 10 Nov 2005 02:44:42 +0000 (18:44 -0800)]
Merge branch 'hold/svn'

15 years agoMerge branch 'hold/rpm'
Junio C Hamano [Thu, 10 Nov 2005 02:44:18 +0000 (18:44 -0800)]
Merge branch 'hold/rpm'

15 years agogit-apply: do not fail on binary diff when not applying nor checking.
Junio C Hamano [Wed, 9 Nov 2005 22:59:23 +0000 (14:59 -0800)]
git-apply: do not fail on binary diff when not applying nor checking.

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>
15 years agoUpdate INSTALL
Junio C Hamano [Wed, 9 Nov 2005 20:40:03 +0000 (12:40 -0800)]
Update INSTALL

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>
15 years agomerge-recursive: Fix support for branch names containing slashes
Fredrik Kuivinen [Wed, 9 Nov 2005 10:42:57 +0000 (11:42 +0100)]
merge-recursive: Fix support for branch names containing slashes

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>
15 years agomerge-recursive: Fix limited output of rename messages
Fredrik Kuivinen [Wed, 9 Nov 2005 10:36:55 +0000 (11:36 +0100)]
merge-recursive: Fix limited output of rename messages

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>
15 years agoFix cvsexportcommit syntax error
Alexander Litvinov [Wed, 9 Nov 2005 07:02:58 +0000 (13:02 +0600)]
Fix cvsexportcommit syntax error

There is a syntax error in cvsexport script:

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoUpdate howto using-topic-branches
Luck, Tony [Tue, 8 Nov 2005 23:52:02 +0000 (15:52 -0800)]
Update howto using-topic-branches

"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>
15 years agosparse fixes for http-{fetch,push}.c
Peter Hagervall [Tue, 8 Nov 2005 22:18:31 +0000 (23:18 +0100)]
sparse fixes for http-{fetch,push}.c

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>
15 years agogit-tag -d <tag>: delete tag <tag>
Kai Ruemmler [Tue, 8 Nov 2005 10:44:33 +0000 (11:44 +0100)]
git-tag -d <tag>: delete tag <tag>

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>
15 years agomake tests ignorable with "make -i"
Alex Riesen [Tue, 8 Nov 2005 09:51:10 +0000 (10:51 +0100)]
make tests ignorable with "make -i"

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>
15 years agofix t5000-tar-tree.sh when $TAR isn't set
Alex Riesen [Tue, 8 Nov 2005 10:45:15 +0000 (11:45 +0100)]
fix t5000-tar-tree.sh when $TAR isn't set

$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>
15 years agoClean build annoyance.
Junio C Hamano [Tue, 8 Nov 2005 16:58:52 +0000 (08:58 -0800)]
Clean build annoyance.

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>
15 years agoSeparate RPMS for programs with non-standard dependencies.
Jim Radford [Sat, 5 Nov 2005 19:38:02 +0000 (11:38 -0800)]
Separate RPMS for programs with non-standard dependencies.

Signed-off-by: Jim Radford <radford@blackbean.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFix a couple of obvious and insignificant typo.
Junio C Hamano [Sat, 5 Nov 2005 07:30:12 +0000 (23:30 -0800)]
Fix a couple of obvious and insignificant typo.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoLift the default limit of number of revs.
Yaacov Akiba Slama [Wed, 2 Nov 2005 21:51:58 +0000 (23:51 +0200)]
Lift the default limit of number of revs.

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>
15 years agoHandle a revision that only creates a new tag correctly.
Yaacov Akiba Slama [Wed, 2 Nov 2005 21:51:57 +0000 (23:51 +0200)]
Handle a revision that only creates a new tag correctly.

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>
15 years agoBundle file copies from multiple branches into a merge.
Yaacov Akiba Slama [Wed, 2 Nov 2005 21:51:57 +0000 (23:51 +0200)]
Bundle file copies from multiple branches into a merge.

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>
15 years agocopy_dir becomes copy_path and handles both files and directories
Yaacov Akiba Slama [Wed, 2 Nov 2005 21:51:57 +0000 (23:51 +0200)]
copy_dir becomes copy_path and handles both files and directories

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>
15 years agoDon't output error on changes in the nodes /, /tags or /branches
Yaacov Akiba Slama [Wed, 2 Nov 2005 21:51:57 +0000 (23:51 +0200)]
Don't output error on changes in the nodes /, /tags or /branches

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd node_kind function to differentiate between file and directory
Yaacov Akiba Slama [Wed, 2 Nov 2005 21:51:57 +0000 (23:51 +0200)]
Add node_kind function to differentiate between file and directory

Signed-off-by: Yaacov Akiba Slama <ya@slamail.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoUse svn pools to solve the memory leak problem.
Yaacov Akiba Slama [Wed, 2 Nov 2005 21:51:57 +0000 (23:51 +0200)]
Use svn pools to solve the memory leak problem.

Signed-off-by: Yaacov Akiba Slama <ya@slamail.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-am: do not lose already edited final-commit when resuming.
Junio C Hamano [Tue, 8 Nov 2005 08:41:37 +0000 (00:41 -0800)]
git-am: do not lose already edited final-commit when resuming.

The last round stopped munging the patch when resuming, but
failed to preserve final-commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agols-files and read-tree need core.filemode
Alex Riesen [Tue, 8 Nov 2005 08:23:37 +0000 (09:23 +0100)]
ls-files and read-tree need core.filemode

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>
15 years agoDebian: packaging updates.
Junio C Hamano [Tue, 8 Nov 2005 09:20:24 +0000 (01:20 -0800)]
Debian: packaging updates.

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>
15 years agoUse consistent shell prompts and example style.
Jon Loeliger [Mon, 7 Nov 2005 14:33:51 +0000 (08:33 -0600)]
Use consistent shell prompts and example style.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd --tags documentation, scraped from JC mail.
Jon Loeliger [Mon, 7 Nov 2005 14:03:30 +0000 (08:03 -0600)]
Add --tags documentation, scraped from JC mail.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd support for git-http-push to git-push script
Nick Hengeveld [Wed, 2 Nov 2005 19:19:31 +0000 (11:19 -0800)]
Add support for git-http-push to git-push script

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoTutorial: do not use 'git resolve'.
Junio C Hamano [Tue, 8 Nov 2005 06:50:57 +0000 (22:50 -0800)]
Tutorial: do not use 'git resolve'.

Use 'git merge' instead.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation: fix dependency generation.
Junio C Hamano [Tue, 8 Nov 2005 06:21:21 +0000 (22:21 -0800)]
Documentation: fix dependency generation.

The previous rule misses the case where git.txt or tutorial.txt
includes new files.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd bug isolation howto, scraped from Linus.
Jon Loeliger [Tue, 8 Nov 2005 02:45:25 +0000 (20:45 -0600)]
Add bug isolation howto, scraped from Linus.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoIgnore more generated files.
Junio C Hamano [Tue, 8 Nov 2005 02:23:10 +0000 (18:23 -0800)]
Ignore more generated files.

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>
15 years agoFix documentation dependency generation.
Junio C Hamano [Tue, 8 Nov 2005 02:21:51 +0000 (18:21 -0800)]
Fix documentation dependency generation.

Documentation/Makefile spent a lot of time to generate include
dependencies, which was quite noticeable especially during "make clean".

Rewrite it to generate just a single dependency file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation: asciidoc formatting fix for git-cvsexportcommit doc.
Junio C Hamano [Tue, 8 Nov 2005 01:53:06 +0000 (17:53 -0800)]
Documentation: asciidoc formatting fix for git-cvsexportcommit doc.

Annoyingly enough, asciidoc wants the same number of '=' on the second
line as there are characters on the first line.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agomerge-recursive: Only print relevant rename messages
Fredrik Kuivinen [Mon, 7 Nov 2005 23:19:44 +0000 (00:19 +0100)]
merge-recursive: Only print relevant rename messages

It isn't really interesting to know about the renames that have
already been committed to the branch you are working on. Furthermore,
the 'git-apply --stat' at the end of git-(merge|pull) will tell us
about any renames in the other branch.

With this commit only renames which require a file-level merge will
be printed.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDo not fail on hierarchical tagnames.
Junio C Hamano [Tue, 8 Nov 2005 00:22:34 +0000 (16:22 -0800)]
Do not fail on hierarchical tagnames.

This is a companion patch to 13d1cc3604a1a64cb5a6025bba8af8b74a373963
commit, which made hierarchical branch name possible.  "git tag
v0.99.9/a" would fail otherwise.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoSmall bugfixes for http-push.c
Johannes Schindelin [Mon, 7 Nov 2005 18:23:11 +0000 (19:23 +0100)]
Small bugfixes for http-push.c

This patch fixes three things:

- older libexpat does not know about enum XML_Status
- as in my patch for http-fetch, do not rely on a curl result in
free()d data
- calloc the new_lock structure

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMake http-push smarter about creating remote dirs
Nick Hengeveld [Mon, 7 Nov 2005 19:39:37 +0000 (11:39 -0800)]
Make http-push smarter about creating remote dirs

Remember object directories known to exist in the remote repo and don't
bother trying to create them.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoIntroducing: git-cvsexportcommit
Martin Langhoff [Mon, 7 Nov 2005 04:57:08 +0000 (17:57 +1300)]
Introducing: git-cvsexportcommit

A script that can replay commits git into a CVS checkout. Tries to ensure the
sanity of the operation and supports mainly manual usage.

If you are reckless enough, you can ask it to autocommit when everything has
applied cleanly. Combined with a couple more scripts could become part of
a git2cvs gateway.

Should support adds/removes and binary files.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation update: use git branch -d foo where applicable
Kai Ruemmler [Mon, 7 Nov 2005 08:23:59 +0000 (09:23 +0100)]
Documentation update: use git branch -d foo where applicable

This updates documentation to use git branch -d foo in favour of
rm .git/refs/heads/foo

Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoRecover dropped +x bit from git-pull.sh by accident.
Junio C Hamano [Mon, 7 Nov 2005 20:52:07 +0000 (12:52 -0800)]
Recover dropped +x bit from git-pull.sh by accident.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation: talk about guts of merge in tutorial.
Junio C Hamano [Mon, 7 Nov 2005 07:29:35 +0000 (23:29 -0800)]
Documentation: talk about guts of merge in tutorial.

While discussing Jon's ASCII art on merge operations with him, I
realized that the tutorial stops talking about the plumbing
details halfway.  So fill in the gory details, and update the
examples to use 'git-merge', not 'git-resolve'.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoRefactored merge options into separate merge-options.txt.
Jon Loeliger [Mon, 7 Nov 2005 05:30:56 +0000 (23:30 -0600)]
Refactored merge options into separate merge-options.txt.

Refactored fetch options into separate fetch-options.txt.
Made git-merge use merge-options.
Made git-fetch use fetch-options.
Made git-pull use merge-options and fetch-options.
Added --help option to git-pull and git-format-patch scripts.
Rewrote Documentation/Makefile to dynamically determine
include dependencies.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agohttp-fetch: do not use curl_message after releasing it
Johannes Schindelin [Sun, 6 Nov 2005 23:59:39 +0000 (00:59 +0100)]
http-fetch: do not use curl_message after releasing it

When curl_message is released using curl_multi_remove_handle(), it's
contents are undefined. Therefore, get the information before releasing it.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAllow GIT_DIR to be an absolute path
Johannes Schindelin [Sun, 6 Nov 2005 23:36:15 +0000 (00:36 +0100)]
Allow GIT_DIR to be an absolute path

This fixes a problem in safe_create_leading_directories() when the
argument starts with a '/' (i.e. the path is absolute).

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agohttp-push.c: include with angle bracket, not dq.
Paul Collins [Sun, 6 Nov 2005 21:07:45 +0000 (21:07 +0000)]
http-push.c: include with angle bracket, not dq.

Do not search the current directory when including expat.h, since it
is not supplied by git.

Signed-off-by: Paul Collins <paul@briny.ondioline.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoSet up remotes/origin to track all remote branches.
Junio C Hamano [Sun, 6 Nov 2005 08:52:57 +0000 (00:52 -0800)]
Set up remotes/origin to track all remote branches.

This implements the idea Daniel Barkalow came up with, to match
the remotes/origin created by clone by default to the workflow I
use myself in my guinea pig repository, to have me eat my own
dog food.

We probably would want to use either .git/refs/local/heads/*
(idea by Linus) or .git/refs/heads/origin/* instead to reduce
the local ref namespace pollution.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-status: do not mark unmerged paths as committable.
Junio C Hamano [Mon, 7 Nov 2005 01:37:40 +0000 (17:37 -0800)]
git-status: do not mark unmerged paths as committable.

An unmerged path appears as both "Updated but not checked in" list,
and "Changed but not updated" list.  We are not going to commit that
path until it is resolved, so remove it from the former list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agols-files: --others should not say unmerged paths are unknown.
Junio C Hamano [Mon, 7 Nov 2005 01:26:31 +0000 (17:26 -0800)]
ls-files: --others should not say unmerged paths are unknown.

Jon Loeliger noticed that an unmerged path appears as
"Untracked" in git-status output, even though we show the same
path as updated/changed.  Since --others means "we have not told
git about that path", we should not show unmerged paths --
obviously, git knows about them; it just does not know what we
want to do about them yet.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoUse fink/darwinport paths for OSX
Randal L. Schwartz [Sun, 6 Nov 2005 12:33:07 +0000 (04:33 -0800)]
Use fink/darwinport paths for OSX

There's no standard libexpat for OSX, so if you install it
after-market, it can end up in various directories.  Give
paths used by fink and darwinports by default to CFLAGS.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoRefactor merge strategies into separate includable file.
Jon Loeliger [Sun, 6 Nov 2005 16:26:07 +0000 (10:26 -0600)]
Refactor merge strategies into separate includable file.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocument expat dependency when using http-push.
Junio C Hamano [Sat, 5 Nov 2005 19:12:05 +0000 (11:12 -0800)]
Document expat dependency when using http-push.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoMerge in http-push first stage.
Junio C Hamano [Sun, 6 Nov 2005 09:27:15 +0000 (01:27 -0800)]
Merge in http-push first stage.

15 years agoRefresh the remote lock if it is about to expire
Nick Hengeveld [Fri, 4 Nov 2005 22:22:35 +0000 (14:22 -0800)]
Refresh the remote lock if it is about to expire

Refresh the remote lock if it is about to expire

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoImprove lock handling
Nick Hengeveld [Fri, 4 Nov 2005 22:22:31 +0000 (14:22 -0800)]
Improve lock handling

Improve lock handling: parse the server response for the timeout, owner,
and lock token

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoSupport remote references with slashes in their names
Nick Hengeveld [Fri, 4 Nov 2005 22:22:25 +0000 (14:22 -0800)]
Support remote references with slashes in their names

Support remote references with slashes in their names

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoVerify remote packs, speed up pending request queue
Nick Hengeveld [Fri, 4 Nov 2005 22:22:18 +0000 (14:22 -0800)]
Verify remote packs, speed up pending request queue

Verify that remote packs exist before using the pack index, add requests to
the beginning of the queue to locate pending requests faster.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd support for pushing to a remote repository using HTTP/DAV
Nick Hengeveld [Wed, 2 Nov 2005 19:19:24 +0000 (11:19 -0800)]
Add support for pushing to a remote repository using HTTP/DAV

Add support for pushing to a remote repository using HTTP/DAV

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDebian: test build.
Junio C Hamano [Sat, 5 Nov 2005 20:54:40 +0000 (12:54 -0800)]
Debian: test build.

Update version number in changelog to match the 0.99.9.GIT version
number, to allow building private deb from wip.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoFurther Debian split fixes.
Junio C Hamano [Sat, 5 Nov 2005 20:54:25 +0000 (12:54 -0800)]
Further Debian split fixes.

The doc installation was flattened, breaking links to howto/.
Silly cut&paste error made git-doc depend on tk8.4.  Doh.
Move most of the documentation (except manuals) to git-doc.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoInstall asciidoc sources as well.
Junio C Hamano [Sat, 5 Nov 2005 20:52:56 +0000 (12:52 -0800)]
Install asciidoc sources as well.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoPackage split: Debian.
Junio C Hamano [Sat, 5 Nov 2005 10:39:42 +0000 (02:39 -0800)]
Package split: Debian.

As discussed on the list, split the foreign SCM interoperability
packages and documentation from the git-core binary package.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoSimplify CFLAGS/DEFINES in Makefile
Junio C Hamano [Sat, 5 Nov 2005 07:50:09 +0000 (23:50 -0800)]
Simplify CFLAGS/DEFINES in Makefile

I think the original intention was to make CFLAGS overridable
from the make command line, but somehow we ended up accumulating
conditional makefile sections that wrongly appends values to
CFLAGs.  These assignments do not work when the user actually
override them from the make command line!

DEFINES are handled the same way; it was seemingly overridable,
but the makefile sections had assignments, which meant
overriding it from the command line broke things.

This simplifies things by limiting the internal futzing to
ALL_CFLAGS, and by removing DEFINES altogether.  Overriding
CFLAGS from the command line should start working with this
change.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-fetch: fail if specified refspec does not match remote.
Junio C Hamano [Sun, 6 Nov 2005 08:09:59 +0000 (00:09 -0800)]
git-fetch: fail if specified refspec does not match remote.

'git-fetch remote no-such-ref' succeeded without fetching any
ref from the remote.  Detect such case and report an error.

Note that this makes 'git-fetch remote master master' to fail,
because the remote branch 'master' matches the first refspec,
and the second refspec is left unmatched, which is detected by
the error checking logic.  This is somewhat unintuitive, but
giving the same refspec more than once to git-fetch is useless
in any case so it should not be much of a problem.  I'd accept a
patch to change this if somebody cares enough, though.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation: pull/clone ref mapping clarification.
Junio C Hamano [Sun, 6 Nov 2005 06:26:52 +0000 (22:26 -0800)]
Documentation: pull/clone ref mapping clarification.

Josef Weidendorfer points out that git-clone documentation does not
mention the initial copying of remote branch heads into corresponding
local branches.  Also clarify the purpose of the ref mappings description
in the "remotes" file and recommended workflow.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-format-patch: silly typo fix.
Junio C Hamano [Sun, 6 Nov 2005 08:21:45 +0000 (00:21 -0800)]
git-format-patch: silly typo fix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agotest: t4102-apply-rename fails with strict umask.
Junio C Hamano [Sat, 5 Nov 2005 21:08:18 +0000 (13:08 -0800)]
test: t4102-apply-rename fails with strict umask.

We checked the result of patch application for full permission bits,
when the only thing we cared about was to make sure the executable
bit was correctly set.

Noticed by Peter Baumann.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-clone: fix local clone
Junio C Hamano [Sat, 5 Nov 2005 19:44:35 +0000 (11:44 -0800)]
git-clone: fix local clone

If we let cpio to create the leading directories implicitly,
it ends up having funny perm bits (GNU cpio 2.5 and 2.6, at least).
This leaves .git/object/?? directories readable only by the owner.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoinit-db::copy_file() - use copy_fd()
Junio C Hamano [Sat, 5 Nov 2005 19:07:22 +0000 (11:07 -0800)]
init-db::copy_file() - use copy_fd()

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agocopy.c::copy_fd() - do not leak file descriptor on error return.
Junio C Hamano [Sat, 5 Nov 2005 19:02:56 +0000 (11:02 -0800)]
copy.c::copy_fd() - do not leak file descriptor on error return.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation: format-patch
Junio C Hamano [Sat, 5 Nov 2005 10:55:18 +0000 (02:55 -0800)]
Documentation: format-patch

Add examples section and talk about using this to cherry-pick
commits.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoformat-patch: "rev1.." should mean "rev1..HEAD"
Junio C Hamano [Sat, 5 Nov 2005 10:47:07 +0000 (02:47 -0800)]
format-patch: "rev1.." should mean "rev1..HEAD"

"rev1.." should mean "rev1..HEAD"; git-diff users are familiar
with that syntax.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation: git-fetch/pull updates.
Junio C Hamano [Sat, 5 Nov 2005 09:37:00 +0000 (01:37 -0800)]
Documentation: git-fetch/pull updates.

We do not accept multiple <refspecs> on one Pull:/Push: line
right now (we could lift this tentative workaround for the
broken refnames), but we have always accepted multiple such
lines, so use that form in the examples and discussion.

Also explicitly mention that Octopus is made only with an
explicit command line request and never from Pull: lines.

Add a couple of cross references.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdded a few examples to git-pull man page.
Jon Loeliger [Sat, 5 Nov 2005 02:36:08 +0000 (20:36 -0600)]
Added a few examples to git-pull man page.

Clarified and added notes for pull/push refspecs.
Converted to back-ticks for literal text examples.

[jc: Also fixed git-pull description that still talked about its
calling git-resolve or git-octopus (we do not anymore; instead
we just call git-merge).  BTW, I am reasonably impressed by how
well "git-am -3" applied this patch, which had some conflicts
because I've updated the documentation somewhat.]

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocument the --no-commit flag better
Junio C Hamano [Sat, 5 Nov 2005 02:17:16 +0000 (18:17 -0800)]
Document the --no-commit flag better

Pasky and I did overlapping documentation independently; this is to
pick up better wordings from what he sent me.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation: -merge and -pull: describe merge strategies.
Junio C Hamano [Fri, 4 Nov 2005 08:06:20 +0000 (00:06 -0800)]
Documentation: -merge and -pull: describe merge strategies.

... and give a couple of examples of running 'git pull' against
local repository.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocumentation: git-add -- do not say "cache", add examples.
Junio C Hamano [Fri, 4 Nov 2005 08:04:17 +0000 (00:04 -0800)]
Documentation: git-add -- do not say "cache", add examples.

Its use of git-ls-files --others is very nice, but sometimes gives
surprising results, so we'd better talk about it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-tag: Do not assume the working tree root is writable.
Junio C Hamano [Thu, 3 Nov 2005 23:26:43 +0000 (15:26 -0800)]
git-tag: Do not assume the working tree root is writable.

This is a long overdue companion commit that fixed git-commit
(Santi's f8e2c54c9a17af3319e96db1d9e97ace36ae6831).

Having the temporary files in the working tree root when making
tags is not as bad because it does not involve 'git status' as
the git-commit case, but this makes things more consistent.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoRemove the temp file if it is empty after the request has failed
Nick Hengeveld [Fri, 4 Nov 2005 01:54:52 +0000 (17:54 -0800)]
Remove the temp file if it is empty after the request has failed

After using cg-update to pull, empty files named *.temp are left in
the various subdirectories of .git/objects/.  These are created by
git-http-fetch to hold data as it's being fetched from the remote
repository.  They are left behind after a transfer error so that the
next time git-http-fetch runs it can pick up where it left off.  If
they're empty though, it would make more sense to delete them rather
than leaving them behind for the next attempt.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoIllustration: "Commit DAG Revision Naming"
Junio C Hamano [Thu, 3 Nov 2005 21:52:44 +0000 (13:52 -0800)]
Illustration: "Commit DAG Revision Naming"

Jon Loeliger's ASCII art in the git-rev-parse(1) manual.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoIllustration: "Git Diff Types"
Junio C Hamano [Thu, 3 Nov 2005 21:52:44 +0000 (13:52 -0800)]
Illustration: "Git Diff Types"

Jon Loeliger's ASCII art in the Tutorial.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoIllustration: "Fundamental Git Index Operations"
Junio C Hamano [Thu, 3 Nov 2005 21:52:44 +0000 (13:52 -0800)]
Illustration: "Fundamental Git Index Operations"

Jon Loeliger's ASCII art in the Discussion section.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agogit-merge-ours: make sure our index matches HEAD
Junio C Hamano [Thu, 3 Nov 2005 09:51:25 +0000 (01:51 -0800)]
git-merge-ours: make sure our index matches HEAD

git-merge expects this check to be done appropriately by the
merge strategy backends.  In the case of merge-ours strategy,
the resulting tree comes what we have in the index file, so it
must match the current HEAD; otherwise it would not be "ours"
merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd 'ours' merge strategy.
Junio C Hamano [Wed, 2 Nov 2005 03:34:49 +0000 (19:34 -0800)]
Add 'ours' merge strategy.

This adds the coolest merge strategy ever, "ours".  It can take
arbitrary number of foreign heads and merge them into the
current branch, with the resulting tree always taken from our
branch head, hence its name.

What this means is that you can declare that the current branch
supersedes the development histories of other branches using
this merge strategy.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoAdd --no-commit to git-merge/git-pull.
Junio C Hamano [Wed, 2 Nov 2005 03:30:11 +0000 (19:30 -0800)]
Add --no-commit to git-merge/git-pull.

With --no-commit flag, git-pull will perform the merge but pretends as
if the merge needed a hand resolve even if automerge cleanly resolves,
to give the user a chance to add further changes and edit the commit
message.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDocument --since and --until options to rev-parse.
Junio C Hamano [Thu, 3 Nov 2005 07:41:25 +0000 (23:41 -0800)]
Document --since and --until options to rev-parse.

The usability magic were hidden in the source code without being
documented, and even the maintainer did not know about them ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoBe careful when dereferencing tags.
Junio C Hamano [Wed, 2 Nov 2005 23:19:13 +0000 (15:19 -0800)]
Be careful when dereferencing tags.

One caller of deref_tag() was not careful enough to make sure
what deref_tag() returned was not NULL (i.e. we found a tag
object that points at an object we do not have).  Fix it, and
warn about refs that point at such an incomplete tag where
needed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years ago[PATCH] Clean up the SunOS Makefile rule
Peter Eriksen [Wed, 2 Nov 2005 19:27:31 +0000 (20:27 +0100)]
[PATCH] Clean up the SunOS Makefile rule

Don't set a non-standard CURLDIR as default, and fix an error
in Solaris 10 by setting NEEDS_LIBICONV.

Signed-off-by: Peter Eriksen <s022018@student.dtu.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoIgnore '\r' at the end of line in $GIT_DIR/config
Junio C Hamano [Wed, 2 Nov 2005 21:02:57 +0000 (13:02 -0800)]
Ignore '\r' at the end of line in $GIT_DIR/config

Unfortunate people may have to use $GIT_DIR/config edited on
DOSsy machine on UNIXy machine.  Ignore '\r' immediately
followed by '\n'.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoremove CR/LF from .gitignore
Alex Riesen [Wed, 2 Nov 2005 13:05:45 +0000 (14:05 +0100)]
remove CR/LF from .gitignore

For everyone cursed by dos/windows line endings (aka CRLF):

The code reading the .gitignore files (excludes and excludes per
directory) leaves \r in the patterns, which causes fnmatch to fail for
no obvious reason. Just remove a "\r" preceding a "\n"
unconditionally.

Signed-off-by: Junio C Hamano <junkio@cox.net>
15 years agoDo not fail on hierarchical branch names.
Junio C Hamano [Wed, 2 Nov 2005 20:17:47 +0000 (12:17 -0800)]
Do not fail on hierarchical branch names.

"git-checkout -b frotz/nitfol master" failed to create
$GIT_DIR/refs/heads/frotz/nitfol but went ahead and updated
$GIT_DIR/HEAD to point at it, resulting in a corrupt repository.
Exit when we cannot create the new branch with an error status.

While we are at it, there is no reason to forbid subdirectories
in refs/heads, so make sure we handle that correctly.

Signed-off-by: Junio C Hamano <junkio@cox.net>