1
0
mirror of https://github.com/git/git.git synced 2024-09-20 15:11:55 +02:00
Commit Graph

1691 Commits

Author SHA1 Message Date
Junio C Hamano
215a7ad1ef Big tool rename.
As promised, this is the "big tool rename" patch.  The primary differences
since 0.99.6 are:

  (1) git-*-script are no more.  The commands installed do not
      have any such suffix so users do not have to remember if
      something is implemented as a shell script or not.

  (2) Many command names with 'cache' in them are renamed with
      'index' if that is what they mean.

There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support  is expected to be removed in the near
future.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07 17:45:20 -07:00
Junio C Hamano
99977bd5fd GIT 0.99.6 2005-09-07 15:59:24 -07:00
David_Kågedal
7eb93c8965 [PATCH] Simplify git script
The code for listing the available subcommands was unnecessarily
complex.

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07 14:29:50 -07:00
Junio C Hamano
452ce291a9 Documentation updates.
More commands are documented now; thanks Raymond.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07 14:28:21 -07:00
A Large Angry SCM
fa6a1427c6 [PATCH] Docs for git-build-rev-cache.
Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07 14:24:41 -07:00
A Large Angry SCM
8bfcd30990 [PATCH] Docs for git-show-rev-cache.
Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07 14:24:41 -07:00
A Large Angry SCM
f67545eade [PATCH] Docs for git-reset-script.
Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07 14:24:41 -07:00
A Large Angry SCM
0270f7c500 [PATCH] Docs for git-checkout-script.
Signed-off-by: A Large Angry SCM <gitzilla@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07 14:24:39 -07:00
Junio C Hamano
5077fa9c1e Documentation updates.
parse-remote and rev-parse gets full documentation.  Add skeleton for
archimport.  Link them from the main git(7) page.  Also move git-daemon
and git-request-pull out of 'undocumented' section.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07 14:20:57 -07:00
Junio C Hamano
597c9cc540 Flatten tools/ directory to make build procedure simpler.
Also make platform specific part more isolated.  Currently we only
have Darwin defined, but I've taken a look at SunOS specific patch
(which I dropped on the floor for now) as well.  Doing things this way
would make adding it easier.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07 12:22:56 -07:00
Junio C Hamano
b893f09104 mailinfo: barf and exist upon nested multipart.
At least we can detect what we do not handle.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-06 16:46:34 -07:00
Junio C Hamano
78938b0d8a Merge branch 'master' of . 2005-09-06 13:51:33 -07:00
Rene Scharfe
760b663446 [PATCH] Update documentation for git-get-tar-commit-id
... and add a copyright notice.

[jc: also move its entry in git.txt from undocumented section.]

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-06 13:49:11 -07:00
H. Peter Anvin
0d821d4dab [PATCH] git-cvsimport-script: handling of tags
This patch changes git-cvsimport-script so that it creates tag objects
instead of refs to commits, and adds an option, -u, to convert
underscores in branch and tag names to dots (since CVS doesn't allow
dots in branches and tags.)

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-06 11:57:37 -07:00
Junio C Hamano
89580e3f6d Format fix for asciidoc documentation titles.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-06 09:06:32 -07:00
Junio C Hamano
712d865523 Merge branch 'master' of . 2005-09-05 01:42:11 -07:00
Junio C Hamano
0516de30e8 Retire git-clone-dumb-http.
... and fold it into git-clone-script.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-05 00:47:39 -07:00
Ryan Anderson
f9e320c319 [PATCH] Update documentation of --compose to git-send-email-script.txt
Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04 23:33:19 -07:00
Ryan Anderson
1f038a0c31 [PATCH] Make git-send-email-script ignore some unnecessary options when operating in batch mode.
Add a "--compose" option that uses $EDITOR to edit an "introductory" email to the patch series.

