Code

git.git
19 years agogit-fetch/push/pull: documentation.
Junio C Hamano [Thu, 20 Oct 2005 04:25:39 +0000 (21:25 -0700)]
git-fetch/push/pull: documentation.

The documentation was lazily sharing the argument description across these
commands.

Lazy may be a way of life, but that does not justify confusing others ;-).

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoDo not feed rev-list an invalid SHA1 expression.
Junio C Hamano [Thu, 20 Oct 2005 01:28:17 +0000 (18:28 -0700)]
Do not feed rev-list an invalid SHA1 expression.

The previous round to optimize fetch-pack has a small bug that
feeds SHA1^ ("parent commit") before making sure SHA1 is
actually a commit (or a tag that eventually dereferences to a
commit).  Also it did not help culling the known-to-be-common
parents if the common one was a merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Do not send "want" lines for complete objects
Johannes Schindelin [Wed, 19 Oct 2005 23:14:34 +0000 (16:14 -0700)]
[PATCH] Do not send "want" lines for complete objects

It was all good and well to check if all remote refs are complete (local
refs or descendants thereof), but we can just as easily use the same
information to avoid sending "want" lines just for the complete objects in
the case that not all remote refs are complete (or their names differ).

Also, git-fetch-pack does not have to ask for descendants of remote refs
which are complete (for now, git-rev-list is told to ignore only the first
parent). That change also eliminates a code path where a popen()ed handle
was not pclose()ed.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agocount-objects: squelch error from find on sparse object directory.
Junio C Hamano [Wed, 19 Oct 2005 22:01:50 +0000 (15:01 -0700)]
count-objects: squelch error from find on sparse object directory.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-clone: always keep pack sent from remote (documentation).
Junio C Hamano [Wed, 19 Oct 2005 21:43:43 +0000 (14:43 -0700)]
git-clone: always keep pack sent from remote (documentation).

This adjusts the documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-clone: always keep pack sent from remote.
Junio C Hamano [Wed, 19 Oct 2005 21:43:43 +0000 (14:43 -0700)]
git-clone: always keep pack sent from remote.

This deprecates --keep and -q flags and always keeps the pack
sent from the remote site.  Corresponding configuration
variables are also removed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoDo not ask for objects known to be complete.
Junio C Hamano [Wed, 19 Oct 2005 21:27:02 +0000 (14:27 -0700)]
Do not ask for objects known to be complete.

On top of optimization by Linus not to ask refs that already match, we
can walk our refs and not issue "want" for things that are known to be
reachable from them.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoSupport for HTTP transfer timeouts based on transfer speed
Nick Hengeveld [Wed, 19 Oct 2005 21:27:01 +0000 (14:27 -0700)]
Support for HTTP transfer timeouts based on transfer speed

Add configuration settings to abort HTTP requests if the transfer rate
drops below a threshold for a specified length of time.  Environment
variables override config file settings.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-daemon: timeout, eliminate double DWIM
H. Peter Anvin [Wed, 19 Oct 2005 21:27:01 +0000 (14:27 -0700)]
git-daemon: timeout, eliminate double DWIM

It turns out that not only did git-daemon do DWIM, but git-upload-pack
does as well.  This is bad; security checks have to be performed *after*
canonicalization, not before.

Additionally, the current git-daemon can be trivially DoSed by spewing
SYNs at the target port.

This patch adds a --strict option to git-upload-pack to disable all
DWIM, a --timeout option to git-daemon and git-upload-pack, and an
--init-timeout option to git-daemon (which is typically set to a much
lower value, since the initial request should come immediately from the
client.)

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoEven when overwriting tags, report if they are changed or not.
Junio C Hamano [Wed, 19 Oct 2005 01:42:14 +0000 (18:42 -0700)]
Even when overwriting tags, report if they are changed or not.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoOptimize common case of git-rev-list
Linus Torvalds [Wed, 19 Oct 2005 01:29:17 +0000 (18:29 -0700)]
Optimize common case of git-rev-list

I took a look at webgit, and it looks like at least for the "projects"
page, the most common operation ends up being basically

git-rev-list --header --parents --max-count=1 HEAD

Now, the thing is, the way "git-rev-list" works, it always keeps on
popping the parents and parsing them in order to build the list of
parents, and it turns out that even though we just want a single commit,
git-rev-list will invariably look up _three_ generations of commits.

