|
|
|
|
#ifndef BUILTIN_H
|
|
|
|
|
#define BUILTIN_H
|
|
|
|
|
|
|
|
|
|
#include "git-compat-util.h"
|
|
|
|
|
#include "strbuf.h"
|
|
|
|
|
#include "cache.h"
|
|
|
|
|
#include "commit.h"
|
|
|
|
|
#include "notes.h"
|
|
|
|
|
|
|
|
|
|
#define DEFAULT_MERGE_LOG_LEN 20
|
|
|
|
|
|
|
|
|
|
extern const char git_usage_string[];
|
|
|
|
|
extern const char git_more_info_string[];
|
|
|
|
|
|
|
|
|
|
extern void prune_packed_objects(int);
|
|
|
|
|
|
|
|
|
|
struct fmt_merge_msg_opts {
|
|
|
|
|
unsigned add_title:1;
|
|
|
|
|
int shortlog_len;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
|
|
|
|
|
struct fmt_merge_msg_opts *);
|
|
|
|
|
extern void commit_notes(struct notes_tree *t, const char *msg);
|
|
|
|
|
|
|
|
|
|
struct notes_rewrite_cfg {
|
|
|
|
|
struct notes_tree **trees;
|
|
|
|
|
const char *cmd;
|
|
|
|
|
int enabled;
|
|
|
|
|
combine_notes_fn combine;
|
|
|
|
|
struct string_list *refs;
|
|
|
|
|
int refs_from_env;
|
|
|
|
|
int mode_from_env;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
combine_notes_fn parse_combine_notes_fn(const char *v);
|
|
|
|
|
struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
|
|
|
|
|
int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
|
|
|
|
|
const unsigned char *from_obj, const unsigned char *to_obj);
|
|
|
|
|
void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c);
|
|
|
|
|
|
|
|
|
|
extern int check_pager_config(const char *cmd);
|
fix pager.diff with diff --no-index
git-diff does not rely on the git wrapper to setup its
pager; instead, it sets it up on its own after seeing
whether --quiet or --exit-code has been specified. After
diff_no_index was split off from cmd_diff, commit b3fde6c
(git diff --no-index: default to page like other diff
frontends, 2008-05-26) duplicated the one-liner from
cmd_diff to turn on the pager.
Later, commit 8f0359f (Allow pager of diff command be
enabled/disabled, 2008-07-21) taught the the version in
cmd_diff to respect the pager.diff config, but the version
in diff_no_index was left behind. This meant that
git -c pager.diff=0 diff a b
would not use a pager, but
git -c pager.diff=0 diff --no-index a b
would. Let's fix it by factoring out a common function.
While we're there, let's update the antiquated comment,
which claims that the pager interferes with propagating the
exit code; this has not been the case since ea27a18 (spawn
pager via run_command interface, 2008-07-22).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years ago
|
|
|
struct diff_options;
|
|
|
|
|
extern void setup_diff_pager(struct diff_options *);
|
|
|
|
|
|
diff: do not use null sha1 as a sentinel value
The diff code represents paths using the diff_filespec
struct. This struct has a sha1 to represent the sha1 of the
content at that path, as well as a sha1_valid member which
indicates whether its sha1 field is actually useful. If
sha1_valid is not true, then the filespec represents a
working tree file (e.g., for the no-index case, or for when
the index is not up-to-date).
The diff_filespec is only used internally, though. At the
interfaces to the diff subsystem, callers feed the sha1
directly, and we create a diff_filespec from it. It's at
that point that we look at the sha1 and decide whether it is
valid or not; callers may pass the null sha1 as a sentinel
value to indicate that it is not.
We should not typically see the null sha1 coming from any
other source (e.g., in the index itself, or from a tree).
However, a corrupt tree might have a null sha1, which would
cause "diff --patch" to accidentally diff the working tree
version of a file instead of treating it as a blob.
This patch extends the edges of the diff interface to accept
a "sha1_valid" flag whenever we accept a sha1, and to use
that flag when creating a filespec. In some cases, this
means passing the flag through several layers, making the
code change larger than would be desirable.
One alternative would be to simply die() upon seeing
corrupted trees with null sha1s. However, this fix more
directly addresses the problem (while bogus sha1s in a tree
are probably a bad thing, it is really the sentinel
confusion sending us down the wrong code path that is what
makes it devastating). And it means that git is more capable
of examining and debugging these corrupted trees. For
example, you can still "diff --raw" such a tree to find out
when the bogus entry was introduced; you just cannot do a
"--patch" diff (just as you could not with any other
corrupted tree, as we do not have any content to diff).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
13 years ago
|
|
|
extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, int sha1_valid, char **buf, unsigned long *buf_size);
|
|
|
|
|
|
|
|
|
|
extern int cmd_add(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_annotate(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_apply(int argc, const char **argv, const char *prefix);
|
Add git-archive
git-archive is a command to make TAR and ZIP archives of a git tree.
It helps prevent a proliferation of git-{format}-tree commands.
Instead of directly calling git-{tar,zip}-tree command, it defines
a very simple API, that archiver should implement and register in
"git-archive.c". This API is made up by 2 functions whose prototype
is defined in "archive.h" file.
- The first one is used to parse 'extra' parameters which have
signification only for the specific archiver. That would allow
different archive backends to have different kind of options.
- The second one is used to ask to an archive backend to build
the archive given some already resolved parameters.
The main reason for making this API is to avoid using
git-{tar,zip}-tree commands, hence making them useless. Maybe it's
time for them to die ?
It also implements remote operations by defining a very simple
protocol: it first sends the name of the specific uploader followed
the repository name (git-upload-tar git://example.org/repo.git).
Then it sends options. It's done by sending a sequence of one
argument per packet, with prefix "argument ", followed by a flush.
The remote protocol is implemented in "git-archive.c" for client
side and is triggered by "--remote=<repo>" option. For example,
to fetch a TAR archive in a remote repo, you can issue:
$ git archive --format=tar --remote=git://xxx/yyy/zzz.git HEAD
We choose to not make a new command "git-fetch-archive" for example,
avoind one more GIT command which should be nice for users (less
commands to remember, keeps existing --remote option).
Signed-off-by: Franck Bui-Huu <vagabon.xyz@gmail.com>
Acked-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago
|
|
|
extern int cmd_archive(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_bisect__helper(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_blame(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_branch(int argc, const char **argv, const char *prefix);
|
Add git-bundle: move objects and references by archive
Some workflows require use of repositories on machines that cannot be
connected, preventing use of git-fetch / git-push to transport objects and
references between the repositories.
git-bundle provides an alternate transport mechanism, effectively allowing
git-fetch and git-pull to operate using sneakernet transport. `git-bundle
create` allows the user to create a bundle containing one or more branches
or tags, but with specified basis assumed to exist on the target
repository. At the receiving end, git-bundle acts like git-fetch-pack,
allowing the user to invoke git-fetch or git-pull using the bundle file as
the URL. git-fetch and git-ls-remote determine they have a bundle URL by
checking that the URL points to a file, but are otherwise unchanged in
operation with bundles.
The original patch was done by Mark Levedahl <mdl123@verizon.net>.
It was updated to make git-bundle a builtin, and get rid of the tar
format: now, the first line is supposed to say "# v2 git bundle", the next
lines either contain a prerequisite ("-" followed by the hash of the
needed commit), or a ref (the hash of a commit, followed by the name of
the ref), and finally the pack. As a result, the bundle argument can be
"-" now.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years ago
|
|
|
extern int cmd_bundle(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_cat_file(int argc, const char **argv, const char *prefix);
|
Build in checkout
The only differences in behavior should be:
- git checkout -m with non-trivial merging won't print out
merge-recursive messages (see the change in t7201-co.sh)
- git checkout -- paths... will give a sensible error message if
HEAD is invalid as a commit.
- some intermediate states which were written to disk in the shell
version (in particular, index states) are only kept in memory in
this version, and therefore these can no longer be revealed by
later write operations becoming impossible.
- when we change branches, we discard MERGE_MSG, SQUASH_MSG, and
rr-cache/MERGE_RR, like reset always has.
I'm not 100% sure I got the merge recursive setup exactly right; the
base for a non-trivial merge in the shell code doesn't seem
theoretically justified to me, but I tried to match it anyway, and the
tests all pass this way.
Other than these items, the results should be identical to the shell
version, so far as I can tell.
[jc: squashed lock-file fix from Dscho in]
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago
|
|
|
extern int cmd_checkout(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_checkout_index(int argc, const char **argv, const char *prefix);
|
Add basic infrastructure to assign attributes to paths
This adds the basic infrastructure to assign attributes to
paths, in a way similar to what the exclusion mechanism does
based on $GIT_DIR/info/exclude and .gitignore files.
An attribute is just a simple string that does not contain any
whitespace. They can be specified in $GIT_DIR/info/attributes
file, and .gitattributes file in each directory.
Each line in these files defines a pattern matching rule.
Similar to the exclusion mechanism, a later match overrides an
earlier match in the same file, and entries from .gitattributes
file in the same directory takes precedence over the ones from
parent directories. Lines in $GIT_DIR/info/attributes file are
used as the lowest precedence default rules.
A line is either a comment (an empty line, or a line that begins
with a '#'), or a rule, which is a whitespace separated list of
tokens. The first token on the line is a shell glob pattern.
The rest are names of attributes, each of which can optionally
be prefixed with '!'. Such a line means "if a path matches this
glob, this attribute is set (or unset -- if the attribute name
is prefixed with '!'). For glob matching, the same "if the
pattern does not have a slash in it, the basename of the path is
matched with fnmatch(3) against the pattern, otherwise, the path
is matched with the pattern with FNM_PATHNAME" rule as the
exclusion mechanism is used.
This does not define what an attribute means. Tying an
attribute to various effects it has on git operation for paths
that have it will be specified separately.
Signed-off-by: Junio C Hamano <junkio@cox.net>
18 years ago
|
|
|
extern int cmd_check_attr(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_check_ref_format(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_cherry(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_cherry_pick(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_clone(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_clean(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_column(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_commit(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_commit_tree(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_config(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_count_objects(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_credential(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_describe(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_diff_files(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_diff_index(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_diff(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_diff_tree(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_fast_export(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_fetch(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_fetch_pack(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_format_patch(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_fsck(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_gc(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_grep(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_hash_object(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_help(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_index_pack(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_init_db(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_log(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_log_reflog(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_ls_files(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_ls_tree(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_ls_remote(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_mailinfo(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_mailsplit(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_merge(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_merge_base(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_merge_index(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_merge_ours(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_merge_recursive(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_merge_tree(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_mktag(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_mktree(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_mv(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_notes(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_pack_redundant(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_patch_id(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_prune(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_push(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_receive_pack(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_reflog(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_remote(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_remote_ext(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_remote_fd(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_rerere(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_reset(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_rev_list(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_rev_parse(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_revert(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_rm(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_send_pack(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_shortlog(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_show(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_show_branch(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_status(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_stripspace(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_symbolic_ref(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_tag(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_tar_tree(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_unpack_file(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_unpack_objects(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_update_index(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_update_ref(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_update_server_info(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_upload_archive(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_var(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_verify_tag(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_version(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_whatchanged(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_write_tree(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_verify_pack(int argc, const char **argv, const char *prefix);
|
Add "git show-ref" builtin command
It's kind of like "git peek-remote", but works only locally (and thus
avoids the whole overhead of git_connect()) and has some extra
verification features.
For example, it allows you to filter the results, and to choose whether
you want the tag dereferencing or not. You can also use it to just test
whether a particular ref exists.
For example:
git show-ref master
will show all references called "master", whether tags or heads or
anything else, and regardless of how deep in the reference naming
hierarchy they are (so it would show "refs/heads/master" but also
"refs/remote/other-repo/master").
When using the "--verify" flag, the command requires an exact ref path:
git show-ref --verify refs/heads/master
will only match the exact branch called "master".
If nothing matches, show-ref will return an error code of 1, and in the
case of verification, it will show an error message.
For scripting, you can ask it to be quiet with the "--quiet" flag, which
allows you to do things like
git-show-ref --quiet --verify -- "refs/heads/$headname" ||
echo "$headname is not a valid branch"
to check whether a particular branch exists or not (notice how we don't
actually want to show any results, and we want to use the full refname for
it in order to not trigger the problem with ambiguous partial matches).
To show only tags, or only proper branch heads, use "--tags" and/or
"--heads" respectively (using both means that it shows tags _and_ heads,
but not other random references under the refs/ subdirectory).
To do automatic tag object dereferencing, use the "-d" or "--dereference"
flag, so you can do
git show-ref --tags --dereference
to get a listing of all tags together with what they dereference.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago
|
|
|
extern int cmd_show_ref(int argc, const char **argv, const char *prefix);
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago
|
|
|
extern int cmd_pack_refs(int argc, const char **argv, const char *prefix);
|
|
|
|
|
extern int cmd_replace(int argc, const char **argv, const char *prefix);
|
|
|
|
|
|
|
|
|
|
#endif
|