Signed-off-by: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04 23:33:17 -07:00
Junio C Hamano
8de8a292eb Install archimport-script.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04 23:32:56 -07:00
Junio C Hamano
f5f2c52bb0 Merge branch 'master' of . 2005-09-04 15:47:28 -07:00
Junio C Hamano
52be5fcd29 Add copy/rename check for git-apply.
The new test pattern is taken from HPA's klibc and klibc-kbuild trees,
which has many interesting renames (the commits
001eef5a19219e5b0601068a3d13874b88c0653e and
0037d1bc0deaf7daec3778496656cb04b4e4b9d0).  The test pattern exposes
problems in the apply.c changes currently in the proposed updates
branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04 15:44:55 -07:00
Junio C Hamano
c743e6e3c0 Add a link from update-server-info documentation to repository layout.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04 11:25:56 -07:00
Fredrik Kuivinen
433ef8a2fb [PATCH] Make git-apply understand incomplete lines in non-C locales
The message "\ No newline at end of file" used by diff(1) to mark
an incomplete line is locale dependent. We can't assume more than
that it begins with "\ ".

For example, given two files, "foo" and "bar", with appropriate
contents, 'diff -u foo bar' will produce the following output on
my system:

    --- foo 2005-09-04 18:59:38.000000000 +0200
    +++ bar 2005-09-04 18:59:16.000000000 +0200
    @@ -1 +1 @@
    -foobar
    +foo
    \ Ingen nyrad vid filslut

[jc: the check for the marker still uses the line length being no less
than 12 bytes for a sanity check, but I think it is safe to assume
that in other locales. I haven't checked the .po files from diff, tho'.]

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04 11:00:28 -07:00
Junio C Hamano
07a95d0ed3 git-applymbox: fix '-c'.
Earlier round b50abe8843 broke it
by carelessly rewriting the main loop.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04 10:37:07 -07:00
Martin Langhoff
52586ecb16 [PATCH] archimport: avoid committing on an Arch tag
Arch tags are full commits (without any changed files) as well. Trust Arch
to have put an unchanged tree in place (which seems to do reliably), and
just add a tag & new branch. Speeds up Arch imports significantly, and leaves
history in a much saner state.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04 10:28:43 -07:00
Martin Langhoff
3292ae4794 [PATCH] archimport autodetects import status, supports incremental imports
If there is no GIT directory, archimport will assume it is an initial import.

It now also supports incremental imports,  skipping "seen" commits. You can
now run it repeatedly to pull new commits from the Arch repository.

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04 10:28:43 -07:00
Sergey Vlasov
ce726ec8d8 [PATCH] NUL terminate the object data in patch_delta()
At least pretty_print_commit() expects to get NUL-terminated commit data to
work properly.  unpack_sha1_rest(), which reads objects from separate files,
and unpack_non_delta_entry(), which reads non-delta-compressed objects from
pack files, already add the NUL byte after the object data, but patch_delta()
did not do it, which caused problems with, e.g., git-rev-list --pretty when
there are delta-compressed commit objects.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04 10:28:43 -07:00
Peter Hagervall
2ab141a26f [PATCH] Possible cleanups for local-pull.c
Hi. This patch contains the following possible cleanups:

 * Make some needlessly global functions in local-pull.c static
 * Change 'char *' to 'const char *' where appropriate

