Fix sparse warnings
Fix warnings from 'make check'.
- These files don't include 'builtin.h' causing sparse to complain that
cmd_* isn't declared:
builtin/clone.c:364, builtin/fetch-pack.c:797,
builtin/fmt-merge-msg.c:34, builtin/hash-object.c:78,
builtin/merge-index.c:69, builtin/merge-recursive.c:22
builtin/merge-tree.c:341, builtin/mktag.c:156, builtin/notes.c:426
builtin/notes.c:822, builtin/pack-redundant.c:596,
builtin/pack-refs.c:10, builtin/patch-id.c:60, builtin/patch-id.c:149,
builtin/remote.c:1512, builtin/remote-ext.c:240,
builtin/remote-fd.c:53, builtin/reset.c:236, builtin/send-pack.c:384,
builtin/unpack-file.c:25, builtin/var.c:75
- These files have symbols which should be marked static since they're
only file scope:
submodule.c:12, diff.c:631, replace_object.c:92, submodule.c:13,
submodule.c:14, trace.c:78, transport.c:195, transport-helper.c:79,
unpack-trees.c:19, url.c:3, url.c:18, url.c:104, url.c:117, url.c:123,
url.c:129, url.c:136, thread-utils.c:21, thread-utils.c:48
- These files redeclare symbols to be different types:
builtin/index-pack.c:210, parse-options.c:564, parse-options.c:571,
usage.c:49, usage.c:58, usage.c:63, usage.c:72
- These files use a literal integer 0 when they really should use a NULL
pointer:
daemon.c:663, fast-import.c:2942, imap-send.c:1072, notes-merge.c:362
While we're in the area, clean up some unused #includes in builtin files
(mostly exec_cmd.h).
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-03-22 07:51:05 +00:00
|
|
|
#include "builtin.h"
|
Honor core.precomposeUnicode in more places
On Mac's HFS where git sets core.precomposeUnicode to true automatically
by git init/clone, when a user creates a simple unicode refname (in NFC
format) such as españa:
$ git branch españa
different commands would display the branch name differently. For
example, git branch, git log --decorate, and git fast-export all used
65 73 70 61 c3 b1 61 (or "espa\xc3\xb1a")
(NFC form) while show-ref would use
65 73 70 61 6e cc 83 61 (or "espan\xcc\x83a")
(NFD form). A stress test for git filter-repo was tripped up by this
inconsistency, though digging in I found that the problems could
compound; for example, if the user ran
$ git pack-refs --all
and then tried to check out the branch, they would be met with:
$ git checkout españa
error: pathspec 'españa' did not match any file(s) known to git
$ git checkout españa --
fatal: invalid reference: españa
$ git branch
españa
* master
Note that the user could run the `git branch` command first and copy and
paste the `españa` portion of the output and still see the same two
errors. Also, if the user added --no-prune to the pack-refs command,
then they would see three branches: master, españa, and españa (those
last two are NFC vs. NFD forms, even if they render the same).
Further, if the user had the `españa` branch checked out before
running `git pack-refs --all`, the user would be greeted with (note
that I'm trimming trailing output with an ellipsis):
$ git rev-parse HEAD
fatal: ambiguous argument 'HEAD': unknown revision or path...
$ git status
On branch españa
No commits yet...
Or worse, if the user didn't check this stuff first, running `git
commit` will create a new commit with all changes of all of history
being squashed into it.
In addition to pack-refs, one could also get into this state with
upload-pack or anything that calls either pack-refs or upload-pack (e.g.
gc or clone).
Add code in a few places (pack-refs, show-ref, upload-pack) to check and
honor the setting of core.precomposeUnicode to avoid these bugs.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-25 14:58:54 +00:00
|
|
|
#include "config.h"
|
2023-03-21 06:25:54 +00:00
|
|
|
#include "gettext.h"
|
2007-10-15 21:06:02 +00:00
|
|
|
#include "parse-options.h"
|
2013-04-22 19:52:32 +00:00
|
|
|
#include "refs.h"
|
2018-04-12 00:21:09 +00:00
|
|
|
#include "repository.h"
|
2023-05-12 21:34:41 +00:00
|
|
|
#include "revision.h"
|
2006-09-21 07:06:06 +00:00
|
|
|
|
2007-10-15 21:06:02 +00:00
|
|
|
static char const * const pack_refs_usage[] = {
|
2023-05-12 21:34:42 +00:00
|
|
|
N_("git pack-refs [--all] [--no-prune] [--include <pattern>] [--exclude <pattern>]"),
|
2007-10-15 21:06:02 +00:00
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
|
2007-05-26 16:25:31 +00:00
|
|
|
int cmd_pack_refs(int argc, const char **argv, const char *prefix)
|
|
|
|
|
{
|
2007-11-07 10:20:30 +00:00
|
|
|
unsigned int flags = PACK_REFS_PRUNE;
|
2023-05-12 21:34:41 +00:00
|
|
|
static struct ref_exclusions excludes = REF_EXCLUSIONS_INIT;
|
2023-05-12 21:34:42 +00:00
|
|
|
static struct string_list included_refs = STRING_LIST_INIT_NODUP;
|
|
|
|
|
struct pack_refs_opts pack_refs_opts = { .exclusions = &excludes,
|
|
|
|
|
.includes = &included_refs,
|
|
|
|
|
.flags = flags };
|
2023-05-12 21:34:41 +00:00
|
|
|
static struct string_list option_excluded_refs = STRING_LIST_INIT_NODUP;
|
|
|
|
|
struct string_list_item *item;
|
|
|
|
|
|
2007-10-15 21:06:02 +00:00
|
|
|
struct option opts[] = {
|
2023-05-12 21:34:41 +00:00
|
|
|
OPT_BIT(0, "all", &pack_refs_opts.flags, N_("pack everything"), PACK_REFS_ALL),
|
|
|
|
|
OPT_BIT(0, "prune", &pack_refs_opts.flags, N_("prune loose refs (default)"), PACK_REFS_PRUNE),
|
2023-05-12 21:34:42 +00:00
|
|
|
OPT_STRING_LIST(0, "include", pack_refs_opts.includes, N_("pattern"),
|
|
|
|
|
N_("references to include")),
|
2023-05-12 21:34:41 +00:00
|
|
|
OPT_STRING_LIST(0, "exclude", &option_excluded_refs, N_("pattern"),
|
|
|
|
|
N_("references to exclude")),
|
2007-10-15 21:06:02 +00:00
|
|
|
OPT_END(),
|
|
|
|
|
};
|
Honor core.precomposeUnicode in more places
On Mac's HFS where git sets core.precomposeUnicode to true automatically
by git init/clone, when a user creates a simple unicode refname (in NFC
format) such as españa:
$ git branch españa
different commands would display the branch name differently. For
example, git branch, git log --decorate, and git fast-export all used
65 73 70 61 c3 b1 61 (or "espa\xc3\xb1a")
(NFC form) while show-ref would use
65 73 70 61 6e cc 83 61 (or "espan\xcc\x83a")
(NFD form). A stress test for git filter-repo was tripped up by this
inconsistency, though digging in I found that the problems could
compound; for example, if the user ran
$ git pack-refs --all
and then tried to check out the branch, they would be met with:
$ git checkout españa
error: pathspec 'españa' did not match any file(s) known to git
$ git checkout españa --
fatal: invalid reference: españa
$ git branch
españa
* master
Note that the user could run the `git branch` command first and copy and
paste the `españa` portion of the output and still see the same two
errors. Also, if the user added --no-prune to the pack-refs command,
then they would see three branches: master, españa, and españa (those
last two are NFC vs. NFD forms, even if they render the same).
Further, if the user had the `españa` branch checked out before
running `git pack-refs --all`, the user would be greeted with (note
that I'm trimming trailing output with an ellipsis):
$ git rev-parse HEAD
fatal: ambiguous argument 'HEAD': unknown revision or path...
$ git status
On branch españa
No commits yet...
Or worse, if the user didn't check this stuff first, running `git
commit` will create a new commit with all changes of all of history
being squashed into it.
In addition to pack-refs, one could also get into this state with
upload-pack or anything that calls either pack-refs or upload-pack (e.g.
gc or clone).
Add code in a few places (pack-refs, show-ref, upload-pack) to check and
honor the setting of core.precomposeUnicode to avoid these bugs.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-25 14:58:54 +00:00
|
|
|
git_config(git_default_config, NULL);
|
2009-05-23 18:53:12 +00:00
|
|
|
if (parse_options(argc, argv, prefix, opts, pack_refs_usage, 0))
|
2007-10-15 21:06:02 +00:00
|
|
|
usage_with_options(pack_refs_usage, opts);
|
2023-05-12 21:34:41 +00:00
|
|
|
|
|
|
|
|
for_each_string_list_item(item, &option_excluded_refs)
|
|
|
|
|
add_ref_exclusion(pack_refs_opts.exclusions, item->string);
|
|
|
|
|
|
2023-05-12 21:34:42 +00:00
|
|
|
if (pack_refs_opts.flags & PACK_REFS_ALL)
|
|
|
|
|
string_list_append(pack_refs_opts.includes, "*");
|
|
|
|
|
|
|
|
|
|
if (!pack_refs_opts.includes->nr)
|
|
|
|
|
string_list_append(pack_refs_opts.includes, "refs/tags/*");
|
|
|
|
|
|
2023-05-12 21:34:41 +00:00
|
|
|
return refs_pack_refs(get_main_ref_store(the_repository), &pack_refs_opts);
|
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>
2006-09-11 23:37:32 +00:00
|
|
|
}
|