It will parse:
 - the commit we want (it obviously needs this)
 - it's parent(s) as part of the "pop_most_recent_commit()" logic
 - it will then pop one of the parents before it notices that it doesn't
   need any more
 - and as part of popping the parent, it will parse the grandparent (again
   due to "pop_most_recent_commit()".

Now, I've strace'd it, and it really is pretty efficient on the whole, but
if things aren't nicely cached, and with long-latency IO, doing those two
extra objects (at a minimum - if the parent is a merge it will be more) is
just wasted time, and potentially a lot of it.

So here's a quick special-case for the trivial case of "just one commit,
and no date-limits or other special rules".

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agorevised^2: git-daemon extra paranoia, and path DWIM
H. Peter Anvin [Wed, 19 Oct 2005 01:26:52 +0000 (18:26 -0700)]
revised^2: git-daemon extra paranoia, and path DWIM

This patch adds some extra paranoia to the git-daemon filename test.  In
particular, it now rejects pathnames containing //; it also adds a
redundant test for pathname absoluteness (belts and suspenders.)

A single / at the end of the path is still permitted, however, and the
.git and /.git append DWIM stuff is now handled in an integrated manner,
which means the resulting path will always be subjected to pathname checks.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRemove unused include.
Junio C Hamano [Tue, 18 Oct 2005 22:41:43 +0000 (15:41 -0700)]
Remove unused include.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-fetch-pack: avoid unnecessary zero packing
Linus Torvalds [Tue, 18 Oct 2005 18:35:17 +0000 (11:35 -0700)]
git-fetch-pack: avoid unnecessary zero packing

If everything is up-to-date locally, we don't need to even ask for a
pack-file from the remote, or try to unpack it.

This is especially important for tags - since the pack-file common commit
logic is based purely on the commit history, it will never be able to find
a common tag, and will thus always end up re-fetching them.

Especially notably, if the tag points to a non-commit (eg a tagged tree),
the pack-file would be unnecessarily big, just because it cannot any most
recent common point between commits for pruning.

Short-circuiting the case where we already have that reference means that
we avoid a lot of these in the common case.

NOTE! This only matches remote ref names against the same local name,
which works well for tags, but is not as generic as it could be. If we
ever need to, we could match against _any_ local ref (if we have it, we
have it), but this "match against same name" is simpler and more
efficient, and covers the common case.

Renaming of refs is common for branch heads, but since those are always
commits, the pack-file generation can optimize that case.

In some cases we might still end up fetching pack-files unnecessarily, but
this at least avoids the re-fetching of tags over and over if you use a
regular

git fetch --tags ...

which was the main reason behind the change.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoNo funny names on cygwin...
Johannes Schindelin [Tue, 18 Oct 2005 18:35:17 +0000 (11:35 -0700)]
No funny names on cygwin...

On FAT/NTFS, filenames cannot contain tabs. So t3300-funny-names would
reliably fail already when trying to create such files.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoIgnore more generated files
Johannes Schindelin [Tue, 18 Oct 2005 18:35:17 +0000 (11:35 -0700)]
Ignore more generated files

Since git-status now shows the "other" files, too, bring .gitignore
up-to-date.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFix cvsimport warning when called without --no-cvs-direct
Johannes Schindelin [Tue, 18 Oct 2005 18:35:16 +0000 (11:35 -0700)]
Fix cvsimport warning when called without --no-cvs-direct

Perl was warning that $opt_p was undefined in that case.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-checkout: revert specific paths to either index or a given tree-ish.
Junio C Hamano [Tue, 18 Oct 2005 08:29:27 +0000 (01:29 -0700)]
git-checkout: revert specific paths to either index or a given tree-ish.

When extra paths arguments are given, git-checkout reverts only those
paths to either the version recorded in the index or the version
recorded in the given tree-ish.

This has been on the TODO list for quite a while.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoTeach git-add and git-commit to handle filenames starting with '-'.
Junio C Hamano [Tue, 18 Oct 2005 07:27:50 +0000 (00:27 -0700)]
Teach git-add and git-commit to handle filenames starting with '-'.

Recent '--' fixes to "git diff" by Linus made it possible to specify
filenames that start with '-'.  But in order to do that, you need to
be able to add and commit such file to begin with.

Teach git-add and git-commit to honor the same '--' convention.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoHandle "-" at beginning of filenames, part 3
Linus Torvalds [Tue, 18 Oct 2005 07:16:45 +0000 (00:16 -0700)]
Handle "-" at beginning of filenames, part 3

This fixes the default built-in exec() of "diff" to add a "--" before the
filenames, so that if a filename starts with a "-", the diff program won't
think it's an option.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoTeach "git diff" to handle filenames starting with '-'
Linus Torvalds [Tue, 18 Oct 2005 07:16:45 +0000 (00:16 -0700)]
Teach "git diff" to handle filenames starting with '-'

It adds "--" to the git-diff.sh scripts, to keep any filenames that start
with a "-" from being confused with an option.

But in order to do that, it needs to teach git-diff-files to honor "--".

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAvoid ambiguity between refname and filename in rev-parse
Linus Torvalds [Tue, 18 Oct 2005 07:16:45 +0000 (00:16 -0700)]
Avoid ambiguity between refname and filename in rev-parse

Although it really is very convenient, not requiring explicit
'-r' option to name revs is sometimes ambiguous.

Usually we allow a "--" to say where a filename starts when it
_is_ ambiguous.  However, we fail that at times. In particular,
git-rev-parse fails it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoForward port the "funny ref avoidance" in clone and fetch from maint branch.
Junio C Hamano [Tue, 18 Oct 2005 04:47:06 +0000 (21:47 -0700)]
Forward port the "funny ref avoidance" in clone and fetch from maint branch.

Somehow I forgot to forward port these fixes.  "git clone" from a
repository prepared with the latest update-server-info would fail
without this patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdjust tests for not quoting SP.
Junio C Hamano [Mon, 17 Oct 2005 20:32:14 +0000 (13:32 -0700)]
Adjust tests for not quoting SP.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoDo not quote SP.
Junio C Hamano [Mon, 17 Oct 2005 20:32:03 +0000 (13:32 -0700)]
Do not quote SP.

Follow the "encode minimally" principle -- our tools, including
git-apply and git-status, can handle pathnames with embedded SP just
fine.  The only problematic ones are TAB and LF, and we need to quote
the metacharacters introduced for quoting.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-apply: remove unused --show-files flag.
Junio C Hamano [Mon, 17 Oct 2005 05:06:16 +0000 (22:06 -0700)]
git-apply: remove unused --show-files flag.

Linus says he does not use it (and the thinking behind its initial
introduction), and neither Cogito nor StGIT uses it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoupdate-index --index-info: adjust for funny-path quoting.
Junio C Hamano [Sun, 16 Oct 2005 07:39:07 +0000 (00:39 -0700)]
update-index --index-info: adjust for funny-path quoting.

Although the sole current user uses -z to read this, we should be
prepared for somebody to feed non-z format to the command.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd tests for funny pathnames.
Junio C Hamano [Sat, 15 Oct 2005 23:15:49 +0000 (16:15 -0700)]
Add tests for funny pathnames.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUpdate documentation for C-style quoting.
Junio C Hamano [Sat, 15 Oct 2005 04:56:46 +0000 (21:56 -0700)]
Update documentation for C-style quoting.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUpdate git-status to new git-diff-* and git-ls-files output.
Junio C Hamano [Sat, 15 Oct 2005 04:56:46 +0000 (21:56 -0700)]
Update git-status to new git-diff-* and git-ls-files output.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUpdate git-diff-* to use C-style quoting for funny pathnames.
Junio C Hamano [Sat, 15 Oct 2005 04:56:46 +0000 (21:56 -0700)]
Update git-diff-* to use C-style quoting for funny pathnames.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoImprove "git add" again.
Junio C Hamano [Sat, 15 Oct 2005 04:56:46 +0000 (21:56 -0700)]
Improve "git add" again.

This makes it possible to add paths that have funny characters (TAB
and LF) in them, and makes adding many paths more efficient in
general.

New flag "--stdin" to update-index was initially added for different
purpose, but it turns out to be a perfect match for feeding "ls-files
--others -z" output to improve "git add".

It also adds "--verbose" flag to update-index for use with "git add"
command.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUpdate ls-files and ls-tree to use C-style quoting for funny pathnames.
Junio C Hamano [Sat, 15 Oct 2005 04:56:46 +0000 (21:56 -0700)]
Update ls-files and ls-tree to use C-style quoting for funny pathnames.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUpdate git-apply to use C-style quoting for funny pathnames.
Junio C Hamano [Sat, 15 Oct 2005 04:54:52 +0000 (21:54 -0700)]
Update git-apply to use C-style quoting for funny pathnames.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFunctions to quote and unquote pathnames in C-style.
Junio C Hamano [Sat, 15 Oct 2005 04:54:47 +0000 (21:54 -0700)]
Functions to quote and unquote pathnames in C-style.

Following the list discussion, define two functions, quote_c_style and
unquote_c_style, to help adopting the proposed way for quoting funny
pathname letters for GNU patch.  The rule is described in:

    http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2

Currently we do not support the leading '!', but we probably should
barf upon seeing it.  Rule B4. is interpreted to require always 3
octal digits in \XYZ notation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge branch 'fixes'
Junio C Hamano [Tue, 18 Oct 2005 00:41:37 +0000 (17:41 -0700)]
Merge branch 'fixes'

19 years agogit-checkout-index: documentation updates.
Junio C Hamano [Tue, 18 Oct 2005 00:38:09 +0000 (17:38 -0700)]
git-checkout-index: documentation updates.

Now the behaviour of '-a' has been straightened out, document it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agomake checkout-index '-a' flag saner.
Linus Torvalds [Tue, 18 Oct 2005 00:32:12 +0000 (17:32 -0700)]
make checkout-index '-a' flag saner.

The original semantics of pretending as if all files were
specified where '-a' appeared and using only the flags given so
far was too confusing.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoref-format documentation.
Junio C Hamano [Mon, 17 Oct 2005 05:41:59 +0000 (22:41 -0700)]
ref-format documentation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoSparse-directory safety fix.
Junio C Hamano [Sun, 16 Oct 2005 21:09:50 +0000 (14:09 -0700)]
Sparse-directory safety fix.

This will be removed when merging the second phase of Linus' "Create
object subdirectories on demand" change anyway, but the code to
recreate the empty .git/objects/??/ directory was confused.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge branch 'fixes'
Junio C Hamano [Sun, 16 Oct 2005 19:23:59 +0000 (12:23 -0700)]
Merge branch 'fixes'

19 years agoWe do not depend on patch.
Junio C Hamano [Sun, 16 Oct 2005 18:59:13 +0000 (11:59 -0700)]
We do not depend on patch.

Deb packaging claim we depend on patch, but I think we use git-apply
where it matters.  When a patch does not apply with git-apply, using
GNU patch still is helpful sometimes.  So demote it from "Depends" to
"Suggests".

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge branch 'svn' of http://netz.smurf.noris.de/git/git
Junio C Hamano [Sun, 16 Oct 2005 18:55:35 +0000 (11:55 -0700)]
Merge branch 'svn' of netz.smurf.noris.de/git/git

[jc: I have my pre-commit hook enabled to catch trailing whitespaces,
 and fixed them up while merging.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agosvn commit: re-word the exit-due-to-memory-leak message
Matthias Urlichs [Sun, 16 Oct 2005 17:57:38 +0000 (19:57 +0200)]
svn commit: re-word the exit-due-to-memory-leak message

Reworded the exit message, as per Kalle Valo's suggestion (but shorter).

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
19 years agoMakefile entry for git-svnimport contained a small typo.
Kalle Valo [Sun, 16 Oct 2005 17:37:25 +0000 (19:37 +0200)]
Makefile entry for git-svnimport contained a small typo.

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
19 years agoSquelch compiler warnings from connect.c
Junio C Hamano [Sun, 16 Oct 2005 07:25:26 +0000 (00:25 -0700)]
Squelch compiler warnings from connect.c

Forgot to include necessary header file to get the function declaration.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoDisable hooks during tests.
Junio C Hamano [Sun, 16 Oct 2005 07:24:34 +0000 (00:24 -0700)]
Disable hooks during tests.

Individual tests for hooks would want to have their own tests when
written.  Also we should not pick up from random templates the user
happens to have.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoSparse fixes for http-fetch
Peter Hagervall [Sun, 16 Oct 2005 07:01:08 +0000 (00:01 -0700)]
Sparse fixes for http-fetch

This patch cleans out all sparse warnings from http-fetch.c

I'm a bit uncomfortable with adding extra #ifdefs to avoid either
'mixing declaration with code' or 'unused variable' warnings, but I
figured that since those functions are already littered with #ifdefs I
might just get away with it. Comments?

[jc: I adjusted Peter's patch to address uncomfortableness issues.]

Signed-off-by: Peter Hagervall <hager@cs.umu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agowhatchanged: document -m option from git-diff-tree.
Junio C Hamano [Sun, 16 Oct 2005 06:49:27 +0000 (23:49 -0700)]
whatchanged: document -m option from git-diff-tree.

The documentation for git-whatchanged is meant to describe only
the most frequently used options from git-diff-tree.  Because "why
doesn't it show merges" was asked more than once, we'd better
describe '-m' option there.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoShow peeled onion from upload-pack and server-info.
Junio C Hamano [Fri, 14 Oct 2005 01:57:40 +0000 (18:57 -0700)]
Show peeled onion from upload-pack and server-info.

This updates git-ls-remote to show SHA1 names of objects that are
referred by tags, in the "ref^{}" notation.

This would make git-findtags (without -t flag) almost trivial.

    git-peek-remote . |
    sed -ne "s:^$target "'refs/tags/\(.*\)^{}$:\1:p'

Also Pasky could do:

    git-ls-remote --tags $remote |
    sed -ne 's:\( refs/tags/.*\)^{}$:\1:p'

to find out what object each of the remote tags refers to, and
if he has one locally, run "git-fetch $remote tag $tagname" to
automatically catch up with the upstream tags.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoIntroduce notation "ref^{type}".
Junio C Hamano [Fri, 14 Oct 2005 01:57:40 +0000 (18:57 -0700)]
Introduce notation "ref^{type}".

Existing "tagname^0" notation means "dereference tag zero or more
times until you cannot dereference it anymore, and make sure it is a
commit -- otherwise barf".  But tags do not necessarily reference
commit objects.

This commit introduces a bit more generalized notation, "ref^{type}".
Existing "ref^0" is a shorthand for "ref^{commit}".  If the type
is empty, it just dereferences tags until it hits a non-tag object.

With this, "git-rev-parse --verify 'junio-gpg-pub^{}'" shows the blob
object name -- there is no need to manually read the tag object and
find out the object name anymore.

"git-rev-parse --verify 'HEAD^{tree}'" can be used to find out the
tree object name of the HEAD commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoIgnore funny refname sent from remote
Junio C Hamano [Fri, 14 Oct 2005 01:57:40 +0000 (18:57 -0700)]
Ignore funny refname sent from remote

This allows the remote side (most notably, upload-pack) to show
additional information without affecting the downloader.  Peek-remote
does not ignore them -- this is to make it useful for Pasky's
automatic tag following.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRefuse to create funny refs in clone-pack, git-fetch and receive-pack.
Junio C Hamano [Fri, 14 Oct 2005 01:57:39 +0000 (18:57 -0700)]
Refuse to create funny refs in clone-pack, git-fetch and receive-pack.

Using git-check-ref-format, make sure we do not create refs with
funny names when cloning from elsewhere (clone-pack), fast forwarding
local heads (git-fetch), or somebody pushes into us (receive-pack).

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-check-ref-format: reject funny ref names.
Junio C Hamano [Fri, 14 Oct 2005 01:57:39 +0000 (18:57 -0700)]
git-check-ref-format: reject funny ref names.

Update check_ref_format() function to reject ref names that:

 * has a path component that begins with a ".", or
 * has a double dots "..", or
 * has ASCII control character, "~", "^", ":" or SP, anywhere, or
 * ends with a "/".

Use it in 'git-checkout -b', 'git-branch', and 'git-tag' to make sure
that newly created refs are well-formed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge branch 'fixes'
Junio C Hamano [Sat, 15 Oct 2005 18:19:09 +0000 (11:19 -0700)]
Merge branch 'fixes'

19 years agoShow curl error a bit better.
Junio C Hamano [Sat, 15 Oct 2005 18:13:55 +0000 (11:13 -0700)]
Show curl error a bit better.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoSome curl versions lack curl_easy_duphandle()
Johannes Schindelin [Sat, 15 Oct 2005 18:10:46 +0000 (11:10 -0700)]
Some curl versions lack curl_easy_duphandle()

Hi,

On Fri, 14 Oct 2005, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > This patch looks bigger than it really is: The code to get the
> > default handle was refactored into a function, and is called
> > instead of curl_easy_duphandle() if that does not exist.
>
> I'd like to take Nick's config file patch first, which
> unfortunately interferes with your patch.  I'd hate to ask you
> this, but could you rebase it on top of Nick's patch, [...]

No need to hate it. Here comes the rebased patch, and this time, I
actually tested it a bit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUnlocalized isspace and friends
Linus Torvalds [Thu, 13 Oct 2005 18:03:18 +0000 (11:03 -0700)]
Unlocalized isspace and friends

Do our own ctype.h, just to get the sane semantics: we want
locale-independence, _and_ we want the right signed behaviour. Plus we
only use a very small subset of ctype.h anyway (isspace, isalpha,
isdigit and isalnum).

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUse config file settings for http
Nick Hengeveld [Sat, 15 Oct 2005 00:16:01 +0000 (17:16 -0700)]
Use config file settings for http

Use "http." config file settings if they exist.  Environment variables
still work, and they will override config file settings.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-http-fetch: Remove size limit for objects/info/{packs,alternates}
Sergey Vlasov [Thu, 13 Oct 2005 17:49:53 +0000 (10:49 -0700)]
git-http-fetch: Remove size limit for objects/info/{packs,alternates}

git-http-fetch received objects/info/packs into a fixed-size buffer
and started to fail when this file became larger than the buffer.
Change it to grow the buffer dynamically, and do the same thing for
objects/info/alternates.  Also add missing free() calls for these
buffers.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agodebian packaging
Aneesh Kumar [Sat, 15 Oct 2005 00:15:11 +0000 (17:15 -0700)]
debian packaging

Make it build with stable testing and unstable.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoSupport git+ssh:// and ssh+git:// URL
Linus Torvalds [Sat, 15 Oct 2005 00:14:56 +0000 (17:14 -0700)]
Support git+ssh:// and ssh+git:// URL

It seemed to be such a stupid syntax. It's both what "ssh://" means,
and it's what not specifying a protocol at _all_ means.

But hey, since we already have two ways of saying "use ssh with
pack-files", here's two more.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd new programs and stamp file to .gitignore.
Tom Prince [Sat, 15 Oct 2005 00:13:49 +0000 (17:13 -0700)]
Add new programs and stamp file to .gitignore.

Signed-off-by: Tom Prince <tom.prince@ualberta.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoformat-patch: take sequence of ranges.
Junio C Hamano [Fri, 14 Oct 2005 06:18:46 +0000 (23:18 -0700)]
format-patch: take sequence of ranges.

This enhances set of revs you can give format-patch.

Originally, format-patch took either one rev, or two revs:

    format-patch rev1
    format-patch rev1 rev2

The first format was a short-hand for "format-patch rev1 HEAD"
(i.e. rev2==HEAD).  What this meant was to find commits that are
in branch rev2 that has not been merged to branch rev1.

The above notation is still supported, but now it takes sequence
of "from1..to1 from2..to2 ...".  In short, the second format has
become a short-hand for "format-patch rev1..rev2".  Commits in
to1 but not in from1, to2 but not in from2, ... are formatted as
emailable patches.

With this, cherry-picking from other branch can be written as:

    git-format-patch -k --stdout master..branch1 master..branch2 |
    git-am -k -3

which is generally faster than traditional cherry-pick (which
always did 3-way merge) if patches apply cleanly, and still
falls back on 3-way merge if some of them do not.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd "-l" flag for repacking only local packs
Linus Torvalds [Thu, 13 Oct 2005 22:38:29 +0000 (15:38 -0700)]
Add "-l" flag for repacking only local packs

This uses the new "--local" flag to git-pack-objects.  It currently only
makes a difference together with "-a", since a normal incremental repack
won't pack any packed objects at all (whether local or remote).

Eventually, it might end up skipping any objects that aren't local to
the current object directory, but for now it only knows to skip packed
objects.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd support for "local" packing
Linus Torvalds [Thu, 13 Oct 2005 22:38:28 +0000 (15:38 -0700)]
Add support for "local" packing

This adds the "--local" flag to git-pack-objects, which acts like
"--incremental", except that instead of ignoring all packed objects, it
only ignores objects that are packed and in an alternate object tree.

As a result, it effectively only does a local re-pack: any remote-packed
objects will stay in the alternate object directories.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoKeep track of whether a pack is local or not
Linus Torvalds [Thu, 13 Oct 2005 22:38:28 +0000 (15:38 -0700)]
Keep track of whether a pack is local or not

If we want to re-pack just local packfiles, we need to know whether a
particular object is local or not.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agotutorial: update the initial commit example.
Junio C Hamano [Thu, 13 Oct 2005 18:57:05 +0000 (11:57 -0700)]
tutorial: update the initial commit example.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-am: do not fail if 3-way fallback succeeds.
Junio C Hamano [Thu, 13 Oct 2005 18:46:43 +0000 (11:46 -0700)]
git-am: do not fail if 3-way fallback succeeds.

The current one incorrectly stops there without committing.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdapt tutorial to cygwin and add test case
Johannes Schindelin [Thu, 13 Oct 2005 18:36:37 +0000 (11:36 -0700)]
Adapt tutorial to cygwin and add test case

Lacking reliable symlinks, the instructions in the tutorial did not work
in a cygwin setup. Also, a few outputs were not correct.

This patch fixes these, and adds a test case which follows the
instructions of the tutorial (except git-clone, -fetch and -push, which I
have not done yet).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd findtags - reworked
Martin Langhoff [Thu, 13 Oct 2005 17:47:42 +0000 (10:47 -0700)]
Add findtags - reworked

A short perl script that will walk the tag refs, tag objects, and even commit
objects in its quest to figure out whether the given SHA1 (for a commit or
tree) was ever tagged.

This version is reworked incorporating sanity, feature and style fixes from
Junio.

Usage: git-findtags.perl [ -t ] <commit-or-tree-sha1>

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRevert "Also use 'track_object_refs = 0' in update-server-info."
Sergey Vlasov [Thu, 13 Oct 2005 17:01:57 +0000 (10:01 -0700)]
Revert "Also use 'track_object_refs = 0' in update-server-info."

This reverts d119e3de13ea1493107bd57381d0ce9c9dd90976 commit.

Object references are used in server-info.c:find_pack_info_one() to
find out which objects in the pack are heads, therefore tracking of
references cannot be disabled.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agorsh.c: typo fix
Ralf Baechle [Thu, 13 Oct 2005 17:01:38 +0000 (10:01 -0700)]
rsh.c: typo fix

Example in a comment used a wrong environment variable.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoclone-pack: new option --keep tells it not to explode the pack.
Junio C Hamano [Thu, 13 Oct 2005 01:12:27 +0000 (18:12 -0700)]
clone-pack: new option --keep tells it not to explode the pack.

With new option --keep, or a configuration item clone.keeppack (we
need a better name, or start allowing dash,"clone.keep-pack"), the packed
data downloaded while cloning is saved as a pack in .git/objects/pack/
locally, with index generated for it with git-index-pack.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoclone-pack: new option --keep tells it not to explode the pack.
Junio C Hamano [Thu, 13 Oct 2005 01:12:27 +0000 (18:12 -0700)]
clone-pack: new option --keep tells it not to explode the pack.

With new option --keep, or a configuration item clone.keeppack (we
need a better name, or start allowing dash,"clone.keep-pack"), the packed
data downloaded while cloning is saved as a pack in .git/objects/pack/
locally, with index generated for it with git-index-pack.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoFix packname hash generation.
Junio C Hamano [Wed, 12 Oct 2005 23:54:19 +0000 (16:54 -0700)]
Fix packname hash generation.

This changes the generation of hash packfiles have in their names, from
"hash of object names as fed to us" to "hash of object names in the
resulting pack, in the order they appear in the index file".  The new
"git-index-pack" command is taught to output the computed hash value
to its standard output.

With this, we can store downloaded pack in a temporary file without
knowing its final name, run git-index-pack to generate idx for it
while finding out its final name, and then rename the pack and idx to
their final names.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoAdd git-index-pack utility
Sergey Vlasov [Wed, 12 Oct 2005 19:01:31 +0000 (12:01 -0700)]
Add git-index-pack utility

git-index-pack builds a pack index file for an existing packed
archive.  With this utility a packed archive which was transferred
without the corresponding pack index can be added to objects/pack/
without repacking.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-am: interactive should fail gracefully.
Junio C Hamano [Thu, 13 Oct 2005 01:31:41 +0000 (18:31 -0700)]
git-am: interactive should fail gracefully.

When feeding patches from standard input, and --interactive is specified,
quit, so that the user can re-run the command, instead of infinitely
looping.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agogit-fetch --tags: deal with tags with spaces in them.
Junio C Hamano [Tue, 11 Oct 2005 06:22:02 +0000 (23:22 -0700)]
git-fetch --tags: deal with tags with spaces in them.

"git-fetch --tags" can get confused with tags with spaces in their names,
it used to use shell IFS to split the list of tags and also used curl
which insists the URL to be escaped.  Fix it so it can work with Martin's
moodle repository http://locke.catalyst.net.nz/git/moodle.git/.

We still reserve characters like leading plus-sign '+' and colon
':' anywhere to represent refspec src-dst pair, and obviously we
cannot use LF (that terminates Pull: line in .git/remotes
files), but now you can have spaces with this patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoQuote reference names while fetching with curl.
Junio C Hamano [Tue, 11 Oct 2005 06:22:02 +0000 (23:22 -0700)]
Quote reference names while fetching with curl.

curl_escape ought to do this, but we should not let it quote
slashes (nobody said refs/tags cannot have subdirectories), so
we roll our own safer version.  With this, the last part of
git-clone from Martin's moodle repository that used to fail now
works, which reads:

 $ git-http-fetch -v -a -w 'tags/MOODLE_15_MERGED **INVALID**' \
   'tags/MOODLE_15_MERGED **INVALID**' \
   http://locke.catalyst.net.nz/git/moodle.git/

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoMerge branch 'fixes'
Junio C Hamano [Wed, 12 Oct 2005 05:04:11 +0000 (22:04 -0700)]
Merge branch 'fixes'

19 years ago[PATCH] cvsimport: don't pass --cvs-direct if user options contradict us
Martin Langhoff [Wed, 12 Oct 2005 04:57:04 +0000 (21:57 -0700)]
[PATCH] cvsimport: don't pass --cvs-direct if user options contradict us

Detecting if the user passed --no-cvs-direct and don't force the mode.
It allows us to support all the protocol that the standard cvs client
supports at the snail speed you should expect.

This only affects the rlog reading stage.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
19 years agoMake git config variable names case-insensitive
Linus Torvalds [Wed, 12 Oct 2005 01:47:34 +0000 (18:47 -0700)]
Make git config variable names case-insensitive

They always were meant to be case-insensitive, but I had missed one
"tolower()", making that not true.

The actual _values_ aren't case-insensitive, of course, although some uses
of them may be (ie boolean parsing uses "strcasecmp()" to match against
the strings "true" and "false").

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUse git config file for committer name and email info
Linus Torvalds [Wed, 12 Oct 2005 01:47:34 +0000 (18:47 -0700)]
Use git config file for committer name and email info

This starts using the "user.name" and "user.email" config variables if
they exist as the default name and email when committing.  This means
that you don't have to use the GIT_COMMITTER_EMAIL environment variable
to override your email - you can just edit the config file instead.

The patch looks bigger than it is because it makes the default name and
email information non-static and renames it appropriately.  And it moves
the common git environment variables into a new library file, so that
you can link against libgit.a and get the git environment without having
to link in zlib and libcrypt.

In short, most of it is renaming and moving, the real change core is
just a few new lines in "git_default_config()" that copies the user
config values to the new base.

It also changes "git-var -l" to list the config variables.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoExport template_dir in Makefile.
Tom Prince [Wed, 12 Oct 2005 01:47:33 +0000 (18:47 -0700)]
Export template_dir in Makefile.

If somebody set template_dir in config.mak. Then git-init-db would be
compiled with the correct location but the templates would be installed
in the default location. Fix it.

Signed-off-by: Tom Prince <tom.prince@ualberta.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUse core.filemode.
Junio C Hamano [Wed, 12 Oct 2005 01:45:33 +0000 (18:45 -0700)]
Use core.filemode.

With "[core] filemode = false", you can tell git to ignore
differences in the working tree file only in executable bit.

 * "git-update-index --refresh" does not say "needs update" if index
   entry and working tree file differs only in executable bit.

 * "git-update-index" on an existing path takes executable bit
   from the existing index entry, if the path and index entry are
   both regular files.

 * "git-diff-files" and "git-diff-index" without --cached flag
   pretend the path on the filesystem has the same executable
   bit as the existing index entry, if the path and index entry
   are both regular files.

If you are on a filesystem with unreliable mode bits, you may need to
force the executable bit after registering the path in the index.

 * "git-update-index --chmod=+x foo" flips the executable bit of the
   index file entry for path "foo" on.  Use "--chmod=-x" to flip it
   off.

Note that --chmod only works in index file and does not look at nor
update the working tree.

So if you are on a filesystem and do not have working executable bit,
you would do:

 1. set the appropriate .git/config option;

 2. "git-update-index --add new-file.c"

 3. "git-ls-files --stage new-file.c" to see if it has the desired
   mode bits.  If not, e.g. to drop executable bit picked up from the
   filesystem, say "git-update-index --chmod=-x new-file.c".

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoImprove config file escape sanity checking
Linus Torvalds [Tue, 11 Oct 2005 22:24:11 +0000 (15:24 -0700)]
Improve config file escape sanity checking

I had meant to disallow unknown escape characters in the config file
parser, but instead an unknown escaped character would silently pass
through as itself. That's correct for some cases (notably '\' itself), but
wasn't correct in general.

This fixes it, and makes the parser write a nice error message if the
config file contains bogus escaped characters.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoshow-branch: optionally use unique prefix as name.
Junio C Hamano [Tue, 11 Oct 2005 22:22:48 +0000 (15:22 -0700)]
show-branch: optionally use unique prefix as name.

git-show-branch acquires two new options. --sha1-name to name
commits using the unique prefix of their object names, and
--no-name to not to show names at all.

This was outlined in <7vk6gpyuyr.fsf@assigned-by-dhcp.cox.net>

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoSupport custom build options in config.mak
Johannes Schindelin [Tue, 11 Oct 2005 22:22:47 +0000 (15:22 -0700)]
Support custom build options in config.mak

With this patch, it is possible to store configuration options like
NO_CURL=YesPlease or NO_OPENSSL=YesPlease into a file named
config.mak, which will be included in the Makefile.

[jc: redone with suggestion from Daniel Barkalow to just use -include]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUse git-update-ref and git-symbolic-ref in tests
Johannes Schindelin [Tue, 11 Oct 2005 22:15:15 +0000 (15:15 -0700)]
Use git-update-ref and git-symbolic-ref in tests

This makes all tests pass on cygwin.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agosvn import: copy directories
Matthias Urlichs [Tue, 11 Oct 2005 17:42:27 +0000 (19:42 +0200)]
svn import: copy directories

Import SVN-copied and -referenced directories correctly.

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
19 years agosvn import: Add direct HTTP access
Matthias Urlichs [Tue, 11 Oct 2005 16:13:30 +0000 (18:13 +0200)]
svn import: Add direct HTTP access

Some SVN repositories that are accessible through HTTP don't like when I
retrieve files using SVN methods ("internal server error").

Therefore, I added an option to get the contents using (persistent) HTTP
directly. This also reduces round-trip time, from two or three requests
down to one.

Also corrected error handling a bit.

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
19 years agosvn import: remove some CVS cruft
Matthias Urlichs [Tue, 11 Oct 2005 15:02:45 +0000 (17:02 +0200)]
svn import: remove some CVS cruft

Some remains of CVS still lingered. Removed.

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
19 years agosvn import: make -s option actually optional
Matthias Urlichs [Tue, 11 Oct 2005 14:22:03 +0000 (16:22 +0200)]
svn import: make -s option actually optional

The -s option was accidentally not optional.

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
19 years agosvn import: typo fix
Matthias Urlichs [Tue, 11 Oct 2005 12:18:01 +0000 (14:18 +0200)]
svn import: typo fix

Fixed a minor typo

Signed-Off-By: Matthias Urlichs <smurf@smurf.noris.de>
19 years agoRemove unused 'got_alternates' variable.
Junio C Hamano [Tue, 11 Oct 2005 06:22:02 +0000 (23:22 -0700)]
Remove unused 'got_alternates' variable.

The function fetch_alternates() is called only once from the
main now.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoUse the same move_temp_to_file in git-http-fetch.
Junio C Hamano [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
Use the same move_temp_to_file in git-http-fetch.

The http commit walker cannot use the same temporary file
creation code because it needs to use predictable temporary
filename for partial fetch continuation purposes, but the code
to move the temporary file to the final location should be
usable from the ordinary object creation codepath.

Export move_temp_to_file from sha1_file.c and use it, while
losing the custom relink_or_rename function from http-fetch.c.

Also the temporary object file creation part needs to make sure
the leading path exists, in preparation of the really lazy
fan-out directory creation.

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years agoRestore functionality to allow proxies to cache objects
Nick Hengeveld [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
Restore functionality to allow proxies to cache objects

The parallel request changes didn't properly implement the previous patch to
allow caching of retrieved objects by proxy servers.  Restore the previous
functionality such that by default requests include the "Pragma: no-cache"
header, and this header is removed on requests for pack indexes, packs, and
objects.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago[PATCH] Don't fetch objects that exist in the local repository
Nick Hengeveld [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
[PATCH] Don't fetch objects that exist in the local repository

Be sure not to fetch objects that already exist in the local repository.
The main process loop no longer performs this check, http-fetch now checks
prior to starting a new request queue entry and when fetch_object() is called,
and local-fetch now checks when fetch_object() is called.

As discussed in this thread: http://marc.theaimsgroup.com/?t=112854890500001

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
19 years agoSet the parallel HTTP request limit via an environment variable
Nick Hengeveld [Tue, 11 Oct 2005 06:22:01 +0000 (23:22 -0700)]
Set the parallel HTTP request limit via an environment variable

Use an environment variable rather than a command-line argument to set the
parallel HTTP request limit.  This allows the setting to work whether
git-http-fetch is run directly or via git-fetch.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>