Linus Torvalds [Fri, 15 Jul 2005 21:57:09 +0000 (14:57 -0700)]
Fix up "make doc"
Fix 'git-var.txt' and use "-b xhtml11" instead of "-b css-embedded" to
make asciidoc 7.0.1 happy.
Junio C Hamano [Fri, 15 Jul 2005 18:40:56 +0000 (11:40 -0700)]
[PATCH] Documentation: pull, push, packing repository and working with others.
Describe where you can pull from with a bit more detail.
Clarify description of pushing.
Add a section on packing repositories.
Add a section on recommended workflow for the project lead,
subsystem maintainers and individual developers.
Move "Tag" section around to make the flow of example simpler to
follow.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Fri, 15 Jul 2005 07:59:34 +0000 (00:59 -0700)]
[PATCH] Documentation: update tutorial to talk about push.
Talk about publishing to a public repository. Also fixes a
couple of typos.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric W. Biederman [Fri, 15 Jul 2005 01:26:31 +0000 (19:26 -0600)]
[PATCH] Initial support for building a debian package (.deb)
It's not any harder to include debian package support than to include a
spec file so here is the setup to build the equivalent debian package.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric W. Biederman [Fri, 15 Jul 2005 01:24:23 +0000 (19:24 -0600)]
[PATCH] Update the spec file so it can build and install the documentation
If you don't want the documentation simply build with
make RPMBUILD="rpmbuild --without docs"
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric W. Biederman [Fri, 15 Jul 2005 01:21:57 +0000 (19:21 -0600)]
[PATCH] Add doc and install-doc targets to the Makefile
This makes it straightforward for people wanting to build and install
the git man pages and the rest of the documentation to do so.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric W. Biederman [Fri, 15 Jul 2005 01:20:50 +0000 (19:20 -0600)]
[PATCH] Use gzip -f when building the git-core tarball
This allows rebuilding the tarball when it is already present
without having to answer annoying questions from gzip
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric W. Biederman [Fri, 15 Jul 2005 01:20:25 +0000 (19:20 -0600)]
[PATCH] Add a RPMBUILD make variable
This allows RPMBUILD to be overridden for people with
old versions of rpm or people who want to pass rpmbuild extra options.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric W. Biederman [Fri, 15 Jul 2005 01:02:10 +0000 (19:02 -0600)]
[PATCH] Update tags to record who made them
And finally what all of this has been leading up to.
The 2 line code change to record who made a tag,
and the 8 line code change to check that we recorded
the tag.
Gosh the error checking is always so much bigger than the code :)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric W. Biederman [Fri, 15 Jul 2005 01:00:15 +0000 (19:00 -0600)]
[PATCH] Update git-tag-script to create the .git/refs/tags if it does not already exist
When testing tags I ran into an interesting problem.
git-tag-script dies if .git/refs/tags/ does not exist.
And that directory didn't get created when I build my repository,
so we need to create it if it doesn't exist.
Signed-of-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric W. Biederman [Fri, 15 Jul 2005 00:57:53 +0000 (18:57 -0600)]
[PATCH] Update the list of diagnostics for git-commit-tree
With the recent work on setup_ident() there are
a few more possible diagnostic messages form git-commit-tree
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric W. Biederman [Fri, 15 Jul 2005 00:55:09 +0000 (18:55 -0600)]
[PATCH] Add git-var a tool for reading interesting git variables.
Sharing code between shell scripts and C is a challenge. The program
git-var allows us to have a set of named values that a shell script can
interrogate and a normal C program can simply call the functions that
compute them. Allowing sharing when computing plain test values.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric W. Biederman [Fri, 15 Jul 2005 00:52:31 +0000 (18:52 -0600)]
[PATCH] ident.c: Disambiguate the error messages in setup_ident
If your user name is too long it is your sysadmin who
hates you not your parents!
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
[ Fixed grammar ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric W. Biederman [Fri, 15 Jul 2005 00:50:33 +0000 (18:50 -0600)]
[PATCH] Move git_author_info and git_commiter_info to ident.c
Moving these functions allows all of the logic for figuring out what
these values are to be shared between programs.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Fri, 15 Jul 2005 16:32:16 +0000 (09:32 -0700)]
Add "--inetd" flag to git-daemon
All credit go to Alexey Nezhdanov <snake@penza-gsm.ru>, I just ended up
re-implementing his idea.
Linus Torvalds [Fri, 15 Jul 2005 16:27:05 +0000 (09:27 -0700)]
git-daemon: re-organize code a bit for --inetd flag
Alexey Nezhdanov sent a patch that made git-daemon usable from inetd (ie
where inetd has already done the accept on the new connection, the fork,
and the setup of stdin/stdout). I wanted to organize the thing slightly
differently, though.
Linus Torvalds [Fri, 15 Jul 2005 00:59:17 +0000 (17:59 -0700)]
Split up "diff_format" into "format" and "line_termination".
This removes the separate "formats" for name and name-with-zero-
termination.
It also removes the difference between HUMAN and MACHINE formats, and
they both become DIFF_FORMAT_RAW, with the difference being just in the
line and inter-filename termination.
It also makes the code easier to understand.
Linus Torvalds [Thu, 14 Jul 2005 23:55:06 +0000 (16:55 -0700)]
Make "ce_match_path()" a generic helper function
... and make git-diff-files use it too. This all _should_ make the
diffcore-pathspec.c phase unnecessary, since the diff'ers now all do the
path matching early interally.
Linus Torvalds [Thu, 14 Jul 2005 23:43:01 +0000 (16:43 -0700)]
Make git-diff-cache skip any comparisons which don't match pathspec
This brings all the same pathspec optimizations that git-diff-tree does
to git-diff-cache.
Linus Torvalds [Thu, 14 Jul 2005 20:19:19 +0000 (13:19 -0700)]
Start using the partial tree reading in "git-diff-cache"
The reason I say "start using" is that we really should also limit the
index checking by name - now we limit the tree object accesses by name,
but we still check the whole index.
Still, this should help.
Linus Torvalds [Thu, 14 Jul 2005 18:39:27 +0000 (11:39 -0700)]
Fix up read_tree() pathspec matching to use "const char **"
The same way the other pathspecs work. Also fix missing success return
from the matching - not that anything actually uses this yet ;)
Linus Torvalds [Thu, 14 Jul 2005 18:26:31 +0000 (11:26 -0700)]
Start adding interfaces to read in partial trees
The same way "git-diff-tree" can limit its output to just a set of matches,
we can read in just a partial tree for comparison purposes.
Linus Torvalds [Thu, 14 Jul 2005 16:58:45 +0000 (09:58 -0700)]
Fix replacing of a directory with a file/symlink in git-checkout-cache
The symlink case had never worked, and the file case was broken by the
O_EXCL change because the error return changed from EISDIR to EEXIST.
Fix both problems by just moving the test for an existing directory to a
more logical place.
Linus Torvalds [Thu, 14 Jul 2005 16:29:35 +0000 (09:29 -0700)]
Make "git diff" use git-sh-setup-script too..
Give a sane error rather than just silently claiming no diffs when
you're not at the top-level directory.
Linus Torvalds [Thu, 14 Jul 2005 15:57:14 +0000 (08:57 -0700)]
Make "git prune" use the "--full" flag to git-fsck-cache
It's too dangerous not to. We need to follow alternate object
directories etc, or we might say something is unreachable just because
we didn't look it up completely.
Junio C Hamano [Thu, 14 Jul 2005 07:10:48 +0000 (00:10 -0700)]
[PATCH] Documentation: push-pull commands into a separate category.
This splits push-pull related commands into a separate
category. I think a bigger overhaul of the main index is
needed, but have not got around to it. Help is welcome.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Thu, 14 Jul 2005 07:10:05 +0000 (00:10 -0700)]
[PATCH] Documentation: send/receive.
This adds documentation for 'smarter push' family of commands.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Thu, 14 Jul 2005 07:08:37 +0000 (00:08 -0700)]
[PATCH] Documentation: clone/fetch/upload.
This adds documentation for 'smarter pull' family of commands.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Thu, 14 Jul 2005 07:08:05 +0000 (00:08 -0700)]
[PATCH] Documentation: packed GIT support commands.
This adds documentation for creating packed archives, inspecting,
validating them, and unpacking them.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Thu, 14 Jul 2005 03:55:56 +0000 (20:55 -0700)]
Get rid of nasty utf-8 characters in printout
Oh, well.. FC4 has UTF-8 as the default environment, and I applaud
that, but then it sometimes results in these characters that aren't
actually visible as a problem.
Junio C Hamano [Thu, 14 Jul 2005 03:28:55 +0000 (20:28 -0700)]
[PATCH] apply: match documentation, usage string and code.
The more recent --apply option was not described.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Thu, 14 Jul 2005 03:27:41 +0000 (20:27 -0700)]
[PATCH] Remove leftover comment from documentation.
The comment was left over from the days when we had a single
huge core-git.txt document. No more.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Thu, 14 Jul 2005 03:26:54 +0000 (20:26 -0700)]
[PATCH] clone-pack: Typofix in the error message.
Cleans a small cut-and-paste mistake.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Thu, 14 Jul 2005 03:25:54 +0000 (20:25 -0700)]
[PATCH] clone-pack and clone-script: documentation and add a missing parameter.
While adding the documentation for these two commands, I noticed
that the name of the program on the other end (git-upload-pack)
is already almost configurable but git-clone-pack lacked command
line parameter parsing to actually use anything but default, so
I introduced --exec= like other remote commands while I was at it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Thu, 14 Jul 2005 03:25:07 +0000 (20:25 -0700)]
[PATCH] checkout-cache: add usage string.
This adds the usage string to checkout-cache and you can say
"--help" to get it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Thu, 14 Jul 2005 03:23:40 +0000 (20:23 -0700)]
[PATCH] cat-file: be consistent in usage string and documentation.
Now that we have something called tag object, and a notion of
"tags" stored in .git/refs/tags/ directory, the word "tagname"
has become misleading in the usage string. The documentation
already calls that <type>.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Thu, 14 Jul 2005 03:21:54 +0000 (20:21 -0700)]
[PATCH] Document two pack push-pull protocols.
This documents the two pack push-pull protocols used by the
smart upload-fetch/clone and send/receive commands.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Thu, 14 Jul 2005 03:05:17 +0000 (20:05 -0700)]
Fix the "close before dup" bug in clone-pack too
Same issue as git-fetch-pack.
Linus Torvalds [Thu, 14 Jul 2005 02:45:26 +0000 (19:45 -0700)]
Add a "git-daemon" that listens on a TCP port
.. and does a "git-upload-pack" on demand.
Linus Torvalds [Thu, 14 Jul 2005 02:40:06 +0000 (19:40 -0700)]
git-fetch-pack: close output fd after dup'ing the input
With the socket case, the input and output fd's might end up being the same,
so we want to dup the other before we close either of them.
Linus Torvalds [Thu, 14 Jul 2005 01:46:20 +0000 (18:46 -0700)]
Add first cut at "git protocol" connect logic.
Useful for pulling stuff off a dedicated server. Instead of connecting
with ssh or just starting a local pipeline, we connect over TCP to the
other side and try to see if there's a git server listening.
Of course, since I haven't written the git server yet, that will never
happen. But the server really just needs to listen on a port, and
execute a "git-upload-pack" when somebody connects.
(It should read one packet-line, which should be of the format
"git-upload-pack directoryname\n"
and eventually we migth have other commands the server might accept).
Linus Torvalds [Thu, 14 Jul 2005 00:27:48 +0000 (17:27 -0700)]
Make "git-checkout" create files with O_EXCL
We should always have unlinked any old ones before, but this just makes
sure that we never over-write any old file.
A quick "grep" now shows that all the core tools that open files for
writing use O_EXCL, ie we never overwrite an existing file in place.
Linus Torvalds [Thu, 14 Jul 2005 00:25:53 +0000 (17:25 -0700)]
git-apply: be a lot more careful when writing files
We write them under another name and rename them to their destination,
so that if something bad happens in the middle, we won't have caused any
bigger harm.
Also, this makes the writing be NFS "intr" safe, and as a side effects
makes sure that if the target is hardlinked (or symlinked) we will have
broken the link.
Junio C Hamano [Wed, 13 Jul 2005 19:52:35 +0000 (12:52 -0700)]
[PATCH] Clean up diff option descriptions.
I got tired of maintaining almost duplicated descriptions in
diff-* brothers, both in usage string and documentation.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Wed, 13 Jul 2005 19:45:51 +0000 (12:45 -0700)]
[PATCH] git-diff-*: --name-only and --name-only-z.
Porcelain layers often want to find only names of changed files,
and even with diff-raw output format they end up having to pick
out only the filename. Support --name-only (and --name-only-z
for xargs -0 and cpio -0 users that want to treat filenames with
embedded newlines sanely) flag to help them.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Wed, 13 Jul 2005 19:45:06 +0000 (12:45 -0700)]
[PATCH] diff-stages: support "-u" as a synonym for "-p".
Just to be consistent, support "-u" as a synonym for "-p" like
everybody else does.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Sven Verdoolaege [Tue, 12 Jul 2005 21:35:32 +0000 (23:35 +0200)]
[PATCH] git-cvsimport-script: parse multidigit revisions.
Previously, git-cvsimport-script would fail
on revisions with more than one digit.
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Tony Luck [Tue, 12 Jul 2005 18:54:21 +0000 (11:54 -0700)]
[PATCH] git: fix trivial warning from show_rename_copy()
apply.c: In function `show_rename_copy':
apply.c:1147: warning: field precision is not type int (arg 3)
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Tue, 12 Jul 2005 18:49:27 +0000 (11:49 -0700)]
Abstract out the "name <email> date" handling of commit-tree.c
We'll want to use it for the tagging too.
Linus Torvalds [Tue, 12 Jul 2005 17:33:06 +0000 (10:33 -0700)]
parse_date(): allow const date string
This is part of breaking up the tag ID patch by Eric Biederman.
Linus Torvalds [Tue, 12 Jul 2005 17:12:52 +0000 (10:12 -0700)]
"make clean" should clean up after a rpm build
There's a few generated files that we left behind.
Linus Torvalds [Tue, 12 Jul 2005 17:07:18 +0000 (10:07 -0700)]
Rename the RPM from "git" to "git-core"
That way we avoid any confusion with "GNU Interactive Tools", and it's
more descriptive anyway (the rpm documentation talks about how git is
split into a "core" part and an "SCM" part, this makes it clear that
this is the core one).
Linus Torvalds [Tue, 12 Jul 2005 04:30:23 +0000 (21:30 -0700)]
Add "git branch" script
You can use it as
git branch <branchname> [start-point]
and it creates a new branch of name <branchname>. If a starting point
is specified, that will be where the branch is created, otherwise it
will be created at the current HEAD.
The sequence
git branch xyz abc
git checkout xyz
can also be written as
git checkout -b xyz abc
as per the previous commit.
Linus Torvalds [Tue, 12 Jul 2005 03:44:20 +0000 (20:44 -0700)]
Make "git checkout" create new branches on demand
In particular, if we check out something that isn't an old branch, it
now requires a new branch-name to check the thing out into.
So, for example:
git checkout -b my-branch v2.6.12
will create the new branch "my-branch", and start it at v2.6.12, while
git checkout master
will just switch back to the master branch.
Of course, if you want to create a new branch "my-branch" and _not_
check it out, you could have done so with just
git-rev-parse v2.6.12^0 > .git/refs/heads/my-branch
which I think I will codify as "git branch".
Linus Torvalds [Tue, 12 Jul 2005 01:32:30 +0000 (18:32 -0700)]
Make "git checkout" verify that the argument refers to a commit
We still need to create a new branch if it didn't refer to an existing
branch, otherwise our HEAD will continue to point to something totally
different than what we just checked out.
I'll need to think about it. Maybe only do it with "-f" and force it to
the "master" branch?
Linus Torvalds [Tue, 12 Jul 2005 01:27:25 +0000 (18:27 -0700)]
git-rev-parse: Allow a "zeroth" parent of a commit - the commit itself.
This sounds nonsensical, but it's useful to make sure that the result is
a commit.
For example, "git-rev-parse v2.6.12" will return the _tag_ object for
v2.6.12, but "git-rev-parse v2.6.12^0" will return the _commit_ object
associated with that tag (and v2.6.12^1 will return the first parent).
Also, since the "parent" code will actually parse the commit, this,
together with the "--verify" flag, will verify not only that the result
is a single SHA1, but will also have verified that it's a proper commit
that we can see.
Linus Torvalds [Tue, 12 Jul 2005 01:03:34 +0000 (18:03 -0700)]
git-send-pack: Fix duplicate refname match
Cut-and-paste dup noticed by Junio. It's not even harmless, since a
match also causes that match to be invalidated, so this made it
impossible to update an existing branch by name.
I'd only tested the case of "ref doesn't exist at all on the other end",
which worked fine.
Chris Wright [Mon, 11 Jul 2005 21:03:09 +0000 (14:03 -0700)]
[PATCH] Bootstrap "make dist"
Use git-tar-tree directly from git source during make dist. This
handles bootstrap issue with git not being installed.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Mon, 11 Jul 2005 20:30:54 +0000 (13:30 -0700)]
[PATCH] git-clone-script local optimization tweaks
- When local optimization is used, the variable repo has
already been passed through get_repo_base so there is no need
to check for .git subdirectory in there.
- Use cpio -l instead of "cp -l".
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Sven Verdoolaege [Mon, 11 Jul 2005 14:57:49 +0000 (16:57 +0200)]
[PATCH] git-cvsimport-script: add "import only" option
git-cvsimport-script: add "import only" option which tells the script
not to perform a checkout after importing.
This ensures that the working directory and cache remain untouched and
will not create them if they do not exist.
Acked-by: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Bryan Larsen [Mon, 11 Jul 2005 03:53:44 +0000 (20:53 -0700)]
[PATCH] add --missing-ok option to write-tree
This option allows a write-tree even if the referenced objects are not
in the database.
Signed-off-by: Bryan Larsen <bryan.larsen@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Mon, 11 Jul 2005 07:00:55 +0000 (00:00 -0700)]
[PATCH] Check packs and then files.
This reverses the order of object lookup, to check pack index first and
then go to the filesystem to find .git/objects/??/ hierarchy.
When most of the objects are packed, this saves quite many stat() calls
and negative dcache entries; while the price this approach has to pay is
negligible, even when most of the objects are outside pack, because
checking pack index file is quite cheap.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Mon, 11 Jul 2005 06:55:56 +0000 (23:55 -0700)]
[PATCH] Dereference tag repeatedly until we get a non-tag.
When we allow a tag object in place of a commit object, we only
dereferenced the given tag once, which causes a tag that points at a tag
that points at a commit to be rejected. Instead, dereference tag
repeatedly until we get a non-tag.
This patch makes change to two functions:
- commit.c::lookup_commit_reference() is used by merge-base,
rev-tree and rev-parse to convert user supplied SHA1 to that of
a commit.
- rev-list uses its own get_commit_reference() to do the same.
Dereferencing tags this way helps both of these uses.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Sun, 10 Jul 2005 22:40:43 +0000 (15:40 -0700)]
[PATCH] alternate object store and fsck
The location alt_odb[j].name[0..] is filled with ??/?{38} to form a sha1
filename to try, but I was too lazy to allocate a copy, so while
fsck_object_dir() is running for the directory, the filenames ??/?{38}
are filled after NUL (usually and always the location should have '/'),
making them "not found".
This should fix it.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Sun, 10 Jul 2005 23:14:22 +0000 (16:14 -0700)]
Fix up progress report for off-by-one error
We used to print the index of the object we unpacked, not how many we
had unpacked. Which caused slightly confusing progress reports like
100% (2/3) done
rather than the more obvious "3/3" for 100% ;)
Linus Torvalds [Sun, 10 Jul 2005 23:10:21 +0000 (16:10 -0700)]
Make "git log" exit properly if not in a git archive
Instead of getting an incomprehensible error message from git-rev-list.
Linus Torvalds [Sun, 10 Jul 2005 22:43:54 +0000 (15:43 -0700)]
Avoid signedness warnings in sha1_file.c
Very irritating. But "snprintf()" wants "char *", and zlib wants
"unsigned char *".
Daniel Barkalow [Sun, 10 Jul 2005 22:27:02 +0000 (18:27 -0400)]
[PATCH] Remove map_sha1_file
Remove map_sha1_file(), now unused.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Daniel Barkalow [Sun, 10 Jul 2005 22:25:38 +0000 (18:25 -0400)]
[PATCH] write_sha1_to_fd()
Add write_sha1_to_fd(), which writes an object to a file descriptor. This
includes support for unpacking it and recompressing it.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Sun, 10 Jul 2005 22:09:46 +0000 (15:09 -0700)]
git-rev-list: allow missing objects when the parent is marked UNINTERESTING
We still want the "top-most" uninteresting object to exist, so that we
know that we have reached it.
Linus Torvalds [Sat, 9 Jul 2005 17:52:35 +0000 (10:52 -0700)]
Add "-q" flag to "git commit"
Maybe you don't want the progress report.
Linus Torvalds [Sat, 9 Jul 2005 17:43:02 +0000 (10:43 -0700)]
git-unpack-objects: show progress report by default
This ends up being very calming for big "git clone"s, since otherwise
you just get very frustrated with a long silence, wondering whether it's
working at all.
Use "-q" to quiet it down.
Now if we could just do the same for the initial "figure out what to
pack" phase, which can also be quite slow if the other end is busy (or
not packed and not in cache)...
Junio C Hamano [Sat, 9 Jul 2005 02:27:15 +0000 (19:27 -0700)]
[PATCH] format-patch: fix skipping of blank-lines
If it is fed a commit with more than one leading blank lines,
the sed scripts git-format-patch-script used looped forever.
Using git-stripspace upfront makes the sed script somewhat
simpler to work around this problem.
Also use git-rev-parse so that we can say
$ git-format-patch-script HEAD^^^^
to prepare the latest four patches for e-mail submission.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Sat, 9 Jul 2005 01:26:19 +0000 (18:26 -0700)]
Update the tutorial a bit
Add notes on branches, merging, tagging, and update some of the usage to
the friendlier "git cmd" syntax.
It's still ridiculously lacking, but perhaps it's a _bit_ more useful.
Linus Torvalds [Sat, 9 Jul 2005 01:23:06 +0000 (18:23 -0700)]
Make "git tag" more user-friendly
Instead of having to cut-and-paste the result, write it to the tag
directory directly. Also, start an editor for the tag message, rather
than just reading it from stdin.
Linus Torvalds [Sat, 9 Jul 2005 00:38:44 +0000 (17:38 -0700)]
Make "git resolve" take the merge message in $3
It used to do "Merge $3" as the message, but that ends up being
inconvenient, and much more easily done inside git-pull-script instead.
This makes the third argument to "git resolve" much easier to explain.
Bryan Larsen [Fri, 8 Jul 2005 23:52:28 +0000 (16:52 -0700)]
[PATCH] Use SHA1 for git-update-cache --refresh
Change git-update-cache --refresh behaviour to use sha1's rather than
comparing byte by byte.
[JC demangled whitespace from the posted patch himself because he
liked it so much. Also adjusted to the index_fd() interface
slightly done differently from the original one.]
Signed-off-by: Bryan Larsen <bryan.larsen@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Bryan Larsen [Fri, 8 Jul 2005 23:52:12 +0000 (16:52 -0700)]
[PATCH] Add --info-only option to git-update-cache.
Add --info-only option to git-update-cache.
[JC demangled whitespace from the posted patch himself because he
liked it so much. Also adjusted to the index_fd() interface
slightly done differently from the original one.]
Signed-off-by: Bryan Larsen <bryan.larsen@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Bryan Larsen [Fri, 8 Jul 2005 23:51:55 +0000 (16:51 -0700)]
[PATCH] Expose object ID computation functions.
This patch makes the first half of write_sha1_file() and
index_fd() externally visible, to allow callers to compute the
object ID without actually storing it in the object database.
[JC demangled the whitespaces himself because he liked the patch
so much, and reworked the interface to index_fd() slightly,
taking suggestion from Linus and of his own.]
Signed-off-by: Bryan Larsen <bryan.larsen@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Sat, 9 Jul 2005 00:07:12 +0000 (17:07 -0700)]
Teach "git clone" about rsync sources
That will be the normal way of cloning anonymously for a while, so let's
make sure it's easy to use.
Linus Torvalds [Fri, 8 Jul 2005 23:22:22 +0000 (16:22 -0700)]
Make "upload-pack" match git-fetch-pack usage
Do the default "try xyz.git xyz fails" thing for the directory we get
passed in.
Linus Torvalds [Fri, 8 Jul 2005 23:20:59 +0000 (16:20 -0700)]
Add "mkpath()" helper function
I'm bored with doing it by hand all the time.
Linus Torvalds [Fri, 8 Jul 2005 22:59:29 +0000 (15:59 -0700)]
Mark git-relink-script and git-repack-script executable
Sure, "install" will default to installing it executable anyway, but
this is the right thing to do.
Linus Torvalds [Fri, 8 Jul 2005 22:46:33 +0000 (15:46 -0700)]
Make "git clone" a lot more user-friendly
This silently adds the ".git" directory component if needed, so you
don't need to state it explicitly for the source. Also, it turns the
source into an absolute pathname when local, so that you can use
relative pathnames without losing sight of the source when we cd into
the destination.
Linus Torvalds [Fri, 8 Jul 2005 21:24:25 +0000 (14:24 -0700)]
Add "git-push-script" to make a more regular interface
It only does local and ssh pushes, because it's really just a wrapper
for git-send-pack. We might make it do an rsync mirror or something, of
course.
Linus Torvalds [Fri, 8 Jul 2005 20:58:40 +0000 (13:58 -0700)]
Teach 'git-send-pack' to send new branches and tags.
The protocol always supported it, but send-pack didn't actually know how
to tell the other side about a new branch/tag.
NOTE! You'll have to name it explicitly on the command line: if you
don't name any branches, git-send-pack will default to the branches that
already exist.
Linus Torvalds [Fri, 8 Jul 2005 20:56:05 +0000 (13:56 -0700)]
Make "for_each_ref()" always use the "canonical" refname.
It always uses a git-relative pathname, ie "refs/heads/master" instead of
".git/refs/heads/master" or whatever your GIT_DIR might be.
This way when we send refs back-and-forth between repositories, there's
never any question about GIT_DIR on either side.
Junio C Hamano [Fri, 8 Jul 2005 07:02:52 +0000 (00:02 -0700)]
[PATCH] Use sq_quote() to properly quote the parameter to call shell.
This tries to be more lenient to the users and stricter to the
attackers by quoting the input properly for shell safety,
instead of forbidding certain characters from the input.
Things to note:
- We do not quote "prog" parameter (which comes from --exec).
The user should know what he is doing. --exec='echo foo'
will supply the first two parameters to the resulting
command, while --exec="'echo foo'" will give the first
parameter, a single string with a space inside.
- We do not care too much about leaking the sq_quote() output
just before running exec().
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Fri, 8 Jul 2005 06:58:32 +0000 (23:58 -0700)]
[PATCH] Make sq_expand() available as sq_quote().
A useful shell safety helper sq_expand() was hidden as a static
function in diff.c. Extract it out and make it available as
sq_quote().
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Fri, 8 Jul 2005 17:57:21 +0000 (10:57 -0700)]
Add "git-sh-setup-script" for common git shell script setup
It sets up the normal git environment variables and a few helper
functions (currently just "die()"), and returns ok if it all looks like
a git archive. So use it something like
. git-sh-setup-script || die "Not a git archive"
to make the rest of the git scripts more careful and readable.
Linus Torvalds [Fri, 8 Jul 2005 17:45:07 +0000 (10:45 -0700)]
git-diff-*: support "-u" as a synonym for "-p"
I'm probably not the only one whose fingers have gotten hard-wired to
use "-u" for "unified diff".
Junio C Hamano [Tue, 5 Jul 2005 20:19:05 +0000 (13:19 -0700)]
[PATCH] git-format-patch: Prepare patches for e-mail submission.
This is the script I use to prepare patches for e-mail submission.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Fri, 8 Jul 2005 00:59:23 +0000 (17:59 -0700)]
Mark more characters shell-safe.
I still worry about just quoting things when passing it off to "ssh" or
"sh -c", so I'm being anal. But _, ^ and , are certainly ok and while
both ~ and @ can have speacial meaning to shell/ssh they are benign.
Linus Torvalds [Fri, 8 Jul 2005 00:05:41 +0000 (17:05 -0700)]
git-fsck-cache: don't complain about lacking references when they are all in packs.
We used to not count them at all, which then made us complain that there
were no refs.
Linus Torvalds [Thu, 7 Jul 2005 22:56:49 +0000 (15:56 -0700)]
Merge /pub/scm/linux/kernel/git/chrisw/git
Junio C Hamano [Thu, 7 Jul 2005 22:12:20 +0000 (15:12 -0700)]
[PATCH] Typofix an error message in pack-check.c
The current error message does not make any sense.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Thu, 7 Jul 2005 18:39:10 +0000 (11:39 -0700)]
[PATCH] Prevent t6000 series from dropping useless sed.script in t/
The Makefile in the test suite directory considers any file
matching t[0-9][0-9][0-9][0-9]-*.sh as the top-level test script
to be executed. Unfortunately this was not documented, and the
common test library, t6000-lib.sh was named to match that
pattern. This caused t6000-lib.sh to be called from Makefile as
the top-level program, causing it to leave t/sed.script file
behind. Rename it to t6000lib.sh to prevent this, and document
the naming convention a bit more clearly.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Junio C Hamano [Wed, 6 Jul 2005 20:04:21 +0000 (13:04 -0700)]
[PATCH] Short-circuit git-clone-pack while cloning locally (take 2).
When we are cloning a repository on a local filesystem, it is
faster to just create a hard linkfarm of .git/object hierarchy
and copy the .git/refs files. By default, the script uses the
clone-pack method, but it can be told with the -l flag to do the
hard linkfarm (falling back on recursive file copy) to replicate
the .git/object hierarchy.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Chris Wright [Thu, 7 Jul 2005 20:09:50 +0000 (13:09 -0700)]
Infrastructure for git rpm builds. Adds GIT_VERSION to Makefile and new make
targets: git.spec, dist, and rpm. A simple 'make rpm' will build the rpm.
Also adds git.spec.in which is used to generate git.spec.
Signed-off-by: Chris Wright <chrisw@osdl.org>
Linus Torvalds [Thu, 7 Jul 2005 01:51:56 +0000 (18:51 -0700)]
git-clone-pack: fix sparse warning
Local function that wasn't marked static