Signed-off-by: Peter Hagervall <hager@cs.umu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04 10:28:38 -07:00
Paolo 'Blaisorblade' Giarrusso
baeda3a749 [PATCH] Doc: replace read-cache with git-read-tree.
Replace references to "read-cache" with references to git-read-tree in the
documentation. I chose that because reference say "see read-cache about
stages", and stages are explained in git-read-tree.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-04 10:18:45 -07:00
Junio C Hamano
6d35cc7690 Document hooks.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-02 22:38:30 -07:00
Junio C Hamano
8afaf4cbef Merge branch 'master' of . 2005-09-02 15:32:55 -07:00
Junio C Hamano
953e5842f8 Mention post-update when we first talk about publishing a repository.
There is more detailed instruction for `project lead` later in
the tutorial to talk about the same, but at this point in the
flow of tutorial, the first time reader has no way of knowing it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-02 11:46:43 -07:00
Junio C Hamano
86b13da46c scripts: equality test '==' is not portable.
On NetBSD 3 we trigger an error:

    [: ==: unexpected operator

Double-equal is accepted by bash built-in '[' and bash(1) suggests
using '=' for strict POSIX compliance (test(1) from coreutils does not
mention '==').  Eradicate their uses everywhere.

[jc: Somebody with a pseudonym kindly sent a message to let
 me know about the problem privately; I do not have access to a NetBSD
 box.]

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-02 10:53:15 -07:00
Junio C Hamano
79882c2883 git-checkout-script: Remove unnecessary variable.
There was unused variable $i that counted the number of arguments
being processed.  Remove it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-02 10:39:57 -07:00
Junio C Hamano
06ec2b4bb4 Fix automerge message.
The rewrite done while adding the shorthand support made the remote
refname recorded in the commit message too long for human consumption,
while losing information by using the shorthand not the real URL to
name the remote repository there.  They were both bad changes done
without enough thinking.

Pointed out by Linus.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-02 02:34:13 -07:00
Amos Waterland
89bc8c785e [PATCH] Explain what went wrong on update-cache of new file
If somebody tries to run `git update-cache foo', where foo is a new
file, git dies with a rather cryptic error message:

 fatal: Unable to add foo to database

This trivial patch makes git explain what probably went wrong.  It is
not a perfect diagnosis of all error paths, but for 90% of the cases it
should provide the user with the clue they need.

[jc: I ended up wording slightly differently, and fixed another
 confusing error message I noticed while reviewing the code.]

Signed-off-by: Amos Waterland <apw@rossby.metr.ou.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-01 21:45:00 -07:00
Junio C Hamano
a1d4aa7424 Add repository-layout document.
... and link to it from both the main index and the tutorial.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-01 16:56:13 -07:00
Junio C Hamano
80b52b0f9d Merge refs/heads/master from . 2005-09-01 01:02:39 -07:00
Junio C Hamano
2d56993347 Use 'git status' now it can handle initial commit.
Update 'git commit' to use the updated `git status`.  Also earlier
the `-s` flag was ignored for the initial commit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-31 17:15:25 -07:00
Junio C Hamano
7e011c40bc Fix git-status when HEAD is invalid.
It tried to do git-diff-cache against HEAD, of course.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-31 17:13:48 -07:00
Junio C Hamano
6e7722e6f8 Fix git-log-script when HEAD is invalid.
It used 'die' without including git-sh-setup-script; since everything
it uses are subdirectory-aware, instead of including the script to
force it to be run from the top, use echo & exit.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-31 17:11:39 -07:00
Junio C Hamano
1eb446fa9f Add Pine 4.63 help from Daniel.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-31 11:48:41 -07:00
Junio C Hamano
466fede1bd Merge refs/heads/master from . 2005-08-30 23:11:12 -07:00
Junio C Hamano
914328ac02 Update tutorial.
Finally I bit the bullet and did a full sweep of this document.
The changes are mostly clarifications, adjusting old terminology
to the glossary compatible one, and asciidoc formatting.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-30 23:08:06 -07:00
Junio C Hamano
076b2324cd show-branch: make it work in a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-30 19:19:02 -07:00
Martin Langhoff
d3968363b4 [PATCH] Initial import of git-archimport-script
Imports a project history from one or more Arch repositories, following
the branching and tagging across repositories. Note you should import
separate projects to separate GIT repositories.

Supported
 - Imports, tags and simple commits.
 - File renames
 - Arch tags
 - Binary files
 - Large trees
 - Multiple repositories
 - Branches

TODO:
 - Allow re-running the import on an already-imported project
 - Follow merges using Arch data
 - Audit shell escaping of filenames
 - Better support for file metadata
 - Better/safer creation of temp directories

Unsupported:
 - Arch 'configuration'

[jc: my arch/tla is very rusty and after Tom announced he is stepping
 down as the maintainer I have very little motivation to relearn it,
 so I would appreciate if people discuss any bugs or enhancements
 directly with Martin.  Of course I can help with the git end of the
 issues.]

Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-30 15:30:30 -07:00
Junio C Hamano
fc1a4207b0 Merge refs/heads/master from . 2005-08-30 14:33:27 -07:00
Junio C Hamano
5da22bc14b cat-file: make it work in a subdirectory.
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from 73244994ee4abd6e436e8a1d597dd917271d77a9 commit)
2005-08-30 13:56:21 -07:00
Junio C Hamano
8db9307c9c Documentaion updates.
Mostly making the formatted html prettier.

Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from 7adf1f15ebe074d4767df941817a6cf86d8e2533 commit)
2005-08-30 13:55:34 -07:00