diff options
370 files changed, 5792 insertions, 5749 deletions
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 9d5c27807a..003393ed16 100644 --- a/Documentation/CodingGuidelines +++ b/Documentation/CodingGuidelines @@ -442,8 +442,12 @@ For C programs: detail. - The first #include in C files, except in platform specific compat/ - implementations, must be either "git-compat-util.h", "cache.h" or - "builtin.h". You do not have to include more than one of these. + implementations and sha1dc/, must be either "git-compat-util.h" or + one of the approved headers that includes it first for you. (The + approved headers currently include "cache.h", "builtin.h", + "t/helper/test-tool.h", "xdiff/xinclude.h", or + "reftable/system.h"). You do not have to include more than one of + these. - A C file must directly include the header files that declare the functions and the types it uses, except for the functions and types diff --git a/Documentation/RelNotes/2.40.0.txt b/Documentation/RelNotes/2.40.0.txt index 094a2937cc..3ea445bf20 100644 --- a/Documentation/RelNotes/2.40.0.txt +++ b/Documentation/RelNotes/2.40.0.txt @@ -281,6 +281,15 @@ Fixes since v2.39 code to avoid sscanf() altogether to work it around. (merge 613bef56b8 jk/shorten-unambiguous-ref-wo-sscanf later to maint). + * Various fix-ups on HTTP tests. + (merge 8f2146dbf1 jk/http-test-fixes later to maint). + + * Fixes to code that parses the todo file used in "rebase -i". + (merge 666b6e1135 pw/rebase-i-parse-fix later to maint). + + * Test library clean-up. + (merge c600a91c94 ar/test-lib-remove-stale-comment later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 4eb1ccecd4 dh/mingw-ownership-check-typofix later to maint). (merge f95526419b ar/typofix-gitattributes-doc later to maint). diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt index 86f6308c4c..37e2831cd5 100644 --- a/Documentation/config/gpg.txt +++ b/Documentation/config/gpg.txt @@ -12,6 +12,9 @@ gpg.program:: gpg.format:: Specifies which key format to use when signing with `--gpg-sign`. Default is "openpgp". Other possible values are "x509", "ssh". ++ +See linkgit:gitformat-signature[5] for the signature format, which differs +based on the selected `gpg.format`. gpg.<format>.program:: Use this to customize the program used for the signing format you diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt index 29d184ab82..3394c03611 100644 --- a/Documentation/git-credential.txt +++ b/Documentation/git-credential.txt @@ -113,7 +113,13 @@ separated by an `=` (equals) sign, followed by a newline. The key may contain any bytes except `=`, newline, or NUL. The value may contain any bytes except newline or NUL. -In both cases, all bytes are treated as-is (i.e., there is no quoting, +Attributes with keys that end with C-style array brackets `[]` can have +multiple values. Each instance of a multi-valued attribute forms an +ordered list of values - the order of the repeated attributes defines +the order of the values. An empty multi-valued attribute (`key[]=\n`) +acts to clear any previous entries and reset the list. + +In all cases, all bytes are treated as-is (i.e., there is no quoting, and one cannot transmit a value with newline or NUL in it). The list of attributes is terminated by a blank line or end-of-file. @@ -166,6 +172,17 @@ empty string. Components which are missing from the URL (e.g., there is no username in the example above) will be left unset. +`wwwauth[]`:: + + When an HTTP response is received by Git that includes one or more + 'WWW-Authenticate' authentication headers, these will be passed by Git + to credential helpers. ++ +Each 'WWW-Authenticate' header value is passed as a multi-valued +attribute 'wwwauth[]', where the order of the attributes is the same as +they appear in the HTTP response. This attribute is 'one-way' from Git +to pass additional information to credential helpers. + Unrecognised attributes are silently discarded. GIT diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index bcd8069287..f26a7591e3 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -197,10 +197,11 @@ respectively, and they must begin with `refs/` when applied to `--glob` or `--all`. If a trailing '/{asterisk}' is intended, it must be given explicitly. ---exclude-hidden=[receive|uploadpack]:: - Do not include refs that would be hidden by `git-receive-pack` or - `git-upload-pack` by consulting the appropriate `receive.hideRefs` or - `uploadpack.hideRefs` configuration along with `transfer.hideRefs` (see +--exclude-hidden=[fetch|receive|uploadpack]:: + Do not include refs that would be hidden by `git-fetch`, + `git-receive-pack` or `git-upload-pack` by consulting the appropriate + `fetch.hideRefs`, `receive.hideRefs` or `uploadpack.hideRefs` + configuration along with `transfer.hideRefs` (see linkgit:git-config[1]). This option affects the next pseudo-ref option `--all` or `--glob` and is cleared after processing them. diff --git a/Documentation/gitformat-signature.txt b/Documentation/gitformat-signature.txt index d8e3eb1bac..d4d3a31f03 100644 --- a/Documentation/gitformat-signature.txt +++ b/Documentation/gitformat-signature.txt @@ -17,12 +17,24 @@ DESCRIPTION Git uses cryptographic signatures in various places, currently objects (tags, commits, mergetags) and transactions (pushes). In every case, the command which is about to create an object or transaction determines a payload from that, -calls gpg to obtain a detached signature for the payload (`gpg -bsa`) and -embeds the signature into the object or transaction. +calls an external program to obtain a detached signature for the payload +(`gpg -bsa` in the case of PGP signatures), and embeds the signature into the +object or transaction. -Signatures always begin with `-----BEGIN PGP SIGNATURE-----` -and end with `-----END PGP SIGNATURE-----`, unless gpg is told to -produce RFC1991 signatures which use `MESSAGE` instead of `SIGNATURE`. +Signatures begin with an "ASCII Armor" header line and end with a tail line, +which differ depending on signature type (as selected by `gpg.format`, see +linkgit:git-config[1]). These are, for `gpg.format` values: + +`gpg` (PGP):: + `-----BEGIN PGP SIGNATURE-----` and `-----END PGP SIGNATURE-----`. + Or, if gpg is told to produce RFC1991 signatures, + `-----BEGIN PGP MESSAGE-----` and `-----END PGP MESSAGE-----` + +`ssh` (SSH):: + `-----BEGIN SSH SIGNATURE-----` and `-----END SSH SIGNATURE-----` + +`x509` (X.509):: + `-----BEGIN SIGNED MESSAGE-----` and `-----END SIGNED MESSAGE-----` Signatures sometimes appear as a part of the normal payload (e.g. a signed tag has the signature block appended after the payload diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 0d90d5b154..90c73d6708 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -195,10 +195,11 @@ respectively, and they must begin with `refs/` when applied to `--glob` or `--all`. If a trailing '/{asterisk}' is intended, it must be given explicitly. ---exclude-hidden=[receive|uploadpack]:: - Do not include refs that would be hidden by `git-receive-pack` or - `git-upload-pack` by consulting the appropriate `receive.hideRefs` or - `uploadpack.hideRefs` configuration along with `transfer.hideRefs` (see +--exclude-hidden=[fetch|receive|uploadpack]:: + Do not include refs that would be hidden by `git-fetch`, + `git-receive-pack` or `git-upload-pack` by consulting the appropriate + `fetch.hideRefs`, `receive.hideRefs` or `uploadpack.hideRefs` + configuration along with `transfer.hideRefs` (see linkgit:git-config[1]). This option affects the next pseudo-ref option `--all` or `--glob` and is cleared after processing them. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index dd62a3ea59..a87f0adf80 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.40.0-rc0 +DEF_VER=v2.40.0 LF=' ' diff --git a/add-interactive.c b/add-interactive.c index 00a0f6f96f..ae25ec50bc 100644 --- a/add-interactive.c +++ b/add-interactive.c @@ -3,6 +3,7 @@ #include "color.h" #include "config.h" #include "diffcore.h" +#include "hex.h" #include "revision.h" #include "refs.h" #include "string-list.h" diff --git a/add-patch.c b/add-patch.c index a86a92e164..c6e451c136 100644 --- a/add-patch.c +++ b/add-patch.c @@ -1,5 +1,6 @@ #include "cache.h" #include "add-interactive.h" +#include "alloc.h" #include "strbuf.h" #include "run-command.h" #include "strvec.h" @@ -1,6 +1,8 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "advice.h" #include "config.h" #include "color.h" +#include "gettext.h" #include "help.h" #include "string-list.h" @@ -1,8 +1,6 @@ #ifndef ADVICE_H #define ADVICE_H -#include "git-compat-util.h" - struct string_list; /* @@ -1,6 +1,8 @@ -#include "cache.h" +#include "git-compat-util.h" #include "alias.h" +#include "alloc.h" #include "config.h" +#include "gettext.h" #include "string-list.h" struct config_alias_data { @@ -8,7 +8,7 @@ * up with maximal alignment because it doesn't know what the object alignment * for the new allocation is. */ -#include "cache.h" +#include "git-compat-util.h" #include "object.h" #include "blob.h" #include "tree.h" @@ -17,4 +17,79 @@ void *alloc_object_node(struct repository *r); struct alloc_state *allocate_alloc_state(void); void clear_alloc_state(struct alloc_state *s); +#define alloc_nr(x) (((x)+16)*3/2) + +/** + * Dynamically growing an array using realloc() is error prone and boring. + * + * Define your array with: + * + * - a pointer (`item`) that points at the array, initialized to `NULL` + * (although please name the variable based on its contents, not on its + * type); + * + * - an integer variable (`alloc`) that keeps track of how big the current + * allocation is, initialized to `0`; + * + * - another integer variable (`nr`) to keep track of how many elements the + * array currently has, initialized to `0`. + * + * Then before adding `n`th element to the item, call `ALLOC_GROW(item, n, + * alloc)`. This ensures that the array can hold at least `n` elements by + * calling `realloc(3)` and adjusting `alloc` variable. + * + * ------------ + * sometype *item; + * size_t nr; + * size_t alloc + * + * for (i = 0; i < nr; i++) + * if (we like item[i] already) + * return; + * + * // we did not like any existing one, so add one + * ALLOC_GROW(item, nr + 1, alloc); + * item[nr++] = value you like; + * ------------ + * + * You are responsible for updating the `nr` variable. + * + * If you need to specify the number of elements to allocate explicitly + * then use the macro `REALLOC_ARRAY(item, alloc)` instead of `ALLOC_GROW`. + * + * Consider using ALLOC_GROW_BY instead of ALLOC_GROW as it has some + * added niceties. + * + * DO NOT USE any expression with side-effect for 'x', 'nr', or 'alloc'. + */ +#define ALLOC_GROW(x, nr, alloc) \ + do { \ + if ((nr) > alloc) { \ + if (alloc_nr(alloc) < (nr)) \ + alloc = (nr); \ + else \ + alloc = alloc_nr(alloc); \ + REALLOC_ARRAY(x, alloc); \ + } \ + } while (0) + +/* + * Similar to ALLOC_GROW but handles updating of the nr value and + * zeroing the bytes of the newly-grown array elements. + * + * DO NOT USE any expression with side-effect for any of the + * arguments. + */ +#define ALLOC_GROW_BY(x, nr, increase, alloc) \ + do { \ + if (increase) { \ + size_t new_nr = nr + (increase); \ + if (new_nr < nr) \ + BUG("negative growth in ALLOC_GROW_BY"); \ + ALLOC_GROW(x, new_nr, alloc); \ + memset((x) + nr, 0, sizeof(*(x)) * (increase)); \ + nr = new_nr; \ + } \ + } while (0) + #endif @@ -8,12 +8,14 @@ */ #include "cache.h" +#include "alloc.h" #include "config.h" #include "object-store.h" #include "blob.h" #include "delta.h" #include "diff.h" #include "dir.h" +#include "hex.h" #include "xdiff-interface.h" #include "ll-merge.h" #include "lockfile.h" diff --git a/archive-tar.c b/archive-tar.c index f8fad2946e..ee27fa0b39 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -1,8 +1,10 @@ /* * Copyright (c) 2005, 2006 Rene Scharfe */ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" +#include "hex.h" #include "tar.h" #include "archive.h" #include "object-store.h" diff --git a/archive-zip.c b/archive-zip.c index 0456f1ebf1..c5d1f72eb8 100644 --- a/archive-zip.c +++ b/archive-zip.c @@ -4,6 +4,7 @@ #include "cache.h" #include "config.h" #include "archive.h" +#include "hex.h" #include "streaming.h" #include "utf8.h" #include "object-store.h" @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" +#include "hex.h" #include "refs.h" #include "object-store.h" #include "commit.h" @@ -7,6 +7,7 @@ */ #include "cache.h" +#include "alloc.h" #include "config.h" #include "exec-cmd.h" #include "attr.h" @@ -2,6 +2,7 @@ #include "config.h" #include "commit.h" #include "diff.h" +#include "hex.h" #include "revision.h" #include "refs.h" #include "list-objects.h" @@ -5,6 +5,7 @@ #include "mergesort.h" #include "diff.h" #include "diffcore.h" +#include "hex.h" #include "tag.h" #include "blame.h" #include "alloc.h" @@ -1,7 +1,6 @@ #ifndef BLAME_H #define BLAME_H -#include "cache.h" #include "commit.h" #include "xdiff-interface.h" #include "revision.h" @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "blob.h" #include "repository.h" #include "alloc.h" @@ -2,6 +2,7 @@ #include "cache.h" #include "config.h" #include "branch.h" +#include "hex.h" #include "refs.h" #include "refspec.h" #include "remote.h" diff --git a/builtin/am.c b/builtin/am.c index e0848ddadf..5e6b237c42 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -8,6 +8,7 @@ #include "config.h" #include "builtin.h" #include "exec-cmd.h" +#include "hex.h" #include "parse-options.h" #include "dir.h" #include "run-command.h" @@ -2300,17 +2301,6 @@ static int parse_opt_show_current_patch(const struct option *opt, const char *ar return 0; } -static int git_am_config(const char *k, const char *v, void *cb UNUSED) -{ - int status; - - status = git_gpg_config(k, v, NULL); - if (status) - return status; - - return git_default_config(k, v, NULL); -} - int cmd_am(int argc, const char **argv, const char *prefix) { struct am_state state; @@ -2434,7 +2424,7 @@ int cmd_am(int argc, const char **argv, const char *prefix) if (argc == 2 && !strcmp(argv[1], "-h")) usage_with_options(usage, options); - git_config(git_am_config, NULL); + git_config(git_default_config, NULL); am_state_init(&state); diff --git a/builtin/bisect.c b/builtin/bisect.c index 7301740267..e8ee4a4dc8 100644 --- a/builtin/bisect.c +++ b/builtin/bisect.c @@ -1,5 +1,6 @@ #include "builtin.h" #include "cache.h" +#include "hex.h" #include "parse-options.h" #include "bisect.h" #include "refs.h" diff --git a/builtin/blame.c b/builtin/blame.c index 71f925e456..fdd9f0c0fc 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -5,10 +5,12 @@ * See COPYING for licensing conditions */ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" #include "color.h" #include "builtin.h" +#include "hex.h" #include "repository.h" #include "commit.h" #include "diff.h" diff --git a/builtin/cat-file.c b/builtin/cat-file.c index cc17635e76..9e7e03ade4 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -5,9 +5,12 @@ */ #define USE_THE_INDEX_VARIABLE #include "cache.h" +#include "alloc.h" #include "config.h" #include "builtin.h" #include "diff.h" +#include "hex.h" +#include "ident.h" #include "parse-options.h" #include "userdiff.h" #include "streaming.h" @@ -15,6 +18,7 @@ #include "oid-array.h" #include "packfile.h" #include "object-store.h" +#include "replace-object.h" #include "promisor-remote.h" #include "mailmap.h" @@ -559,7 +563,7 @@ static int batch_object_cb(const struct object_id *oid, void *vdata) } static int collect_loose_object(const struct object_id *oid, - const char *path, + const char *path UNUSED, void *data) { oid_array_append(data, oid); @@ -567,8 +571,8 @@ static int collect_loose_object(const struct object_id *oid, } static int collect_packed_object(const struct object_id *oid, - struct packed_git *pack, - uint32_t pos, + struct packed_git *pack UNUSED, + uint32_t pos UNUSED, void *data) { oid_array_append(data, oid); @@ -591,7 +595,7 @@ static int batch_unordered_object(const struct object_id *oid, } static int batch_unordered_loose(const struct object_id *oid, - const char *path, + const char *path UNUSED, void *data) { return batch_unordered_object(oid, NULL, 0, data); diff --git a/builtin/check-mailmap.c b/builtin/check-mailmap.c index 7dc47e4793..96db3ddb4b 100644 --- a/builtin/check-mailmap.c +++ b/builtin/check-mailmap.c @@ -1,5 +1,6 @@ #include "builtin.h" #include "config.h" +#include "ident.h" #include "mailmap.h" #include "parse-options.h" #include "string-list.h" diff --git a/builtin/checkout--worker.c b/builtin/checkout--worker.c index ede7dc32a4..0a7d762573 100644 --- a/builtin/checkout--worker.c +++ b/builtin/checkout--worker.c @@ -1,4 +1,5 @@ #include "builtin.h" +#include "alloc.h" #include "config.h" #include "entry.h" #include "parallel-checkout.h" diff --git a/builtin/checkout.c b/builtin/checkout.c index a5155cf55c..21a4335abb 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -9,6 +9,7 @@ #include "config.h" #include "diff.h" #include "dir.h" +#include "hex.h" #include "hook.h" #include "ll-merge.h" #include "lockfile.h" diff --git a/builtin/clone.c b/builtin/clone.c index 65b5b7db6d..462c286274 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -11,6 +11,7 @@ #define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" +#include "hex.h" #include "lockfile.h" #include "parse-options.h" #include "fetch-pack.h" diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 93704f95a9..d3be7f3b31 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -1,12 +1,14 @@ #include "builtin.h" #include "config.h" #include "dir.h" +#include "hex.h" #include "lockfile.h" #include "parse-options.h" #include "repository.h" #include "commit-graph.h" #include "object-store.h" #include "progress.h" +#include "replace-object.h" #include "tag.h" #define BUILTIN_COMMIT_GRAPH_VERIFY_USAGE \ diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c index cc8d584be2..e805da5bb1 100644 --- a/builtin/commit-tree.c +++ b/builtin/commit-tree.c @@ -5,6 +5,7 @@ */ #include "cache.h" #include "config.h" +#include "hex.h" #include "object-store.h" #include "repository.h" #include "commit.h" @@ -37,14 +38,6 @@ static void new_parent(struct commit *parent, struct commit_list **parents_p) commit_list_insert(parent, parents_p); } -static int commit_tree_config(const char *var, const char *value, void *cb) -{ - int status = git_gpg_config(var, value, NULL); - if (status) - return status; - return git_default_config(var, value, cb); -} - static int parse_parent_arg_callback(const struct option *opt, const char *arg, int unset) { @@ -121,7 +114,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix) OPT_END() }; - git_config(commit_tree_config, NULL); + git_config(git_default_config, NULL); if (argc < 2 || !strcmp(argv[1], "-h")) usage_with_options(commit_tree_usage, options); diff --git a/builtin/commit.c b/builtin/commit.c index 985a0445b7..f71ed41bf5 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1600,7 +1600,6 @@ int cmd_status(int argc, const char **argv, const char *prefix) static int git_commit_config(const char *k, const char *v, void *cb) { struct wt_status *s = cb; - int status; if (!strcmp(k, "commit.template")) return git_config_pathname(&template_file, k, v); @@ -1620,9 +1619,6 @@ static int git_commit_config(const char *k, const char *v, void *cb) return 0; } - status = git_gpg_config(k, v, NULL); - if (status) - return status; return git_status_config(k, v, s); } diff --git a/builtin/config.c b/builtin/config.c index 060cf9f3e0..49d832d409 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -1,7 +1,8 @@ #include "builtin.h" -#include "cache.h" +#include "alloc.h" #include "config.h" #include "color.h" +#include "ident.h" #include "parse-options.h" #include "urlmatch.h" #include "quote.h" diff --git a/builtin/count-objects.c b/builtin/count-objects.c index 07b9419596..bb21bc43e4 100644 --- a/builtin/count-objects.c +++ b/builtin/count-objects.c @@ -57,7 +57,8 @@ static void loose_garbage(const char *path) report_garbage(PACKDIR_FILE_GARBAGE, path); } -static int count_loose(const struct object_id *oid, const char *path, void *data) +static int count_loose(const struct object_id *oid, const char *path, + void *data UNUSED) { struct stat st; @@ -72,7 +73,8 @@ static int count_loose(const struct object_id *oid, const char *path, void *data return 0; } -static int count_cruft(const char *basename, const char *path, void *data) +static int count_cruft(const char *basename UNUSED, const char *path, + void *data UNUSED) { loose_garbage(path); return 0; diff --git a/builtin/credential-cache--daemon.c b/builtin/credential-cache--daemon.c index 338058be7f..6e509d02c3 100644 --- a/builtin/credential-cache--daemon.c +++ b/builtin/credential-cache--daemon.c @@ -1,4 +1,5 @@ #include "builtin.h" +#include "alloc.h" #include "parse-options.h" #ifndef NO_UNIX_SOCKETS diff --git a/builtin/describe.c b/builtin/describe.c index eea1e330c0..5b5930f5c8 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -1,6 +1,7 @@ #define USE_THE_INDEX_VARIABLE #include "cache.h" #include "config.h" +#include "hex.h" #include "lockfile.h" #include "commit.h" #include "tag.h" diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index 25b853b85c..a393efa4f0 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -3,6 +3,7 @@ #include "config.h" #include "diff.h" #include "commit.h" +#include "hex.h" #include "log-tree.h" #include "builtin.h" #include "submodule.h" diff --git a/builtin/difftool.c b/builtin/difftool.c index dbbfb19f19..01681d0fb8 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -17,6 +17,7 @@ #include "builtin.h" #include "run-command.h" #include "exec-cmd.h" +#include "hex.h" #include "parse-options.h" #include "strvec.h" #include "strbuf.h" diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 39a890fc00..78493c6d2b 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -6,6 +6,7 @@ #include "builtin.h" #include "cache.h" #include "config.h" +#include "hex.h" #include "refs.h" #include "refspec.h" #include "object-store.h" diff --git a/builtin/fast-import.c b/builtin/fast-import.c index 7134683ab9..f7548ff4a3 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -1,5 +1,6 @@ #include "builtin.h" #include "cache.h" +#include "hex.h" #include "repository.h" #include "config.h" #include "lockfile.h" @@ -436,7 +437,7 @@ static void set_checkpoint_signal(void) #else -static void checkpoint_signal(int signo) +static void checkpoint_signal(int signo UNUSED) { checkpoint_requested = 1; } diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index afe679368d..702c9a3397 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@ -1,4 +1,6 @@ #include "builtin.h" +#include "alloc.h" +#include "hex.h" #include "pkt-line.h" #include "fetch-pack.h" #include "remote.h" diff --git a/builtin/fetch.c b/builtin/fetch.c index a09606b472..bf627e0412 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -3,6 +3,7 @@ */ #include "cache.h" #include "config.h" +#include "hex.h" #include "repository.h" #include "refs.h" #include "refspec.h" @@ -1132,6 +1133,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, if (!connectivity_checked) { struct check_connected_options opt = CHECK_CONNECTED_INIT; + opt.exclude_hidden_refs_section = "fetch"; rm = ref_map; if (check_connected(iterate_ref_map, &rm, &opt)) { rc = error(_("%s did not send all necessary objects\n"), url); @@ -1325,6 +1327,7 @@ static int check_exist_and_connected(struct ref *ref_map) } opt.quiet = 1; + opt.exclude_hidden_refs_section = "fetch"; return check_connected(iterate_ref_map, &rm, &opt); } @@ -1890,7 +1893,8 @@ struct parallel_fetch_state { int next, result; }; -static int fetch_next_remote(struct child_process *cp, struct strbuf *out, +static int fetch_next_remote(struct child_process *cp, + struct strbuf *out UNUSED, void *cb, void **task_cb) { struct parallel_fetch_state *state = cb; @@ -1912,7 +1916,8 @@ static int fetch_next_remote(struct child_process *cp, struct strbuf *out, return 1; } -static int fetch_failed_to_start(struct strbuf *out, void *cb, void *task_cb) +static int fetch_failed_to_start(struct strbuf *out UNUSED, + void *cb, void *task_cb) { struct parallel_fetch_state *state = cb; const char *remote = task_cb; diff --git a/builtin/fsck.c b/builtin/fsck.c index d207bd909b..c4a633c032 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -1,6 +1,6 @@ -#define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "cache.h" +#include "hex.h" #include "repository.h" #include "config.h" #include "commit.h" @@ -19,6 +19,7 @@ #include "decorate.h" #include "packfile.h" #include "object-store.h" +#include "replace-object.h" #include "resolve-undo.h" #include "run-command.h" #include "worktree.h" @@ -233,17 +234,17 @@ static void mark_unreachable_referents(const struct object_id *oid) } static int mark_loose_unreachable_referents(const struct object_id *oid, - const char *path, - void *data) + const char *path UNUSED, + void *data UNUSED) { mark_unreachable_referents(oid); return 0; } static int mark_packed_unreachable_referents(const struct object_id *oid, - struct packed_git *pack, - uint32_t pos, - void *data) + struct packed_git *pack UNUSED, + uint32_t pos UNUSED, + void *data UNUSED) { mark_unreachable_referents(oid); return 0; @@ -661,14 +662,15 @@ static int fsck_loose(const struct object_id *oid, const char *path, void *data) return 0; /* keep checking other objects, even if we saw an error */ } -static int fsck_cruft(const char *basename, const char *path, void *data) +static int fsck_cruft(const char *basename, const char *path, + void *data UNUSED) { if (!starts_with(basename, "tmp_obj_")) fprintf_ln(stderr, _("bad sha1 file: %s"), path); return 0; } -static int fsck_subdir(unsigned int nr, const char *path, void *data) +static int fsck_subdir(unsigned int nr, const char *path UNUSED, void *data) { struct for_each_loose_cb *cb_data = data; struct progress *progress = cb_data->progress; @@ -732,19 +734,19 @@ static int fsck_head_link(const char *head_ref_name, return 0; } -static int fsck_cache_tree(struct cache_tree *it) +static int fsck_cache_tree(struct cache_tree *it, const char *index_path) { int i; int err = 0; if (verbose) - fprintf_ln(stderr, _("Checking cache tree")); + fprintf_ln(stderr, _("Checking cache tree of %s"), index_path); if (0 <= it->entry_count) { struct object *obj = parse_object(the_repository, &it->oid); if (!obj) { - error(_("%s: invalid sha1 pointer in cache-tree"), - oid_to_hex(&it->oid)); + error(_("%s: invalid sha1 pointer in cache-tree of %s"), + oid_to_hex(&it->oid), index_path); errors_found |= ERROR_REFS; return 1; } @@ -755,11 +757,12 @@ static int fsck_cache_tree(struct cache_tree *it) err |= objerror(obj, _("non-tree in cache-tree")); } for (i = 0; i < it->subtree_nr; i++) - err |= fsck_cache_tree(it->down[i]->cache_tree); + err |= fsck_cache_tree(it->down[i]->cache_tree, index_path); return err; } -static int fsck_resolve_undo(struct index_state *istate) +static int fsck_resolve_undo(struct index_state *istate, + const char *index_path) { struct string_list_item *item; struct string_list *resolve_undo = istate->resolve_undo; @@ -782,8 +785,9 @@ static int fsck_resolve_undo(struct index_state *istate) obj = parse_object(the_repository, &ru->oid[i]); if (!obj) { - error(_("%s: invalid sha1 pointer in resolve-undo"), - oid_to_hex(&ru->oid[i])); + error(_("%s: invalid sha1 pointer in resolve-undo of %s"), + oid_to_hex(&ru->oid[i]), + index_path); errors_found |= ERROR_REFS; continue; } @@ -796,6 +800,38 @@ static int fsck_resolve_undo(struct index_state *istate) return 0; } +static void fsck_index(struct index_state *istate, const char *index_path, + int is_main_index) +{ + unsigned int i; + + /* TODO: audit for interaction with sparse-index. */ + ensure_full_index(istate); + for (i = 0; i < istate->cache_nr; i++) { + unsigned int mode; + struct blob *blob; + struct object *obj; + + mode = istate->cache[i]->ce_mode; + if (S_ISGITLINK(mode)) + continue; + blob = lookup_blob(the_repository, + &istate->cache[i]->oid); + if (!blob) + continue; + obj = &blob->object; + obj->flags |= USED; + fsck_put_object_name(&fsck_walk_options, &obj->oid, + "%s:%s", + is_main_index ? "" : index_path, + istate->cache[i]->name); + mark_object_reachable(obj); + } + if (istate->cache_tree) + fsck_cache_tree(istate->cache_tree, index_path); + fsck_resolve_undo(istate, index_path); +} + static void mark_object_for_connectivity(const struct object_id *oid) { struct object *obj = lookup_unknown_object(the_repository, oid); @@ -803,17 +839,17 @@ static void mark_object_for_connectivity(const struct object_id *oid) } static int mark_loose_for_connectivity(const struct object_id *oid, - const char *path, - void *data) + const char *path UNUSED, + void *data UNUSED) { mark_object_for_connectivity(oid); return 0; } static int mark_packed_for_connectivity(const struct object_id *oid, - struct packed_git *pack, - uint32_t pos, - void *data) + struct packed_git *pack UNUSED, + uint32_t pos UNUSED, + void *data UNUSED) { mark_object_for_connectivity(oid); return 0; @@ -956,32 +992,30 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) } if (keep_cache_objects) { + struct worktree **worktrees, **p; + verify_index_checksum = 1; verify_ce_order = 1; - repo_read_index(the_repository); - /* TODO: audit for interaction with sparse-index. */ - ensure_full_index(&the_index); - for (i = 0; i < the_index.cache_nr; i++) { - unsigned int mode; - struct blob *blob; - struct object *obj; - mode = the_index.cache[i]->ce_mode; - if (S_ISGITLINK(mode)) - continue; - blob = lookup_blob(the_repository, - &the_index.cache[i]->oid); - if (!blob) - continue; - obj = &blob->object; - obj->flags |= USED; - fsck_put_object_name(&fsck_walk_options, &obj->oid, - ":%s", the_index.cache[i]->name); - mark_object_reachable(obj); + worktrees = get_worktrees(); + for (p = worktrees; *p; p++) { + struct worktree *wt = *p; + struct index_state istate = + INDEX_STATE_INIT(the_repository); + char *path; + + /* + * Make a copy since the buffer is reusable + * and may get overwritten by other calls + * while we're examining the index. + */ + path = xstrdup(worktree_git_path(wt, "index")); + read_index_from(&istate, path, get_worktree_git_dir(wt)); + fsck_index(&istate, path, wt->is_current); + discard_index(&istate); + free(path); } - if (the_index.cache_tree) - fsck_cache_tree(the_index.cache_tree); - fsck_resolve_undo(&the_index); + free_worktrees(worktrees); } check_connectivity(); diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c index 0feef8caf6..cae804a190 100644 --- a/builtin/fsmonitor--daemon.c +++ b/builtin/fsmonitor--daemon.c @@ -1,4 +1,5 @@ #include "builtin.h" +#include "alloc.h" #include "config.h" #include "parse-options.h" #include "fsmonitor.h" diff --git a/builtin/gc.c b/builtin/gc.c index 02455fdcd7..c58fe8c936 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -11,6 +11,7 @@ */ #include "builtin.h" +#include "hex.h" #include "repository.h" #include "config.h" #include "tempfile.h" @@ -976,9 +977,9 @@ struct write_loose_object_data { static int loose_object_auto_limit = 100; -static int loose_object_count(const struct object_id *oid, - const char *path, - void *data) +static int loose_object_count(const struct object_id *oid UNUSED, + const char *path UNUSED, + void *data) { int *count = (int*)data; if (++(*count) >= loose_object_auto_limit) @@ -1003,15 +1004,15 @@ static int loose_object_auto_condition(void) NULL, NULL, &count); } -static int bail_on_loose(const struct object_id *oid, - const char *path, - void *data) +static int bail_on_loose(const struct object_id *oid UNUSED, + const char *path UNUSED, + void *data UNUSED) { return 1; } static int write_loose_object_to_stdin(const struct object_id *oid, - const char *path, + const char *path UNUSED, void *data) { struct write_loose_object_data *d = (struct write_loose_object_data *)data; diff --git a/builtin/grep.c b/builtin/grep.c index f7821c5fbb..c590fcb19d 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -4,6 +4,8 @@ * Copyright (c) 2006 Junio C Hamano */ #include "cache.h" +#include "alloc.h" +#include "hex.h" #include "repository.h" #include "config.h" #include "blob.h" diff --git a/builtin/hash-object.c b/builtin/hash-object.c index 44db83f07f..1848768b97 100644 --- a/builtin/hash-object.c +++ b/builtin/hash-object.c @@ -6,6 +6,7 @@ */ #include "builtin.h" #include "config.h" +#include "hex.h" #include "object-store.h" #include "blob.h" #include "quote.h" diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 6648f2daef..b451755f40 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1,6 +1,8 @@ #include "builtin.h" +#include "alloc.h" #include "config.h" #include "delta.h" +#include "hex.h" #include "pack.h" #include "csum-file.h" #include "blob.h" @@ -14,6 +16,7 @@ #include "thread-utils.h" #include "packfile.h" #include "object-store.h" +#include "replace-object.h" #include "promisor-remote.h" static const char index_pack_usage[] = diff --git a/builtin/log.c b/builtin/log.c index a70fba198f..b62e629ba8 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -4,8 +4,10 @@ * (C) Copyright 2006 Linus Torvalds * 2006 Junio Hamano */ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" +#include "hex.h" #include "refs.h" #include "object-store.h" #include "color.h" @@ -436,7 +438,7 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list) setitimer(ITIMER_REAL, &early_output_timer, NULL); } -static void early_output(int signal) +static void early_output(int signal UNUSED) { show_early_output = log_show_early; } @@ -601,8 +603,6 @@ static int git_log_config(const char *var, const char *value, void *cb) return 0; } - if (git_gpg_config(var, value, cb) < 0) - return -1; return git_diff_ui_config(var, value, cb); } diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c index 6516177348..2dfbd8ed9b 100644 --- a/builtin/ls-remote.c +++ b/builtin/ls-remote.c @@ -1,5 +1,6 @@ #include "builtin.h" #include "cache.h" +#include "hex.h" #include "transport.h" #include "ref-filter.h" #include "remote.h" diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index 8cc8c995df..64d8e54318 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -5,6 +5,7 @@ */ #include "cache.h" #include "config.h" +#include "hex.h" #include "object-store.h" #include "blob.h" #include "tree.h" diff --git a/builtin/merge-base.c b/builtin/merge-base.c index 6f3941f2a4..be8f3b221c 100644 --- a/builtin/merge-base.c +++ b/builtin/merge-base.c @@ -2,6 +2,7 @@ #include "cache.h" #include "config.h" #include "commit.h" +#include "hex.h" #include "refs.h" #include "diff.h" #include "revision.h" diff --git a/builtin/merge-index.c b/builtin/merge-index.c index 452f833ac4..c875f5d37e 100644 --- a/builtin/merge-index.c +++ b/builtin/merge-index.c @@ -1,5 +1,6 @@ #define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "hex.h" #include "run-command.h" static const char *pgm; diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 828dc81c42..e782518164 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -3,6 +3,7 @@ #include "tree-walk.h" #include "xdiff-interface.h" #include "help.h" +#include "hex.h" #include "commit.h" #include "commit-reach.h" #include "merge-ort.h" diff --git a/builtin/merge.c b/builtin/merge.c index 0a3c10a096..19c31d4ff4 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -8,7 +8,9 @@ #define USE_THE_INDEX_VARIABLE #include "cache.h" +#include "alloc.h" #include "config.h" +#include "hex.h" #include "parse-options.h" #include "builtin.h" #include "lockfile.h" @@ -661,9 +663,6 @@ static int git_merge_config(const char *k, const char *v, void *cb) status = fmt_merge_msg_config(k, v, cb); if (status) return status; - status = git_gpg_config(k, v, NULL); - if (status) - return status; return git_diff_ui_config(k, v, cb); } diff --git a/builtin/mktag.c b/builtin/mktag.c index 5d22909122..42c2457c70 100644 --- a/builtin/mktag.c +++ b/builtin/mktag.c @@ -1,4 +1,5 @@ #include "builtin.h" +#include "hex.h" #include "parse-options.h" #include "tag.h" #include "replace-object.h" diff --git a/builtin/mktree.c b/builtin/mktree.c index 06d81400f5..848c7b4747 100644 --- a/builtin/mktree.c +++ b/builtin/mktree.c @@ -4,6 +4,8 @@ * Copyright (c) Junio C Hamano, 2006, 2009 */ #include "builtin.h" +#include "alloc.h" +#include "hex.h" #include "quote.h" #include "tree.h" #include "parse-options.h" diff --git a/builtin/mv.c b/builtin/mv.c index edd7b931fd..8129050377 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -5,6 +5,7 @@ */ #define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "alloc.h" #include "config.h" #include "pathspec.h" #include "lockfile.h" diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 97959bfaf9..723ba616a8 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -1,5 +1,6 @@ #include "builtin.h" -#include "cache.h" +#include "alloc.h" +#include "hex.h" #include "repository.h" #include "config.h" #include "commit.h" diff --git a/builtin/notes.c b/builtin/notes.c index 80d9dfd25c..75ce7f3f57 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -10,6 +10,7 @@ #include "cache.h" #include "config.h" #include "builtin.h" +#include "hex.h" #include "notes.h" #include "object-store.h" #include "repository.h" @@ -113,8 +114,9 @@ static void free_note_data(struct note_data *d) } static int list_each_note(const struct object_id *object_oid, - const struct object_id *note_oid, char *note_path, - void *cb_data) + const struct object_id *note_oid, + char *note_path UNUSED, + void *cb_data UNUSED) { printf("%s %s\n", oid_to_hex(note_oid), oid_to_hex(object_oid)); return 0; diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 74a167a180..545b8bddc8 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -1,5 +1,6 @@ #include "builtin.h" -#include "cache.h" +#include "alloc.h" +#include "hex.h" #include "repository.h" #include "config.h" #include "attr.h" @@ -31,6 +32,7 @@ #include "list.h" #include "packfile.h" #include "object-store.h" +#include "replace-object.h" #include "dir.h" #include "midx.h" #include "trace2.h" @@ -1590,7 +1592,7 @@ static int add_object_entry(const struct object_id *oid, enum object_type type, static int add_object_entry_from_bitmap(const struct object_id *oid, enum object_type type, - int flags, uint32_t name_hash, + int flags UNUSED, uint32_t name_hash, struct packed_git *pack, off_t offset) { display_progress(progress_state, ++nr_seen); @@ -3260,13 +3262,14 @@ static int add_object_entry_from_pack(const struct object_id *oid, return 0; } -static void show_commit_pack_hint(struct commit *commit, void *_data) +static void show_commit_pack_hint(struct commit *commit UNUSED, + void *data UNUSED) { /* nothing to do; commits don't have a namehash */ } static void show_object_pack_hint(struct object *object, const char *name, - void *_data) + void *data UNUSED) { struct object_entry *oe = packlist_find(&to_pack, &object->oid); if (!oe) @@ -3464,7 +3467,7 @@ static void add_cruft_object_entry(const struct object_id *oid, enum object_type return; } -static void show_cruft_object(struct object *obj, const char *name, void *data) +static void show_cruft_object(struct object *obj, const char *name, void *data UNUSED) { /* * if we did not record it earlier, it's at least as old as our @@ -3484,7 +3487,7 @@ static void show_cruft_commit(struct commit *commit, void *data) show_cruft_object((struct object*)commit, NULL, data); } -static int cruft_include_check_obj(struct object *obj, void *data) +static int cruft_include_check_obj(struct object *obj, void *data UNUSED) { return !has_object_kept_pack(&obj->oid, IN_CORE_KEEP_PACKS); } @@ -3663,7 +3666,7 @@ static void read_object_list_from_stdin(void) } } -static void show_commit(struct commit *commit, void *data) +static void show_commit(struct commit *commit, void *data UNUSED) { add_object_entry(&commit->object.oid, OBJ_COMMIT, NULL, 0); @@ -3674,7 +3677,8 @@ static void show_commit(struct commit *commit, void *data) propagate_island_marks(commit); } -static void show_object(struct object *obj, const char *name, void *data) +static void show_object(struct object *obj, const char *name, + void *data UNUSED) { add_preferred_base_object(name); add_object_entry(&obj->oid, obj->type, name, 0); @@ -3761,7 +3765,7 @@ static void show_edge(struct commit *commit) static int add_object_in_unpacked_pack(const struct object_id *oid, struct packed_git *pack, uint32_t pos, - void *_data) + void *data UNUSED) { if (cruft) { off_t offset; @@ -3795,7 +3799,7 @@ static void add_objects_in_unpacked_packs(void) } static int add_loose_object(const struct object_id *oid, const char *path, - void *data) + void *data UNUSED) { enum object_type type = oid_object_info(the_repository, oid, NULL); @@ -3946,13 +3950,13 @@ static int get_object_list_from_bitmap(struct rev_info *revs) } static void record_recent_object(struct object *obj, - const char *name, - void *data) + const char *name UNUSED, + void *data UNUSED) { oid_array_append(&recent_objects, &obj->oid); } -static void record_recent_commit(struct commit *commit, void *data) +static void record_recent_commit(struct commit *commit, void *data UNUSED) { oid_array_append(&recent_objects, &commit->object.oid); } diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c index ecd49ca268..82115c5808 100644 --- a/builtin/pack-redundant.c +++ b/builtin/pack-redundant.c @@ -7,6 +7,7 @@ */ #include "builtin.h" +#include "hex.h" #include "repository.h" #include "packfile.h" #include "object-store.h" diff --git a/builtin/patch-id.c b/builtin/patch-id.c index f840fbf1c7..338b15cd7b 100644 --- a/builtin/patch-id.c +++ b/builtin/patch-id.c @@ -2,6 +2,7 @@ #include "builtin.h" #include "config.h" #include "diff.h" +#include "hex.h" #include "parse-options.h" static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result) diff --git a/builtin/prune.c b/builtin/prune.c index 2719220108..119a253a2a 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -1,12 +1,14 @@ #include "cache.h" #include "commit.h" #include "diff.h" +#include "hex.h" #include "revision.h" #include "builtin.h" #include "reachable.h" #include "parse-options.h" #include "progress.h" #include "prune-packed.h" +#include "replace-object.h" #include "object-store.h" #include "shallow.h" @@ -98,7 +100,8 @@ static int prune_object(const struct object_id *oid, const char *fullpath, return 0; } -static int prune_cruft(const char *basename, const char *path, void *data) +static int prune_cruft(const char *basename, const char *path, + void *data UNUSED) { if (starts_with(basename, "tmp_obj_")) prune_tmp_file(path); @@ -107,7 +110,8 @@ static int prune_cruft(const char *basename, const char *path, void *data) return 0; } -static int prune_subdir(unsigned int nr, const char *path, void *data) +static int prune_subdir(unsigned int nr UNUSED, const char *path, + void *data UNUSED) { if (!show_only) rmdir(path); diff --git a/builtin/pull.c b/builtin/pull.c index 1ab4de0005..56f679d94a 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -9,6 +9,7 @@ #include "cache.h" #include "config.h" #include "builtin.h" +#include "hex.h" #include "parse-options.h" #include "exec-cmd.h" #include "run-command.h" @@ -359,8 +360,6 @@ static enum rebase_type config_get_rebase(int *rebase_unspecified) */ static int git_pull_config(const char *var, const char *value, void *cb) { - int status; - if (!strcmp(var, "rebase.autostash")) { config_autostash = git_config_bool(var, value); return 0; @@ -372,10 +371,6 @@ static int git_pull_config(const char *var, const char *value, void *cb) check_trust_level = 0; } - status = git_gpg_config(var, value, cb); - if (status) - return status; - return git_default_config(var, value, cb); } diff --git a/builtin/push.c b/builtin/push.c index 8f7d326ab3..12a402aea3 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -508,11 +508,6 @@ static int git_push_config(const char *k, const char *v, void *cb) { const char *slot_name; int *flags = cb; - int status; - - status = git_gpg_config(k, v, NULL); - if (status) - return status; if (!strcmp(k, "push.followtags")) { if (git_config_bool(k, v)) diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 3ce7541783..11759c415f 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -7,6 +7,7 @@ #define USE_THE_INDEX_VARIABLE #include "cache.h" #include "config.h" +#include "hex.h" #include "lockfile.h" #include "object.h" #include "tree.h" @@ -87,9 +88,9 @@ static int debug_merge(const struct cache_entry * const *stages, { int i; - printf("* %d-way merge\n", o->merge_size); + printf("* %d-way merge\n", o->internal.merge_size); debug_stage("index", stages[0], o); - for (i = 1; i <= o->merge_size; i++) { + for (i = 1; i <= o->internal.merge_size; i++) { char buf[24]; xsnprintf(buf, sizeof(buf), "ent#%d", i); debug_stage(buf, stages[i], o); @@ -144,7 +145,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) OPT__DRY_RUN(&opts.dry_run, N_("don't update the index or the work tree")), OPT_BOOL(0, "no-sparse-checkout", &opts.skip_sparse_checkout, N_("skip applying sparse checkout filter")), - OPT_BOOL(0, "debug-unpack", &opts.debug_unpack, + OPT_BOOL(0, "debug-unpack", &opts.internal.debug_unpack, N_("debug unpack-trees")), OPT_CALLBACK_F(0, "recurse-submodules", NULL, "checkout", "control recursive updating of submodules", @@ -247,7 +248,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) opts.head_idx = 1; } - if (opts.debug_unpack) + if (opts.internal.debug_unpack) opts.fn = debug_merge; /* If we're going to prime_cache_tree later, skip cache tree update */ @@ -263,7 +264,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix) if (unpack_trees(nr_trees, t, &opts)) return 128; - if (opts.debug_unpack || opts.dry_run) + if (opts.internal.debug_unpack || opts.dry_run) return 0; /* do not write the index out */ /* diff --git a/builtin/rebase.c b/builtin/rebase.c index 9a18f9b4b8..dd31d5ab91 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -6,6 +6,7 @@ #define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "hex.h" #include "run-command.h" #include "exec-cmd.h" #include "strvec.h" diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index cd5c7a28ef..fe68c79ee3 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1,6 +1,7 @@ #include "builtin.h" #include "repository.h" #include "config.h" +#include "hex.h" #include "lockfile.h" #include "pack.h" #include "refs.h" @@ -136,10 +137,6 @@ static int receive_pack_config(const char *var, const char *value, void *cb) if (status) return status; - status = git_gpg_config(var, value, NULL); - if (status) - return status; - if (strcmp(var, "receive.denydeletes") == 0) { deny_deletes = git_config_bool(var, value); return 0; diff --git a/builtin/repack.c b/builtin/repack.c index f649379531..87f73c8923 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -1,7 +1,8 @@ #include "builtin.h" -#include "cache.h" +#include "alloc.h" #include "config.h" #include "dir.h" +#include "hex.h" #include "parse-options.h" #include "run-command.h" #include "sigchain.h" @@ -182,8 +183,9 @@ static void prepare_pack_objects(struct child_process *cmd, * Write oid to the given struct child_process's stdin, starting it first if * necessary. */ -static int write_oid(const struct object_id *oid, struct packed_git *pack, - uint32_t pos, void *data) +static int write_oid(const struct object_id *oid, + struct packed_git *pack UNUSED, + uint32_t pos UNUSED, void *data) { struct child_process *cmd = data; diff --git a/builtin/replace.c b/builtin/replace.c index a29e911d30..71d8e949e3 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -11,10 +11,12 @@ #include "cache.h" #include "config.h" #include "builtin.h" +#include "hex.h" #include "refs.h" #include "parse-options.h" #include "run-command.h" #include "object-store.h" +#include "replace-object.h" #include "repository.h" #include "tag.h" diff --git a/builtin/reset.c b/builtin/reset.c index 0697fa89de..58f567afd3 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -10,6 +10,7 @@ #define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" +#include "hex.h" #include "lockfile.h" #include "tag.h" #include "object.h" diff --git a/builtin/rev-list.c b/builtin/rev-list.c index d42db0b0cc..85e522dff8 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -2,6 +2,7 @@ #include "config.h" #include "commit.h" #include "diff.h" +#include "hex.h" #include "revision.h" #include "list-objects.h" #include "list-objects-filter.h" @@ -38,7 +39,7 @@ static const char rev_list_usage[] = " --tags\n" " --remotes\n" " --stdin\n" -" --exclude-hidden=[receive|uploadpack]\n" +" --exclude-hidden=[fetch|receive|uploadpack]\n" " --quiet\n" " ordering output:\n" " --topo-order\n" @@ -257,7 +258,8 @@ static inline void finish_object__ma(struct object *obj) } } -static int finish_object(struct object *obj, const char *name, void *cb_data) +static int finish_object(struct object *obj, const char *name UNUSED, + void *cb_data) { struct rev_list_info *info = cb_data; if (oid_object_info_extended(the_repository, &obj->oid, NULL, 0) < 0) { @@ -362,11 +364,11 @@ static int show_bisect_vars(struct rev_list_info *info, int reaches, int all) static int show_object_fast( const struct object_id *oid, - enum object_type type, - int exclude, - uint32_t name_hash, - struct packed_git *found_pack, - off_t found_offset) + enum object_type type UNUSED, + int exclude UNUSED, + uint32_t name_hash UNUSED, + struct packed_git *found_pack UNUSED, + off_t found_offset UNUSED) { fprintf(stdout, "%s\n", oid_to_hex(oid)); return 1; diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index e67999e5eb..e1fa9c6348 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -5,8 +5,10 @@ */ #define USE_THE_INDEX_VARIABLE #include "cache.h" +#include "alloc.h" #include "config.h" #include "commit.h" +#include "hex.h" #include "refs.h" #include "quote.h" #include "builtin.h" diff --git a/builtin/revert.c b/builtin/revert.c index 77d2035616..62986a7b1b 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" #include "builtin.h" #include "parse-options.h" diff --git a/builtin/rm.c b/builtin/rm.c index 8844f90655..dc198f7908 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -5,6 +5,7 @@ */ #define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "alloc.h" #include "advice.h" #include "config.h" #include "lockfile.h" diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 4c5d125fa0..fb5b2bad2c 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -1,6 +1,7 @@ #include "builtin.h" #include "config.h" #include "commit.h" +#include "hex.h" #include "refs.h" #include "pkt-line.h" #include "sideband.h" @@ -130,8 +131,6 @@ static void print_helper_status(struct ref *ref) static int send_pack_config(const char *k, const char *v, void *cb) { - git_gpg_config(k, v, NULL); - if (!strcmp(k, "push.gpgsign")) { const char *value; if (!git_config_get_value("push.gpgsign", &value)) { diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 358ac3e519..8342b68aef 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -1,5 +1,6 @@ #include "cache.h" #include "config.h" +#include "hex.h" #include "pretty.h" #include "refs.h" #include "builtin.h" diff --git a/builtin/show-index.c b/builtin/show-index.c index 0e0b9fb95b..98ec40ddf4 100644 --- a/builtin/show-index.c +++ b/builtin/show-index.c @@ -1,5 +1,6 @@ #include "builtin.h" #include "cache.h" +#include "hex.h" #include "pack.h" #include "parse-options.h" diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 3af6a53ee9..1f28d7fe4b 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -1,6 +1,7 @@ #include "builtin.h" #include "cache.h" #include "config.h" +#include "hex.h" #include "refs.h" #include "object-store.h" #include "object.h" diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c index c373815491..8d5ae6f2a6 100644 --- a/builtin/sparse-checkout.c +++ b/builtin/sparse-checkout.c @@ -217,16 +217,14 @@ static int update_working_directory(struct pattern_list *pl) o.head_idx = -1; o.src_index = r->index; o.dst_index = r->index; - index_state_init(&o.result, r); o.skip_sparse_checkout = 0; - o.pl = pl; setup_work_tree(); repo_hold_locked_index(r, &lock_file, LOCK_DIE_ON_ERROR); setup_unpack_trees_porcelain(&o, "sparse-checkout"); - result = update_sparsity(&o); + result = update_sparsity(&o, pl); clear_unpack_trees_porcelain(&o); if (result == UPDATE_SPARSITY_WARNINGS) diff --git a/builtin/stash.c b/builtin/stash.c index 3a4f9fd566..6a12fed271 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -1,6 +1,7 @@ #define USE_THE_INDEX_VARIABLE #include "builtin.h" #include "config.h" +#include "hex.h" #include "parse-options.h" #include "refs.h" #include "lockfile.h" diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 4c173d8b37..d05d1a8462 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -1,5 +1,7 @@ #define USE_THE_INDEX_VARIABLE #include "builtin.h" +#include "alloc.h" +#include "hex.h" #include "repository.h" #include "cache.h" #include "config.h" @@ -2132,9 +2134,9 @@ static int update_clone_get_next_task(struct child_process *child, return 0; } -static int update_clone_start_failure(struct strbuf *err, +static int update_clone_start_failure(struct strbuf *err UNUSED, void *suc_cb, - void *idx_task_cb) + void *idx_task_cb UNUSED) { struct submodule_update_clone *suc = suc_cb; diff --git a/builtin/tag.c b/builtin/tag.c index d428c45dc8..7cdcd4293d 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -9,6 +9,7 @@ #include "cache.h" #include "config.h" #include "builtin.h" +#include "hex.h" #include "refs.h" #include "object-store.h" #include "tag.h" @@ -180,8 +181,6 @@ static const char tag_template_nocleanup[] = static int git_tag_config(const char *var, const char *value, void *cb) { - int status; - if (!strcmp(var, "tag.gpgsign")) { config_sign_tag = git_config_bool(var, value); return 0; @@ -194,9 +193,6 @@ static int git_tag_config(const char *var, const char *value, void *cb) return 0; } - status = git_gpg_config(var, value, cb); - if (status) - return status; if (!strcmp(var, "tag.forcesignannotated")) { force_sign_annotate = git_config_bool(var, value); return 0; diff --git a/builtin/unpack-file.c b/builtin/unpack-file.c index 88de32b7d7..e9b105a539 100644 --- a/builtin/unpack-file.c +++ b/builtin/unpack-file.c @@ -1,5 +1,6 @@ #include "builtin.h" #include "config.h" +#include "hex.h" #include "object-store.h" static char *create_temp_file(struct object_id *oid) diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 43789b8ef2..1908dcfcff 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -2,12 +2,14 @@ #include "cache.h" #include "bulk-checkin.h" #include "config.h" +#include "hex.h" #include "object-store.h" #include "object.h" #include "delta.h" #include "pack.h" #include "blob.h" #include "commit.h" +#include "replace-object.h" #include "tag.h" #include "tree.h" #include "tree-walk.h" diff --git a/builtin/update-index.c b/builtin/update-index.c index bf38885d54..11dc135271 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -7,6 +7,7 @@ #include "cache.h" #include "bulk-checkin.h" #include "config.h" +#include "hex.h" #include "lockfile.h" #include "quote.h" #include "cache-tree.h" diff --git a/builtin/upload-pack.c b/builtin/upload-pack.c index 25b69da2bf..7a3c68720f 100644 --- a/builtin/upload-pack.c +++ b/builtin/upload-pack.c @@ -4,6 +4,7 @@ #include "pkt-line.h" #include "parse-options.h" #include "protocol.h" +#include "replace-object.h" #include "upload-pack.h" #include "serve.h" diff --git a/builtin/var.c b/builtin/var.c index a80c1df86f..d9943be9af 100644 --- a/builtin/var.c +++ b/builtin/var.c @@ -5,6 +5,7 @@ */ #include "builtin.h" #include "config.h" +#include "ident.h" #include "refs.h" static const char var_usage[] = "git var (-l | <variable>)"; diff --git a/builtin/verify-commit.c b/builtin/verify-commit.c index 3ebad32b0f..7aedf10e85 100644 --- a/builtin/verify-commit.c +++ b/builtin/verify-commit.c @@ -52,14 +52,6 @@ static int verify_commit(const char *name, unsigned flags) return run_gpg_verify((struct commit *)obj, flags); } -static int git_verify_commit_config(const char *var, const char *value, void *cb) -{ - int status = git_gpg_config(var, value, cb); - if (status) - return status; - return git_default_config(var, value, cb); -} - int cmd_verify_commit(int argc, const char **argv, const char *prefix) { int i = 1, verbose = 0, had_error = 0; @@ -70,7 +62,7 @@ int cmd_verify_commit(int argc, const char **argv, const char *prefix) OPT_END() }; - git_config(git_verify_commit_config, NULL); + git_config(git_default_config, NULL); argc = parse_options(argc, argv, prefix, verify_commit_options, verify_commit_usage, PARSE_OPT_KEEP_ARGV0); diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index 217566952d..5c00b0b0f7 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -19,14 +19,6 @@ static const char * const verify_tag_usage[] = { NULL }; -static int git_verify_tag_config(const char *var, const char *value, void *cb) -{ - int status = git_gpg_config(var, value, cb); - if (status) - return status; - return git_default_config(var, value, cb); -} - int cmd_verify_tag(int argc, const char **argv, const char *prefix) { int i = 1, verbose = 0, had_error = 0; @@ -39,7 +31,7 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix) OPT_END() }; - git_config(git_verify_tag_config, NULL); + git_config(git_default_config, NULL); argc = parse_options(argc, argv, prefix, verify_tag_options, verify_tag_usage, PARSE_OPT_KEEP_ARGV0); diff --git a/builtin/worktree.c b/builtin/worktree.c index 254283aa6f..80d05e246d 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -3,6 +3,7 @@ #include "config.h" #include "builtin.h" #include "dir.h" +#include "hex.h" #include "parse-options.h" #include "strvec.h" #include "branch.h" diff --git a/builtin/write-tree.c b/builtin/write-tree.c index 078010315f..7ad0d05945 100644 --- a/builtin/write-tree.c +++ b/builtin/write-tree.c @@ -7,6 +7,7 @@ #include "builtin.h" #include "cache.h" #include "config.h" +#include "hex.h" #include "tree.h" #include "cache-tree.h" #include "parse-options.h" diff --git a/bulk-checkin.c b/bulk-checkin.c index 855b68ec23..d64cd5c52d 100644 --- a/bulk-checkin.c +++ b/bulk-checkin.c @@ -1,8 +1,10 @@ /* * Copyright (c) 2011, Google Inc. */ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "bulk-checkin.h" +#include "hex.h" #include "lockfile.h" #include "repository.h" #include "csum-file.h" diff --git a/bundle-uri.c b/bundle-uri.c index 8a3c39ce57..177c181040 100644 --- a/bundle-uri.c +++ b/bundle-uri.c @@ -884,7 +884,7 @@ int bundle_uri_command(struct repository *r, * Read all "bundle.*" config lines to the client as key=value * packet lines. */ - git_config(config_to_packet_line, &writer); + repo_config(r, config_to_packet_line, &writer); packet_writer_flush(&writer); @@ -1,6 +1,7 @@ #include "cache.h" #include "lockfile.h" #include "bundle.h" +#include "hex.h" #include "object-store.h" #include "repository.h" #include "object.h" diff --git a/cache-tree.c b/cache-tree.c index 88c2c04f87..9d46ecef09 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -1,4 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" +#include "hex.h" #include "lockfile.h" #include "tree.h" #include "tree-walk.h" diff --git a/cache-tree.h b/cache-tree.h index bd97caa07b..faae88be63 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -1,7 +1,6 @@ #ifndef CACHE_TREE_H #define CACHE_TREE_H -#include "cache.h" #include "tree.h" #include "tree-walk.h" @@ -14,8 +14,11 @@ #include "pack-revindex.h" #include "hash.h" #include "path.h" +#include "pathspec.h" +#include "object.h" #include "oid-array.h" #include "repository.h" +#include "statinfo.h" #include "mem-pool.h" typedef struct git_zstream { @@ -118,26 +121,6 @@ struct cache_header { #define INDEX_FORMAT_LB 2 #define INDEX_FORMAT_UB 4 -/* - * The "cache_time" is just the low 32 bits of the - * time. It doesn't matter if it overflows - we only - * check it for equality in the 32 bits we save. - */ -struct cache_time { - uint32_t sec; - uint32_t nsec; -}; - -struct stat_data { - struct cache_time sd_ctime; - struct cache_time sd_mtime; - unsigned int sd_dev; - unsigned int sd_ino; - unsigned int sd_uid; - unsigned int sd_gid; - unsigned int sd_size; -}; - struct cache_entry { struct hashmap_entry ent; struct stat_data ce_stat_data; @@ -293,6 +276,15 @@ static inline unsigned int canon_mode(unsigned int mode) return S_IFGITLINK; } +static inline int ce_path_match(struct index_state *istate, + const struct cache_entry *ce, + const struct pathspec *pathspec, + char *seen) +{ + return match_pathspec(istate, pathspec, ce->name, ce_namelen(ce), 0, seen, + S_ISDIR(ce->ce_mode) || S_ISGITLINK(ce->ce_mode)); +} + #define cache_entry_size(len) (offsetof(struct cache_entry,name) + (len) + 1) #define SOMETHING_CHANGED (1 << 0) /* unclassified changes go here */ @@ -453,26 +445,6 @@ void prefetch_cache_entries(const struct index_state *istate, extern struct index_state the_index; #endif -#define TYPE_BITS 3 - -/* - * Values in this enum (except those outside the 3 bit range) are part - * of pack file format. See gitformat-pack(5) for more information. - */ -enum object_type { - OBJ_BAD = -1, - OBJ_NONE = 0, - OBJ_COMMIT = 1, - OBJ_TREE = 2, - OBJ_BLOB = 3, - OBJ_TAG = 4, - /* 5 for future expansion */ - OBJ_OFS_DELTA = 6, - OBJ_REF_DELTA = 7, - OBJ_ANY, - OBJ_MAX -}; - static inline enum object_type object_type(unsigned int mode) { return S_ISDIR(mode) ? OBJ_TREE : @@ -656,81 +628,6 @@ void initialize_repository_version(int hash_algo, int reinit); void sanitize_stdfds(void); int daemonize(void); -#define alloc_nr(x) (((x)+16)*3/2) - -/** - * Dynamically growing an array using realloc() is error prone and boring. - * - * Define your array with: - * - * - a pointer (`item`) that points at the array, initialized to `NULL` - * (although please name the variable based on its contents, not on its - * type); - * - * - an integer variable (`alloc`) that keeps track of how big the current - * allocation is, initialized to `0`; - * - * - another integer variable (`nr`) to keep track of how many elements the - * array currently has, initialized to `0`. - * - * Then before adding `n`th element to the item, call `ALLOC_GROW(item, n, - * alloc)`. This ensures that the array can hold at least `n` elements by - * calling `realloc(3)` and adjusting `alloc` variable. - * - * ------------ - * sometype *item; - * size_t nr; - * size_t alloc - * - * for (i = 0; i < nr; i++) - * if (we like item[i] already) - * return; - * - * // we did not like any existing one, so add one - * ALLOC_GROW(item, nr + 1, alloc); - * item[nr++] = value you like; - * ------------ - * - * You are responsible for updating the `nr` variable. - * - * If you need to specify the number of elements to allocate explicitly - * then use the macro `REALLOC_ARRAY(item, alloc)` instead of `ALLOC_GROW`. - * - * Consider using ALLOC_GROW_BY instead of ALLOC_GROW as it has some - * added niceties. - * - * DO NOT USE any expression with side-effect for 'x', 'nr', or 'alloc'. - */ -#define ALLOC_GROW(x, nr, alloc) \ - do { \ - if ((nr) > alloc) { \ - if (alloc_nr(alloc) < (nr)) \ - alloc = (nr); \ - else \ - alloc = alloc_nr(alloc); \ - REALLOC_ARRAY(x, alloc); \ - } \ - } while (0) - -/* - * Similar to ALLOC_GROW but handles updating of the nr value and - * zeroing the bytes of the newly-grown array elements. - * - * DO NOT USE any expression with side-effect for any of the - * arguments. - */ -#define ALLOC_GROW_BY(x, nr, increase, alloc) \ - do { \ - if (increase) { \ - size_t new_nr = nr + (increase); \ - if (new_nr < nr) \ - BUG("negative growth in ALLOC_GROW_BY"); \ - ALLOC_GROW(x, new_nr, alloc); \ - memset((x) + nr, 0, sizeof(*(x)) * (increase)); \ - nr = new_nr; \ - } \ - } while (0) - /* Initialize and use the cache information */ struct lock_file; void preload_index(struct index_state *index, @@ -990,14 +887,6 @@ int get_shared_repository(void); void reset_shared_repository(void); /* - * Do replace refs need to be checked this run? This variable is - * initialized to true unless --no-replace-object is used or - * $GIT_NO_REPLACE_OBJECTS is set, but is set to false by some - * commands that do not want replace references to be active. - */ -extern int read_replace_refs; - -/* * These values are used to help identify parts of a repository to fsync. * FSYNC_COMPONENT_NONE identifies data that will not be a persistent part of the * repository and so shouldn't be fsynced. @@ -1400,22 +1289,6 @@ int finalize_object_file(const char *tmpfile, const char *filename); /* Helper to check and "touch" a file */ int check_and_freshen_file(const char *fn, int freshen); -extern const signed char hexval_table[256]; -static inline unsigned int hexval(unsigned char c) -{ - return hexval_table[c]; -} - -/* - * Convert two consecutive hexadecimal digits into a char. Return a - * negative value on error. Don't run over the end of short strings. - */ -static inline int hex2chr(const char *s) -{ - unsigned int val = hexval(s[0]); - return (val & ~0xf) ? val : (val << 4) | hexval(s[1]); -} - /* Convert to/from hex/sha1 representation */ #define MINIMUM_ABBREV minimum_abbrev #define DEFAULT_ABBREV default_abbrev @@ -1438,40 +1311,6 @@ struct object_context { char *path; }; -#define GET_OID_QUIETLY 01 -#define GET_OID_COMMIT 02 -#define GET_OID_COMMITTISH 04 -#define GET_OID_TREE 010 -#define GET_OID_TREEISH 020 -#define GET_OID_BLOB 040 -#define GET_OID_FOLLOW_SYMLINKS 0100 -#define GET_OID_RECORD_PATH 0200 -#define GET_OID_ONLY_TO_DIE 04000 -#define GET_OID_REQUIRE_PATH 010000 - -#define GET_OID_DISAMBIGUATORS \ - (GET_OID_COMMIT | GET_OID_COMMITTISH | \ - GET_OID_TREE | GET_OID_TREEISH | \ - GET_OID_BLOB) - -enum get_oid_result { - FOUND = 0, - MISSING_OBJECT = -1, /* The requested object is missing */ - SHORT_NAME_AMBIGUOUS = -2, - /* The following only apply when symlinks are followed */ - DANGLING_SYMLINK = -4, /* - * The initial symlink is there, but - * (transitively) points to a missing - * in-tree file - */ - SYMLINK_LOOP = -5, - NOT_DIR = -6, /* - * Somewhere along the symlink chain, a path is - * requested which contains a file as a - * non-final element. - */ -}; - int repo_get_oid(struct repository *r, const char *str, struct object_id *oid); __attribute__((format (printf, 2, 3))) int get_oidf(struct object_id *oid, const char *fmt, ...); @@ -1503,68 +1342,6 @@ int repo_for_each_abbrev(struct repository *r, const char *prefix, each_abbrev_f int set_disambiguate_hint_config(const char *var, const char *value); /* - * Try to read a SHA1 in hexadecimal format from the 40 characters - * starting at hex. Write the 20-byte result to sha1 in binary form. - * Return 0 on success. Reading stops if a NUL is encountered in the - * input, so it is safe to pass this function an arbitrary - * null-terminated string. - */ -int get_sha1_hex(const char *hex, unsigned char *sha1); -int get_oid_hex(const char *hex, struct object_id *sha1); - -/* Like get_oid_hex, but for an arbitrary hash algorithm. */ -int get_oid_hex_algop(const char *hex, struct object_id *oid, const struct git_hash_algo *algop); - -/* - * Read `len` pairs of hexadecimal digits from `hex` and write the - * values to `binary` as `len` bytes. Return 0 on success, or -1 if - * the input does not consist of hex digits). - */ -int hex_to_bytes(unsigned char *binary, const char *hex, size_t len); - -/* - * Convert a binary hash in "unsigned char []" or an object name in - * "struct object_id *" to its hex equivalent. The `_r` variant is reentrant, - * and writes the NUL-terminated output to the buffer `out`, which must be at - * least `GIT_MAX_HEXSZ + 1` bytes, and returns a pointer to out for - * convenience. - * - * The non-`_r` variant returns a static buffer, but uses a ring of 4 - * buffers, making it safe to make multiple calls for a single statement, like: - * - * printf("%s -> %s", hash_to_hex(one), hash_to_hex(two)); - * printf("%s -> %s", oid_to_hex(one), oid_to_hex(two)); - */ -char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash, const struct git_hash_algo *); -char *oid_to_hex_r(char *out, const struct object_id *oid); -char *hash_to_hex_algop(const unsigned char *hash, const struct git_hash_algo *); /* static buffer result! */ -char *hash_to_hex(const unsigned char *hash); /* same static buffer */ -char *oid_to_hex(const struct object_id *oid); /* same static buffer */ - -/* - * Parse a 40-character hexadecimal object ID starting from hex, updating the - * pointer specified by end when parsing stops. The resulting object ID is - * stored in oid. Returns 0 on success. Parsing will stop on the first NUL or - * other invalid character. end is only updated on success; otherwise, it is - * unmodified. - */ -int parse_oid_hex(const char *hex, struct object_id *oid, const char **end); - -/* Like parse_oid_hex, but for an arbitrary hash algorithm. */ -int parse_oid_hex_algop(const char *hex, struct object_id *oid, const char **end, - const struct git_hash_algo *algo); - - -/* - * These functions work like get_oid_hex and parse_oid_hex, but they will parse - * a hex value for any algorithm. The algorithm is detected based on the length - * and the algorithm in use is returned. If this is not a hex object ID in any - * algorithm, returns GIT_HASH_UNKNOWN. - */ -int get_oid_hex_any(const char *hex, struct object_id *oid); -int parse_oid_hex_any(const char *hex, struct object_id *oid, const char **end); - -/* * This reads short-hand syntax that not only evaluates to a commit * object name, but also can act as if the end user spelled the name * of the branch from the command line. @@ -1632,65 +1409,10 @@ struct object *repo_peel_to_type(struct repository *r, #define peel_to_type(name, namelen, obj, type) \ repo_peel_to_type(the_repository, name, namelen, obj, type) -#define IDENT_STRICT 1 -#define IDENT_NO_DATE 2 -#define IDENT_NO_NAME 4 - -enum want_ident { - WANT_BLANK_IDENT, - WANT_AUTHOR_IDENT, - WANT_COMMITTER_IDENT -}; - -const char *git_author_info(int); -const char *git_committer_info(int); -const char *fmt_ident(const char *name, const char *email, - enum want_ident whose_ident, - const char *date_str, int); -const char *fmt_name(enum want_ident); -const char *ident_default_name(void); -const char *ident_default_email(void); const char *git_editor(void); const char *git_sequence_editor(void); const char *git_pager(int stdout_is_tty); int is_terminal_dumb(void); -int git_ident_config(const char *, const char *, void *); -/* - * Prepare an ident to fall back on if the user didn't configure it. - */ -void prepare_fallback_ident(const char *name, const char *email); -void reset_ident_date(void); - -struct ident_split { - const char *name_begin; - const char *name_end; - const char *mail_begin; - const char *mail_end; - const char *date_begin; - const char *date_end; - const char *tz_begin; - const char *tz_end; -}; -/* - * Signals an success with 0, but time part of the result may be NULL - * if the input lacks timestamp and zone - */ -int split_ident_line(struct ident_split *, const char *, int); - -/* - * Given a commit or tag object buffer and the commit or tag headers, replaces - * the idents in the headers with their canonical versions using the mailmap mechanism. - */ -void apply_mailmap_to_header(struct strbuf *, const char **, struct string_list *); - -/* - * Compare split idents for equality or strict ordering. Note that we - * compare only the ident part of the line, ignoring any timestamp. - * - * Because there are two fields, we must choose one as the primary key; we - * currently arbitrarily pick the email. - */ -int ident_cmp(const struct ident_split *, const struct ident_split *); struct cache_def { struct strbuf path; @@ -1757,9 +1479,6 @@ int update_server_info(int); const char *get_log_output_encoding(void); const char *get_commit_output_encoding(void); -int committer_ident_sufficiently_given(void); -int author_ident_sufficiently_given(void); - extern const char *git_commit_encoding; extern const char *git_log_output_encoding; extern const char *git_mailmap_file; @@ -4,6 +4,7 @@ * Based on Adam Langley's adaptation of Dan Bernstein's public domain code * git clone https://github.com/agl/critbit.git */ +#include "git-compat-util.h" #include "cbtree.h" static struct cb_node *cb_node_of(const void *p) @@ -14,8 +14,6 @@ #ifndef CBTREE_H #define CBTREE_H -#include "git-compat-util.h" - struct cb_node; struct cb_node { struct cb_node *child[2]; diff --git a/checkout.h b/checkout.h index 1152133bd7..1917f3b323 100644 --- a/checkout.h +++ b/checkout.h @@ -1,7 +1,7 @@ #ifndef CHECKOUT_H #define CHECKOUT_H -#include "cache.h" +#include "hash.h" /* * Check if the branch name uniquely matches a branch name on a remote diff --git a/chunk-format.c b/chunk-format.c index 0275b74a89..f65e9a1e42 100644 --- a/chunk-format.c +++ b/chunk-format.c @@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "chunk-format.h" #include "csum-file.h" diff --git a/chunk-format.h b/chunk-format.h index 7885aa0848..025c38f938 100644 --- a/chunk-format.h +++ b/chunk-format.h @@ -1,7 +1,6 @@ #ifndef CHUNK_FORMAT_H #define CHUNK_FORMAT_H -#include "git-compat-util.h" #include "hash.h" struct hashfile; @@ -1,6 +1,7 @@ #include "cache.h" #include "config.h" #include "color.h" +#include "hex.h" static int git_use_color_default = GIT_COLOR_AUTO; int color_stdout_is_tty = -1; diff --git a/combine-diff.c b/combine-diff.c index 1a39b5dde0..91051dc325 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -4,6 +4,7 @@ #include "blob.h" #include "diff.h" #include "diffcore.h" +#include "hex.h" #include "quote.h" #include "xdiff-interface.h" #include "xdiff/xmacros.h" diff --git a/commit-graph.c b/commit-graph.c index c11b59f28b..5e6098ff35 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1,5 +1,6 @@ #include "git-compat-util.h" #include "config.h" +#include "hex.h" #include "lockfile.h" #include "pack.h" #include "packfile.h" diff --git a/commit-graph.h b/commit-graph.h index 37faee6b66..bb88bec7aa 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -1,7 +1,6 @@ #ifndef COMMIT_GRAPH_H #define COMMIT_GRAPH_H -#include "git-compat-util.h" #include "object-store.h" #include "oidset.h" diff --git a/commit-reach.c b/commit-reach.c index 2e33c599a8..5ba822a720 100644 --- a/commit-reach.c +++ b/commit-reach.c @@ -1,7 +1,9 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "commit.h" #include "commit-graph.h" #include "decorate.h" +#include "hex.h" #include "prio-queue.h" #include "tree.h" #include "ref-filter.h" diff --git a/commit-slab-impl.h b/commit-slab-impl.h index 557738df27..4a414ee905 100644 --- a/commit-slab-impl.h +++ b/commit-slab-impl.h @@ -1,8 +1,6 @@ #ifndef COMMIT_SLAB_IMPL_H #define COMMIT_SLAB_IMPL_H -#include "git-compat-util.h" - #define implement_static_commit_slab(slabname, elemtype) \ implement_commit_slab(slabname, elemtype, MAYBE_UNUSED static) @@ -2,6 +2,7 @@ #include "tag.h" #include "commit.h" #include "commit-graph.h" +#include "hex.h" #include "repository.h" #include "object-store.h" #include "pkt-line.h" @@ -801,7 +802,8 @@ int compare_commits_by_author_date(const void *a_, const void *b_, return 0; } -int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused) +int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, + void *unused UNUSED) { const struct commit *a = a_, *b = b_; const timestamp_t generation_a = commit_graph_generation(a), @@ -821,7 +823,8 @@ int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void return 0; } -int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused) +int compare_commits_by_commit_date(const void *a_, const void *b_, + void *unused UNUSED) { const struct commit *a = a_, *b = b_; /* newer commits with larger date first */ @@ -205,7 +205,6 @@ void free_commit_list(struct commit_list *list); struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */ -int has_non_ascii(const char *text); const char *logmsg_reencode(const struct commit *commit, char **commit_encoding, const char *output_encoding); diff --git a/compat/fsmonitor/fsm-ipc-darwin.c b/compat/fsmonitor/fsm-ipc-darwin.c index d67b0ee50d..eb25123fa1 100644 --- a/compat/fsmonitor/fsm-ipc-darwin.c +++ b/compat/fsmonitor/fsm-ipc-darwin.c @@ -1,5 +1,6 @@ #include "cache.h" #include "config.h" +#include "hex.h" #include "strbuf.h" #include "fsmonitor.h" #include "fsmonitor-ipc.h" diff --git a/compat/fsmonitor/fsm-ipc-win32.c b/compat/fsmonitor/fsm-ipc-win32.c index e08c505c14..c9536dfb66 100644 --- a/compat/fsmonitor/fsm-ipc-win32.c +++ b/compat/fsmonitor/fsm-ipc-win32.c @@ -1,3 +1,4 @@ +#include "git-compat-util.h" #include "config.h" #include "fsmonitor-ipc.h" diff --git a/compat/fsmonitor/fsm-settings-darwin.c b/compat/fsmonitor/fsm-settings-darwin.c index 6abbc7af3a..58b623fbb9 100644 --- a/compat/fsmonitor/fsm-settings-darwin.c +++ b/compat/fsmonitor/fsm-settings-darwin.c @@ -1,3 +1,4 @@ +#include "git-compat-util.h" #include "config.h" #include "fsmonitor.h" #include "fsmonitor-ipc.h" diff --git a/compat/mingw.c b/compat/mingw.c index e433740381..3afbde7894 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -7,6 +7,7 @@ #include "../strbuf.h" #include "../run-command.h" #include "../cache.h" +#include "../alloc.h" #include "win32/lazyload.h" #include "../config.h" #include "dir.h" @@ -5,11 +5,13 @@ * Copyright (C) Johannes Schindelin, 2005 * */ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "date.h" #include "branch.h" #include "config.h" #include "environment.h" +#include "ident.h" #include "repository.h" #include "lockfile.h" #include "exec-cmd.h" @@ -21,6 +23,7 @@ #include "utf8.h" #include "dir.h" #include "color.h" +#include "replace-object.h" #include "refs.h" #include "worktree.h" @@ -1,6 +1,7 @@ #include "git-compat-util.h" #include "cache.h" #include "config.h" +#include "hex.h" #include "pkt-line.h" #include "quote.h" #include "refs.h" diff --git a/connected.c b/connected.c index b90fd61790..39cb1e1074 100644 --- a/connected.c +++ b/connected.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "hex.h" #include "object-store.h" #include "run-command.h" #include "sigchain.h" @@ -1,5 +1,6 @@ #include "cache.h" #include "config.h" +#include "hex.h" #include "object-store.h" #include "attr.h" #include "run-command.h" diff --git a/credential.c b/credential.c index f32011343f..ea40a2a410 100644 --- a/credential.c +++ b/credential.c @@ -23,6 +23,7 @@ void credential_clear(struct credential *c) free(c->username); free(c->password); string_list_clear(&c->helpers, 0); + strvec_clear(&c->wwwauth_headers); credential_init(c); } @@ -280,6 +281,8 @@ void credential_write(const struct credential *c, FILE *fp) credential_write_item(fp, "password_expiry_utc", s, 0); free(s); } + for (size_t i = 0; i < c->wwwauth_headers.nr; i++) + credential_write_item(fp, "wwwauth[]", c->wwwauth_headers.v[i], 0); } static int run_credential_helper(struct credential *c, diff --git a/credential.h b/credential.h index 935b28a70f..2b5958cd43 100644 --- a/credential.h +++ b/credential.h @@ -2,6 +2,7 @@ #define CREDENTIAL_H #include "string-list.h" +#include "strvec.h" /** * The credentials API provides an abstracted way of gathering username and @@ -115,6 +116,20 @@ struct credential { */ struct string_list helpers; + /** + * A `strvec` of WWW-Authenticate header values. Each string + * is the value of a WWW-Authenticate header in an HTTP response, + * in the order they were received in the response. + */ + struct strvec wwwauth_headers; + + /** + * Internal use only. Keeps track of if we previously matched against a + * WWW-Authenticate header line in order to re-fold future continuation + * lines into one value. + */ + unsigned header_is_last_match:1; + unsigned approved:1, configured:1, quit:1, @@ -132,6 +147,7 @@ struct credential { #define CREDENTIAL_INIT { \ .helpers = STRING_LIST_INIT_DUP, \ .password_expiry_utc = TIME_MAX, \ + .wwwauth_headers = STRVEC_INIT, \ } /* Initialize a credential structure, setting all fields to empty. */ @@ -1,4 +1,5 @@ #include "cache.h" +#include "alloc.h" #include "config.h" #include "pkt-line.h" #include "run-command.h" @@ -928,7 +929,7 @@ static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen) add_child(&cld, addr, addrlen); } -static void child_handler(int signo) +static void child_handler(int signo UNUSED) { /* * Otherwise empty handler because systemcalls will get interrupted diff --git a/decorate.c b/decorate.c index 2036d15967..71e79daa82 100644 --- a/decorate.c +++ b/decorate.c @@ -2,7 +2,8 @@ * decorate.c - decorate a git object with some arbitrary * data. */ -#include "cache.h" +#include "git-compat-util.h" +#include "hashmap.h" #include "object.h" #include "decorate.h" diff --git a/delta-islands.c b/delta-islands.c index afdec0a878..fe12c93005 100644 --- a/delta-islands.c +++ b/delta-islands.c @@ -1,8 +1,10 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "attr.h" #include "object.h" #include "blob.h" #include "commit.h" +#include "hex.h" #include "tag.h" #include "tree.h" #include "delta.h" diff --git a/diagnose.c b/diagnose.c index 8f26569896..5b398f0cff 100644 --- a/diagnose.c +++ b/diagnose.c @@ -4,6 +4,7 @@ #include "archive.h" #include "dir.h" #include "help.h" +#include "hex.h" #include "strvec.h" #include "object-store.h" #include "packfile.h" @@ -43,7 +44,8 @@ int option_parse_diagnose(const struct option *opt, const char *arg, int unset) return error(_("invalid --%s value '%s'"), opt->long_name, arg); } -static void dir_file_stats_objects(const char *full_path, size_t full_path_len, +static void dir_file_stats_objects(const char *full_path, + size_t full_path_len UNUSED, const char *file_name, void *data) { struct strbuf *buf = data; diff --git a/diff-lib.c b/diff-lib.c index dec040c366..70b3578b90 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -6,6 +6,7 @@ #include "commit.h" #include "diff.h" #include "diffcore.h" +#include "hex.h" #include "revision.h" #include "cache-tree.h" #include "unpack-trees.h" diff --git a/diff-merges.c b/diff-merges.c index 85cbefa5af..ec97616db1 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -1,5 +1,7 @@ +#include "git-compat-util.h" #include "diff-merges.h" +#include "gettext.h" #include "revision.h" typedef void (*diff_merges_setup_func_t)(struct rev_info *); diff --git a/diff-no-index.c b/diff-no-index.c index 05fafd0019..a3cf358baf 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -13,7 +13,6 @@ #include "diffcore.h" #include "revision.h" #include "log-tree.h" -#include "builtin.h" #include "parse-options.h" #include "string-list.h" #include "dir.h" @@ -2,12 +2,14 @@ * Copyright (C) 2005 Junio C Hamano */ #include "cache.h" +#include "alloc.h" #include "config.h" #include "tempfile.h" #include "quote.h" #include "diff.h" #include "diffcore.h" #include "delta.h" +#include "hex.h" #include "xdiff-interface.h" #include "color.h" #include "attr.h" @@ -6,8 +6,8 @@ #include "tree-walk.h" #include "pathspec.h" -#include "object.h" #include "oidset.h" +#include "strbuf.h" /** * The diff API is for programs that compare two sets of files (e.g. two trees, @@ -71,7 +71,6 @@ struct oid_array; struct option; struct repository; struct rev_info; -struct strbuf; struct userdiff_driver; typedef int (*pathchange_fn_t)(struct diff_options *options, diff --git a/diffcore-delta.c b/diffcore-delta.c index 18d8f766d7..c30b56e983 100644 --- a/diffcore-delta.c +++ b/diffcore-delta.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "diff.h" #include "diffcore.h" diff --git a/diffcore-order.c b/diffcore-order.c index 19e73311f9..57ccab2846 100644 --- a/diffcore-order.c +++ b/diffcore-order.c @@ -1,7 +1,8 @@ /* * Copyright (C) 2005 Junio C Hamano */ -#include "cache.h" +#include "git-compat-util.h" +#include "gettext.h" #include "diff.h" #include "diffcore.h" diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index 03fcbcb40b..13c98a7b5e 100644 --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -2,12 +2,12 @@ * Copyright (C) 2005 Junio C Hamano * Copyright (C) 2010 Google Inc. */ -#include "cache.h" +#include "git-compat-util.h" #include "diff.h" #include "diffcore.h" #include "xdiff-interface.h" #include "kwset.h" -#include "commit.h" +#include "pretty.h" #include "quote.h" typedef int (*pickaxe_fn)(mmfile_t *one, mmfile_t *two, diff --git a/diffcore-rename.c b/diffcore-rename.c index c0422d9e70..7e9ff96d43 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -2,14 +2,19 @@ * * Copyright (C) 2005 Junio C Hamano */ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "diff.h" #include "diffcore.h" #include "object-store.h" #include "hashmap.h" +#include "mem-pool.h" +#include "oid-array.h" #include "progress.h" #include "promisor-remote.h" +#include "string-list.h" #include "strmap.h" +#include "trace2.h" /* Table of rename/copy destinations */ diff --git a/diffcore-rotate.c b/diffcore-rotate.c index 445f060ab0..533986cf63 100644 --- a/diffcore-rotate.c +++ b/diffcore-rotate.c @@ -2,7 +2,8 @@ * Copyright (C) 2021, Google LLC. * Based on diffcore-order.c, which is Copyright (C) 2005, Junio C Hamano */ -#include "cache.h" +#include "git-compat-util.h" +#include "gettext.h" #include "diff.h" #include "diffcore.h" diff --git a/diffcore.h b/diffcore.h index 9b588a1ee1..1701ed50b9 100644 --- a/diffcore.h +++ b/diffcore.h @@ -4,9 +4,11 @@ #ifndef DIFFCORE_H #define DIFFCORE_H -#include "cache.h" +#include "hash.h" struct diff_options; +struct mem_pool; +struct oid_array; struct repository; struct strintmap; struct strmap; diff --git a/dir-iterator.c b/dir-iterator.c index cedd304759..fb7c47f0e8 100644 --- a/dir-iterator.c +++ b/dir-iterator.c @@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "dir.h" #include "iterator.h" #include "dir-iterator.h" @@ -5,7 +5,8 @@ * Copyright (C) Linus Torvalds, 2005-2006 * Junio Hamano, 2005-2006 */ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" #include "dir.h" #include "object-store.h" @@ -1190,7 +1191,7 @@ struct pattern_list *add_pattern_list(struct dir_struct *dir, struct pattern_list *pl; struct exclude_list_group *group; - group = &dir->exclude_list_group[group_type]; + group = &dir->internal.exclude_list_group[group_type]; ALLOC_GROW(group->pl, group->nr + 1, group->alloc); pl = &group->pl[group->nr++]; memset(pl, 0, sizeof(*pl)); @@ -1211,7 +1212,7 @@ static void add_patterns_from_file_1(struct dir_struct *dir, const char *fname, * differently when dir->untracked is non-NULL. */ if (!dir->untracked) - dir->unmanaged_exclude_files++; + dir->internal.unmanaged_exclude_files++; pl = add_pattern_list(dir, EXC_FILE, fname); if (add_patterns(fname, "", 0, pl, NULL, 0, oid_stat) < 0) die(_("cannot use %s as an exclude file"), fname); @@ -1219,7 +1220,7 @@ static void add_patterns_from_file_1(struct dir_struct *dir, const char *fname, void add_patterns_from_file(struct dir_struct *dir, const char *fname) { - dir->unmanaged_exclude_files++; /* see validate_untracked_cache() */ + dir->internal.unmanaged_exclude_files++; /* see validate_untracked_cache() */ add_patterns_from_file_1(dir, fname, NULL); } @@ -1519,7 +1520,7 @@ static struct path_pattern *last_matching_pattern_from_lists( struct exclude_list_group *group; struct path_pattern *pattern; for (i = EXC_CMDL; i <= EXC_FILE; i++) { - group = &dir->exclude_list_group[i]; + group = &dir->internal.exclude_list_group[i]; for (j = group->nr - 1; j >= 0; j--) { pattern = last_matching_pattern_from_list( pathname, pathlen, basename, dtype_p, @@ -1545,20 +1546,20 @@ static void prep_exclude(struct dir_struct *dir, struct untracked_cache_dir *untracked; int current; - group = &dir->exclude_list_group[EXC_DIRS]; + group = &dir->internal.exclude_list_group[EXC_DIRS]; /* * Pop the exclude lists from the EXCL_DIRS exclude_list_group * which originate from directories not in the prefix of the * path being checked. */ - while ((stk = dir->exclude_stack) != NULL) { + while ((stk = dir->internal.exclude_stack) != NULL) { if (stk->baselen <= baselen && - !strncmp(dir->basebuf.buf, base, stk->baselen)) + !strncmp(dir->internal.basebuf.buf, base, stk->baselen)) break; - pl = &group->pl[dir->exclude_stack->exclude_ix]; - dir->exclude_stack = stk->prev; - dir->pattern = NULL; + pl = &group->pl[dir->internal.exclude_stack->exclude_ix]; + dir->internal.exclude_stack = stk->prev; + dir->internal.pattern = NULL; free((char *)pl->src); /* see strbuf_detach() below */ clear_pattern_list(pl); free(stk); @@ -1566,7 +1567,7 @@ static void prep_exclude(struct dir_struct *dir, } /* Skip traversing into sub directories if the parent is excluded */ - if (dir->pattern) + if (dir->internal.pattern) return; /* @@ -1574,12 +1575,12 @@ static void prep_exclude(struct dir_struct *dir, * memset(dir, 0, sizeof(*dir)) before use. Changing all of * them seems lots of work for little benefit. */ - if (!dir->basebuf.buf) - strbuf_init(&dir->basebuf, PATH_MAX); + if (!dir->internal.basebuf.buf) + strbuf_init(&dir->internal.basebuf, PATH_MAX); /* Read from the parent directories and push them down. */ current = stk ? stk->baselen : -1; - strbuf_setlen(&dir->basebuf, current < 0 ? 0 : current); + strbuf_setlen(&dir->internal.basebuf, current < 0 ? 0 : current); if (dir->untracked) untracked = stk ? stk->ucd : dir->untracked->root; else @@ -1599,32 +1600,33 @@ static void prep_exclude(struct dir_struct *dir, die("oops in prep_exclude"); cp++; untracked = - lookup_untracked(dir->untracked, untracked, + lookup_untracked(dir->untracked, + untracked, base + current, cp - base - current); } - stk->prev = dir->exclude_stack; + stk->prev = dir->internal.exclude_stack; stk->baselen = cp - base; stk->exclude_ix = group->nr; stk->ucd = untracked; pl = add_pattern_list(dir, EXC_DIRS, NULL); - strbuf_add(&dir->basebuf, base + current, stk->baselen - current); - assert(stk->baselen == dir->basebuf.len); + strbuf_add(&dir->internal.basebuf, base + current, stk->baselen - current); + assert(stk->baselen == dir->internal.basebuf.len); /* Abort if the directory is excluded */ if (stk->baselen) { int dt = DT_DIR; - dir->basebuf.buf[stk->baselen - 1] = 0; - dir->pattern = last_matching_pattern_from_lists(dir, + dir->internal.basebuf.buf[stk->baselen - 1] = 0; + dir->internal.pattern = last_matching_pattern_from_lists(dir, istate, - dir->basebuf.buf, stk->baselen - 1, - dir->basebuf.buf + current, &dt); - dir->basebuf.buf[stk->baselen - 1] = '/'; - if (dir->pattern && - dir->pattern->flags & PATTERN_FLAG_NEGATIVE) - dir->pattern = NULL; - if (dir->pattern) { - dir->exclude_stack = stk; + dir->internal.basebuf.buf, stk->baselen - 1, + dir->internal.basebuf.buf + current, &dt); + dir->internal.basebuf.buf[stk->baselen - 1] = '/'; + if (dir->internal.pattern && + dir->internal.pattern->flags & PATTERN_FLAG_NEGATIVE) + dir->internal.pattern = NULL; + if (dir->internal.pattern) { + dir->internal.exclude_stack = stk; return; } } @@ -1647,15 +1649,15 @@ static void prep_exclude(struct dir_struct *dir, */ !is_null_oid(&untracked->exclude_oid))) { /* - * dir->basebuf gets reused by the traversal, but we - * need fname to remain unchanged to ensure the src - * member of each struct path_pattern correctly + * dir->internal.basebuf gets reused by the traversal, + * but we need fname to remain unchanged to ensure the + * src member of each struct path_pattern correctly * back-references its source file. Other invocations * of add_pattern_list provide stable strings, so we * strbuf_detach() and free() here in the caller. */ struct strbuf sb = STRBUF_INIT; - strbuf_addbuf(&sb, &dir->basebuf); + strbuf_addbuf(&sb, &dir->internal.basebuf); strbuf_addstr(&sb, dir->exclude_per_dir); pl->src = strbuf_detach(&sb, NULL); add_patterns(pl->src, pl->src, stk->baselen, pl, istate, @@ -1681,10 +1683,10 @@ static void prep_exclude(struct dir_struct *dir, invalidate_gitignore(dir->untracked, untracked); oidcpy(&untracked->exclude_oid, &oid_stat.oid); } - dir->exclude_stack = stk; + dir->internal.exclude_stack = stk; current = stk->baselen; } - strbuf_setlen(&dir->basebuf, baselen); + strbuf_setlen(&dir->internal.basebuf, baselen); } /* @@ -1704,8 +1706,8 @@ struct path_pattern *last_matching_pattern(struct dir_struct *dir, prep_exclude(dir, istate, pathname, basename-pathname); - if (dir->pattern) - return dir->pattern; + if (dir->internal.pattern) + return dir->internal.pattern; return last_matching_pattern_from_lists(dir, istate, pathname, pathlen, basename, dtype_p); @@ -1742,7 +1744,7 @@ static struct dir_entry *dir_add_name(struct dir_struct *dir, if (index_file_exists(istate, pathname, len, ignore_case)) return NULL; - ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc); + ALLOC_GROW(dir->entries, dir->nr+1, dir->internal.alloc); return dir->entries[dir->nr++] = dir_entry_new(pathname, len); } @@ -1753,7 +1755,7 @@ struct dir_entry *dir_add_ignored(struct dir_struct *dir, if (!index_name_is_other(istate, pathname, len)) return NULL; - ALLOC_GROW(dir->ignored, dir->ignored_nr+1, dir->ignored_alloc); + ALLOC_GROW(dir->ignored, dir->ignored_nr+1, dir->internal.ignored_alloc); return dir->ignored[dir->ignored_nr++] = dir_entry_new(pathname, len); } @@ -2569,7 +2571,7 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, if (open_cached_dir(&cdir, dir, untracked, istate, &path, check_only)) goto out; - dir->visited_directories++; + dir->internal.visited_directories++; if (untracked) untracked->check_only = !!check_only; @@ -2578,7 +2580,7 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, /* check how the file or directory should be treated */ state = treat_path(dir, untracked, &cdir, istate, &path, baselen, pathspec); - dir->visited_paths++; + dir->internal.visited_paths++; if (state > dir_state) dir_state = state; @@ -2586,7 +2588,8 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, /* recurse into subdir if instructed by treat_path */ if (state == path_recurse) { struct untracked_cache_dir *ud; - ud = lookup_untracked(dir->untracked, untracked, + ud = lookup_untracked(dir->untracked, + untracked, path.buf + baselen, path.len - baselen); subdir_state = @@ -2846,7 +2849,7 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d * condition also catches running setup_standard_excludes() * before setting dir->untracked! */ - if (dir->unmanaged_exclude_files) + if (dir->internal.unmanaged_exclude_files) return NULL; /* @@ -2875,7 +2878,7 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d * EXC_CMDL is not considered in the cache. If people set it, * skip the cache. */ - if (dir->exclude_list_group[EXC_CMDL].nr) + if (dir->internal.exclude_list_group[EXC_CMDL].nr) return NULL; if (!ident_in_untracked(dir->untracked)) { @@ -2935,15 +2938,15 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d /* Validate $GIT_DIR/info/exclude and core.excludesfile */ root = dir->untracked->root; - if (!oideq(&dir->ss_info_exclude.oid, + if (!oideq(&dir->internal.ss_info_exclude.oid, &dir->untracked->ss_info_exclude.oid)) { invalidate_gitignore(dir->untracked, root); - dir->untracked->ss_info_exclude = dir->ss_info_exclude; + dir->untracked->ss_info_exclude = dir->internal.ss_info_exclude; } - if (!oideq(&dir->ss_excludes_file.oid, + if (!oideq(&dir->internal.ss_excludes_file.oid, &dir->untracked->ss_excludes_file.oid)) { invalidate_gitignore(dir->untracked, root); - dir->untracked->ss_excludes_file = dir->ss_excludes_file; + dir->untracked->ss_excludes_file = dir->internal.ss_excludes_file; } /* Make sure this directory is not dropped out at saving phase */ @@ -2969,9 +2972,9 @@ static void emit_traversal_statistics(struct dir_struct *dir, } trace2_data_intmax("read_directory", repo, - "directories-visited", dir->visited_directories); + "directories-visited", dir->internal.visited_directories); trace2_data_intmax("read_directory", repo, - "paths-visited", dir->visited_paths); + "paths-visited", dir->internal.visited_paths); if (!dir->untracked) return; @@ -2993,8 +2996,8 @@ int read_directory(struct dir_struct *dir, struct index_state *istate, struct untracked_cache_dir *untracked; trace2_region_enter("dir", "read_directory", istate->repo); - dir->visited_paths = 0; - dir->visited_directories = 0; + dir->internal.visited_paths = 0; + dir->internal.visited_directories = 0; if (has_symlink_leading_path(path, len)) { trace2_region_leave("dir", "read_directory", istate->repo); @@ -3342,14 +3345,14 @@ void setup_standard_excludes(struct dir_struct *dir) excludes_file = xdg_config_home("ignore"); if (excludes_file && !access_or_warn(excludes_file, R_OK, 0)) add_patterns_from_file_1(dir, excludes_file, - dir->untracked ? &dir->ss_excludes_file : NULL); + dir->untracked ? &dir->internal.ss_excludes_file : NULL); /* per repository user preference */ if (startup_info->have_repository) { const char *path = git_path_info_exclude(); if (!access_or_warn(path, R_OK, 0)) add_patterns_from_file_1(dir, path, - dir->untracked ? &dir->ss_info_exclude : NULL); + dir->untracked ? &dir->internal.ss_info_exclude : NULL); } } @@ -3405,7 +3408,7 @@ void dir_clear(struct dir_struct *dir) struct dir_struct new = DIR_INIT; for (i = EXC_CMDL; i <= EXC_FILE; i++) { - group = &dir->exclude_list_group[i]; + group = &dir->internal.exclude_list_group[i]; for (j = 0; j < group->nr; j++) { pl = &group->pl[j]; if (i == EXC_DIRS) @@ -3422,13 +3425,13 @@ void dir_clear(struct dir_struct *dir) free(dir->ignored); free(dir->entries); - stk = dir->exclude_stack; + stk = dir->internal.exclude_stack; while (stk) { struct exclude_stack *prev = stk->prev; free(stk); stk = prev; } - strbuf_release(&dir->basebuf); + strbuf_release(&dir->internal.basebuf); memcpy(dir, &new, sizeof(*dir)); } @@ -1,8 +1,9 @@ #ifndef DIR_H #define DIR_H -#include "cache.h" #include "hashmap.h" +#include "pathspec.h" +#include "statinfo.h" #include "strbuf.h" /** @@ -212,17 +213,6 @@ struct untracked_cache { */ struct dir_struct { - /* The number of members in `entries[]` array. */ - int nr; - - /* Internal use; keeps track of allocation of `entries[]` array.*/ - int alloc; - - /* The number of members in `ignored[]` array. */ - int ignored_nr; - - int ignored_alloc; - /* bit-field of options */ enum { @@ -287,60 +277,81 @@ struct dir_struct { DIR_SKIP_NESTED_GIT = 1<<9 } flags; + /* The number of members in `entries[]` array. */ + int nr; /* output only */ + + /* The number of members in `ignored[]` array. */ + int ignored_nr; /* output only */ + /* An array of `struct dir_entry`, each element of which describes a path. */ - struct dir_entry **entries; + struct dir_entry **entries; /* output only */ /** * used for ignored paths with the `DIR_SHOW_IGNORED_TOO` and * `DIR_COLLECT_IGNORED` flags. */ - struct dir_entry **ignored; + struct dir_entry **ignored; /* output only */ + + /* Enable/update untracked file cache if set */ + struct untracked_cache *untracked; /** - * The name of the file to be read in each directory for excluded files - * (typically `.gitignore`). + * Deprecated: ls-files is the only allowed caller; all other callers + * should leave this as NULL; it pre-dated the + * setup_standard_excludes() mechanism that replaces this. + * + * This field tracks the name of the file to be read in each directory + * for excluded files (typically `.gitignore`). */ const char *exclude_per_dir; - /* - * We maintain three groups of exclude pattern lists: - * - * EXC_CMDL lists patterns explicitly given on the command line. - * EXC_DIRS lists patterns obtained from per-directory ignore files. - * EXC_FILE lists patterns from fallback ignore files, e.g. - * - .git/info/exclude - * - core.excludesfile - * - * Each group contains multiple exclude lists, a single list - * per source. - */ + struct dir_struct_internal { + /* Keeps track of allocation of `entries[]` array.*/ + int alloc; + + /* Keeps track of allocation of `ignored[]` array. */ + int ignored_alloc; + + /* + * We maintain three groups of exclude pattern lists: + * + * EXC_CMDL lists patterns explicitly given on the command line. + * EXC_DIRS lists patterns obtained from per-directory ignore + * files. + * EXC_FILE lists patterns from fallback ignore files, e.g. + * - .git/info/exclude + * - core.excludesfile + * + * Each group contains multiple exclude lists, a single list + * per source. + */ #define EXC_CMDL 0 #define EXC_DIRS 1 #define EXC_FILE 2 - struct exclude_list_group exclude_list_group[3]; - - /* - * Temporary variables which are used during loading of the - * per-directory exclude lists. - * - * exclude_stack points to the top of the exclude_stack, and - * basebuf contains the full path to the current - * (sub)directory in the traversal. Exclude points to the - * matching exclude struct if the directory is excluded. - */ - struct exclude_stack *exclude_stack; - struct path_pattern *pattern; - struct strbuf basebuf; + struct exclude_list_group exclude_list_group[3]; - /* Enable untracked file cache if set */ - struct untracked_cache *untracked; - struct oid_stat ss_info_exclude; - struct oid_stat ss_excludes_file; - unsigned unmanaged_exclude_files; - - /* Stats about the traversal */ - unsigned visited_paths; - unsigned visited_directories; + /* + * Temporary variables which are used during loading of the + * per-directory exclude lists. + * + * exclude_stack points to the top of the exclude_stack, and + * basebuf contains the full path to the current + * (sub)directory in the traversal. Exclude points to the + * matching exclude struct if the directory is excluded. + */ + struct exclude_stack *exclude_stack; + struct path_pattern *pattern; + struct strbuf basebuf; + + /* Additional metadata related to 'untracked' */ + struct oid_stat ss_info_exclude; + struct oid_stat ss_excludes_file; + unsigned unmanaged_exclude_files; + + /* Stats about the traversal */ + unsigned visited_paths; + unsigned visited_directories; + } internal; }; #define DIR_INIT { 0 } @@ -363,10 +374,6 @@ int count_slashes(const char *s); int simple_length(const char *match); int no_wildcard(const char *string); char *common_prefix(const struct pathspec *pathspec); -int match_pathspec(struct index_state *istate, - const struct pathspec *pathspec, - const char *name, int namelen, - int prefix, char *seen, int is_dir); int report_path_error(const char *ps_matched, const struct pathspec *pathspec); int within_depth(const char *name, int namelen, int depth, int max_depth); @@ -533,15 +540,6 @@ int submodule_path_match(struct index_state *istate, const char *submodule_name, char *seen); -static inline int ce_path_match(struct index_state *istate, - const struct cache_entry *ce, - const struct pathspec *pathspec, - char *seen) -{ - return match_pathspec(istate, pathspec, ce->name, ce_namelen(ce), 0, seen, - S_ISDIR(ce->ce_mode) || S_ISGITLINK(ce->ce_mode)); -} - static inline int dir_path_match(struct index_state *istate, const struct dir_entry *ent, const struct pathspec *pathspec, @@ -2,6 +2,7 @@ #include "blob.h" #include "object-store.h" #include "dir.h" +#include "hex.h" #include "streaming.h" #include "submodule.h" #include "progress.h" @@ -1,9 +1,11 @@ #ifndef ENTRY_H #define ENTRY_H -#include "cache.h" #include "convert.h" +struct cache_entry; +struct index_state; + struct checkout { struct index_state *istate; const char *base_dir; diff --git a/environment.c b/environment.c index 1ee3686fd8..89d89110e4 100644 --- a/environment.c +++ b/environment.c @@ -17,6 +17,7 @@ #include "commit.h" #include "strvec.h" #include "object-store.h" +#include "replace-object.h" #include "tmp-objdir.h" #include "chdir-notify.h" #include "shallow.h" diff --git a/ewah/bitmap.c b/ewah/bitmap.c index ac61864163..12d6aa398e 100644 --- a/ewah/bitmap.c +++ b/ewah/bitmap.c @@ -16,7 +16,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "ewok.h" #define EWAH_MASK(x) ((eword_t)1 << (x % BITS_IN_EWORD)) diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c index 6fe48d3ae0..c6d4ffc87c 100644 --- a/ewah/ewah_bitmap.c +++ b/ewah/ewah_bitmap.c @@ -17,9 +17,9 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "git-compat-util.h" +#include "alloc.h" #include "ewok.h" #include "ewok_rlw.h" -#include "cache.h" static inline size_t min_size(size_t a, size_t b) { diff --git a/fetch-pack.c b/fetch-pack.c index 04016d1e32..4ddabb4ec7 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1,6 +1,8 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "repository.h" #include "config.h" +#include "hex.h" #include "lockfile.h" #include "refs.h" #include "pkt-line.h" @@ -722,7 +724,7 @@ static void filter_refs(struct fetch_pack_args *args, *refs = newlist; } -static void mark_alternate_complete(struct fetch_negotiator *unused, +static void mark_alternate_complete(struct fetch_negotiator *negotiator UNUSED, struct object *obj) { mark_complete(&obj->oid); diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index f48f44f9cd..24cc44bdbc 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -1,8 +1,11 @@ +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" #include "refs.h" #include "object-store.h" #include "diff.h" #include "diff-merges.h" +#include "hex.h" #include "revision.h" #include "tag.h" #include "string-list.h" @@ -17,8 +20,6 @@ static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP; int fmt_merge_msg_config(const char *key, const char *value, void *cb) { - int status = 0; - if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) { int is_bool; merge_log_config = git_config_bool_or_int(key, value, &is_bool); @@ -37,9 +38,6 @@ int fmt_merge_msg_config(const char *key, const char *value, void *cb) string_list_append(&suppress_dest_patterns, value); suppress_dest_pattern_seen = 1; } else { - status = git_gpg_config(key, value, NULL); - if (status) - return status; return git_default_config(key, value, cb); } return 0; @@ -1,4 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" +#include "hex.h" #include "object-store.h" #include "repository.h" #include "object.h" @@ -1,6 +1,7 @@ #ifndef GIT_FSCK_H #define GIT_FSCK_H +#include "object.h" #include "oidset.h" enum fsck_msg_type { diff --git a/fsmonitor-settings.c b/fsmonitor-settings.c index 899bfe9c81..b62acf44ae 100644 --- a/fsmonitor-settings.c +++ b/fsmonitor-settings.c @@ -1,5 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" +#include "gettext.h" #include "repository.h" #include "fsmonitor-ipc.h" #include "fsmonitor-settings.h" diff --git a/git-compat-util.h b/git-compat-util.h index 4f0028ce60..1e6592624d 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -1225,6 +1225,7 @@ extern const unsigned char tolower_trans_tbl[256]; #undef isxdigit extern const unsigned char sane_ctype[256]; +extern const signed char hexval_table[256]; #define GIT_SPACE 0x01 #define GIT_DIGIT 0x02 #define GIT_ALPHA 0x04 @@ -1287,6 +1288,25 @@ static inline int skip_iprefix(const char *str, const char *prefix, return 0; } +/* + * Like skip_prefix_mem, but compare case-insensitively. Note that the + * comparison is done via tolower(), so it is strictly ASCII (no multi-byte + * characters or locale-specific conversions). + */ +static inline int skip_iprefix_mem(const char *buf, size_t len, + const char *prefix, + const char **out, size_t *outlen) +{ + do { + if (!*prefix) { + *out = buf; + *outlen = len; + return 1; + } + } while (len-- > 0 && tolower(*buf++) == tolower(*prefix++)); + return 0; +} + static inline int strtoul_ui(char const *s, int base, unsigned int *result) { unsigned long ul; @@ -4,6 +4,7 @@ #include "help.h" #include "run-command.h" #include "alias.h" +#include "replace-object.h" #include "shallow.h" #define RUN_SETUP (1<<0) diff --git a/gpg-interface.c b/gpg-interface.c index 5cd66d3a78..855970bb93 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -4,11 +4,24 @@ #include "run-command.h" #include "strbuf.h" #include "dir.h" +#include "ident.h" #include "gpg-interface.h" #include "sigchain.h" #include "tempfile.h" #include "alias.h" +static int git_gpg_config(const char *, const char *, void *); + +static void gpg_interface_lazy_init(void) +{ + static int done; + + if (done) + return; + done = 1; + git_config(git_gpg_config, NULL); +} + static char *configured_signing_key; static const char *ssh_default_key_command, *ssh_allowed_signers, *ssh_revocation_file; static enum signature_trust_level configured_min_trust_level = TRUST_UNDEFINED; @@ -632,6 +645,8 @@ int check_signature(struct signature_check *sigc, struct gpg_format *fmt; int status; + gpg_interface_lazy_init(); + sigc->result = 'N'; sigc->trust_level = -1; @@ -695,11 +710,13 @@ int parse_signature(const char *buf, size_t size, struct strbuf *payload, struct void set_signing_key(const char *key) { + gpg_interface_lazy_init(); + free(configured_signing_key); configured_signing_key = xstrdup(key); } -int git_gpg_config(const char *var, const char *value, void *cb UNUSED) +static int git_gpg_config(const char *var, const char *value, void *cb UNUSED) { struct gpg_format *fmt = NULL; char *fmtname = NULL; @@ -888,6 +905,8 @@ static const char *get_ssh_key_id(void) { /* Returns a textual but unique representation of the signing key */ const char *get_signing_key_id(void) { + gpg_interface_lazy_init(); + if (use_format->get_key_id) { return use_format->get_key_id(); } @@ -898,6 +917,8 @@ const char *get_signing_key_id(void) const char *get_signing_key(void) { + gpg_interface_lazy_init(); + if (configured_signing_key) return configured_signing_key; if (use_format->get_default_key) { @@ -923,6 +944,8 @@ const char *gpg_trust_level_to_str(enum signature_trust_level level) int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key) { + gpg_interface_lazy_init(); + return use_format->sign_buffer(buffer, signature, signing_key); } diff --git a/gpg-interface.h b/gpg-interface.h index 8a9ef41779..143cdc1c02 100644 --- a/gpg-interface.h +++ b/gpg-interface.h @@ -79,7 +79,6 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature, */ const char *gpg_trust_level_to_str(enum signature_trust_level level); -int git_gpg_config(const char *, const char *, void *); void set_signing_key(const char *); const char *get_signing_key(void); @@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "gettext.h" #include "config.h" #include "commit.h" #include "color.h" @@ -1,6 +1,7 @@ #include "cache.h" #include "config.h" #include "grep.h" +#include "hex.h" #include "object-store.h" #include "userdiff.h" #include "xdiff-interface.h" @@ -1,7 +1,6 @@ #ifndef HASH_H #define HASH_H -#include "git-compat-util.h" #include "repository.h" #if defined(SHA1_APPLE) @@ -124,6 +123,40 @@ struct object_id { int algo; /* XXX requires 4-byte alignment */ }; +#define GET_OID_QUIETLY 01 +#define GET_OID_COMMIT 02 +#define GET_OID_COMMITTISH 04 +#define GET_OID_TREE 010 +#define GET_OID_TREEISH 020 +#define GET_OID_BLOB 040 +#define GET_OID_FOLLOW_SYMLINKS 0100 +#define GET_OID_RECORD_PATH 0200 +#define GET_OID_ONLY_TO_DIE 04000 +#define GET_OID_REQUIRE_PATH 010000 + +#define GET_OID_DISAMBIGUATORS \ + (GET_OID_COMMIT | GET_OID_COMMITTISH | \ + GET_OID_TREE | GET_OID_TREEISH | \ + GET_OID_BLOB) + +enum get_oid_result { + FOUND = 0, + MISSING_OBJECT = -1, /* The requested object is missing */ + SHORT_NAME_AMBIGUOUS = -2, + /* The following only apply when symlinks are followed */ + DANGLING_SYMLINK = -4, /* + * The initial symlink is there, but + * (transitively) points to a missing + * in-tree file + */ + SYMLINK_LOOP = -5, + NOT_DIR = -6, /* + * Somewhere along the symlink chain, a path is + * requested which contains a file as a + * non-final element. + */ +}; + /* A suitably aligned type for stack allocations of hash contexts. */ union git_hash_ctx { git_SHA_CTX sha1; @@ -1,7 +1,7 @@ /* * Generic implementation of hash-based key value mappings. */ -#include "cache.h" +#include "git-compat-util.h" #include "hashmap.h" #define FNV32_BASE ((unsigned int) 0x811c9dc5) @@ -1,9 +1,11 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" #include "builtin.h" #include "exec-cmd.h" #include "run-command.h" #include "levenshtein.h" +#include "gettext.h" #include "help.h" #include "command-list.h" #include "string-list.h" @@ -540,7 +542,8 @@ static struct cmdnames aliases; #define AUTOCORRECT_NEVER (-2) #define AUTOCORRECT_IMMEDIATELY (-1) -static int git_unknown_cmd_config(const char *var, const char *value, void *cb) +static int git_unknown_cmd_config(const char *var, const char *value, + void *cb UNUSED) { const char *p; @@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "hex.h" const signed char hexval_table[256] = { -1, -1, -1, -1, -1, -1, -1, -1, /* 00-07 */ @@ -0,0 +1,84 @@ +#ifndef HEX_H +#define HEX_H + +#include "hash.h" + +extern const signed char hexval_table[256]; +static inline unsigned int hexval(unsigned char c) +{ + return hexval_table[c]; +} + +/* + * Convert two consecutive hexadecimal digits into a char. Return a + * negative value on error. Don't run over the end of short strings. + */ +static inline int hex2chr(const char *s) +{ + unsigned int val = hexval(s[0]); + return (val & ~0xf) ? val : (val << 4) | hexval(s[1]); +} + +/* + * Try to read a SHA1 in hexadecimal format from the 40 characters + * starting at hex. Write the 20-byte result to sha1 in binary form. + * Return 0 on success. Reading stops if a NUL is encountered in the + * input, so it is safe to pass this function an arbitrary + * null-terminated string. + */ +int get_sha1_hex(const char *hex, unsigned char *sha1); +int get_oid_hex(const char *hex, struct object_id *sha1); + +/* Like get_oid_hex, but for an arbitrary hash algorithm. */ +int get_oid_hex_algop(const char *hex, struct object_id *oid, const struct git_hash_algo *algop); + +/* + * Read `len` pairs of hexadecimal digits from `hex` and write the + * values to `binary` as `len` bytes. Return 0 on success, or -1 if + * the input does not consist of hex digits). + */ +int hex_to_bytes(unsigned char *binary, const char *hex, size_t len); + +/* + * Convert a binary hash in "unsigned char []" or an object name in + * "struct object_id *" to its hex equivalent. The `_r` variant is reentrant, + * and writes the NUL-terminated output to the buffer `out`, which must be at + * least `GIT_MAX_HEXSZ + 1` bytes, and returns a pointer to out for + * convenience. + * + * The non-`_r` variant returns a static buffer, but uses a ring of 4 + * buffers, making it safe to make multiple calls for a single statement, like: + * + * printf("%s -> %s", hash_to_hex(one), hash_to_hex(two)); + * printf("%s -> %s", oid_to_hex(one), oid_to_hex(two)); + */ +char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash, const struct git_hash_algo *); +char *oid_to_hex_r(char *out, const struct object_id *oid); +char *hash_to_hex_algop(const unsigned char *hash, const struct git_hash_algo *); /* static buffer result! */ +char *hash_to_hex(const unsigned char *hash); /* same static buffer */ +char *oid_to_hex(const struct object_id *oid); /* same static buffer */ + +/* + * Parse a 40-character hexadecimal object ID starting from hex, updating the + * pointer specified by end when parsing stops. The resulting object ID is + * stored in oid. Returns 0 on success. Parsing will stop on the first NUL or + * other invalid character. end is only updated on success; otherwise, it is + * unmodified. + */ +int parse_oid_hex(const char *hex, struct object_id *oid, const char **end); + +/* Like parse_oid_hex, but for an arbitrary hash algorithm. */ +int parse_oid_hex_algop(const char *hex, struct object_id *oid, const char **end, + const struct git_hash_algo *algo); + + +/* + * These functions work like get_oid_hex and parse_oid_hex, but they will parse + * a hex value for any algorithm. The algorithm is detected based on the length + * and the algorithm in use is returned. If this is not a hex object ID in any + * algorithm, returns GIT_HASH_UNKNOWN. + */ +int get_oid_hex_any(const char *hex, struct object_id *oid); +int parse_oid_hex_any(const char *hex, struct object_id *oid, const char **end); + +#endif @@ -1,7 +1,10 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "advice.h" +#include "gettext.h" #include "hook.h" #include "run-command.h" #include "config.h" +#include "strbuf.h" const char *find_hook(const char *name) { @@ -43,9 +46,9 @@ int hook_exists(const char *name) } static int pick_next_hook(struct child_process *cp, - struct strbuf *out, + struct strbuf *out UNUSED, void *pp_cb, - void **pp_task_cb) + void **pp_task_cb UNUSED) { struct hook_cb_data *hook_cb = pp_cb; const char *hook_path = hook_cb->hook_path; @@ -77,9 +80,9 @@ static int pick_next_hook(struct child_process *cp, return 1; } -static int notify_start_failure(struct strbuf *out, +static int notify_start_failure(struct strbuf *out UNUSED, void *pp_cb, - void *pp_task_cp) + void *pp_task_cp UNUSED) { struct hook_cb_data *hook_cb = pp_cb; @@ -89,9 +92,9 @@ static int notify_start_failure(struct strbuf *out, } static int notify_hook_finished(int result, - struct strbuf *out, + struct strbuf *out UNUSED, void *pp_cb, - void *pp_task_cb) + void *pp_task_cb UNUSED) { struct hook_cb_data *hook_cb = pp_cb; struct run_hooks_opt *opt = hook_cb->options; diff --git a/http-backend.c b/http-backend.c index 8ab58e55f8..9cfc6f2541 100644 --- a/http-backend.c +++ b/http-backend.c @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" +#include "hex.h" #include "repository.h" #include "refs.h" #include "pkt-line.h" @@ -524,7 +526,7 @@ static int show_text_ref(const char *name, const struct object_id *oid, return 0; } -static void get_info_refs(struct strbuf *hdr, char *arg) +static void get_info_refs(struct strbuf *hdr, char *arg UNUSED) { const char *service_name = get_parameter("service"); struct strbuf buf = STRBUF_INIT; @@ -578,7 +580,7 @@ static int show_head_ref(const char *refname, const struct object_id *oid, return 0; } -static void get_head(struct strbuf *hdr, char *arg) +static void get_head(struct strbuf *hdr, char *arg UNUSED) { struct strbuf buf = STRBUF_INIT; @@ -588,7 +590,7 @@ static void get_head(struct strbuf *hdr, char *arg) strbuf_release(&buf); } -static void get_info_packs(struct strbuf *hdr, char *arg) +static void get_info_packs(struct strbuf *hdr, char *arg UNUSED) { size_t objdirlen = strlen(get_object_directory()); struct strbuf buf = STRBUF_INIT; @@ -736,7 +738,7 @@ static int bad_request(struct strbuf *hdr, const struct service_cmd *c) return 0; } -int cmd_main(int argc, const char **argv) +int cmd_main(int argc UNUSED, const char **argv UNUSED) { char *method = getenv("REQUEST_METHOD"); const char *proto_header; diff --git a/http-fetch.c b/http-fetch.c index 258fec2068..8db35b9767 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -1,6 +1,7 @@ #include "cache.h" #include "config.h" #include "exec-cmd.h" +#include "hex.h" #include "http.h" #include "walker.h" #include "strvec.h" diff --git a/http-push.c b/http-push.c index 7f71316456..88aa045ecb 100644 --- a/http-push.c +++ b/http-push.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "hex.h" #include "repository.h" #include "commit.h" #include "tag.h" diff --git a/http-walker.c b/http-walker.c index b8f0f98ae1..c3e902c40e 100644 --- a/http-walker.c +++ b/http-walker.c @@ -1,6 +1,7 @@ #include "cache.h" #include "repository.h" #include "commit.h" +#include "hex.h" #include "walker.h" #include "http.h" #include "list.h" @@ -1,5 +1,6 @@ #include "git-compat-util.h" #include "git-curl-compat.h" +#include "hex.h" #include "http.h" #include "config.h" #include "pack.h" @@ -181,6 +182,115 @@ size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_) return nmemb; } +/* + * A folded header continuation line starts with any number of spaces or + * horizontal tab characters (SP or HTAB) as per RFC 7230 section 3.2. + * It is not a continuation line if the line starts with any other character. + */ +static inline int is_hdr_continuation(const char *ptr, const size_t size) +{ + return size && (*ptr == ' ' || *ptr == '\t'); +} + +static size_t fwrite_wwwauth(char *ptr, size_t eltsize, size_t nmemb, void *p) +{ + size_t size = eltsize * nmemb; + struct strvec *values = &http_auth.wwwauth_headers; + struct strbuf buf = STRBUF_INIT; + const char *val; + size_t val_len; + + /* + * Header lines may not come NULL-terminated from libcurl so we must + * limit all scans to the maximum length of the header line, or leverage + * strbufs for all operations. + * + * In addition, it is possible that header values can be split over + * multiple lines as per RFC 7230. 'Line folding' has been deprecated + * but older servers may still emit them. A continuation header field + * value is identified as starting with a space or horizontal tab. + * + * The formal definition of a header field as given in RFC 7230 is: + * + * header-field = field-name ":" OWS field-value OWS + * + * field-name = token + * field-value = *( field-content / obs-fold ) + * field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ] + * field-vchar = VCHAR / obs-text + * + * obs-fold = CRLF 1*( SP / HTAB ) + * ; obsolete line folding + * ; see Section 3.2.4 + */ + + /* Start of a new WWW-Authenticate header */ + if (skip_iprefix_mem(ptr, size, "www-authenticate:", &val, &val_len)) { + strbuf_add(&buf, val, val_len); + + /* + * Strip the CRLF that should be present at the end of each + * field as well as any trailing or leading whitespace from the + * value. + */ + strbuf_trim(&buf); + + strvec_push(values, buf.buf); + http_auth.header_is_last_match = 1; + goto exit; + } + + /* + * This line could be a continuation of the previously matched header + * field. If this is the case then we should append this value to the + * end of the previously consumed value. + */ + if (http_auth.header_is_last_match && is_hdr_continuation(ptr, size)) { + /* + * Trim the CRLF and any leading or trailing from this line. + */ + strbuf_add(&buf, ptr, size); + strbuf_trim(&buf); + + /* + * At this point we should always have at least one existing + * value, even if it is empty. Do not bother appending the new + * value if this continuation header is itself empty. + */ + if (!values->nr) { + BUG("should have at least one existing header value"); + } else if (buf.len) { + char *prev = xstrdup(values->v[values->nr - 1]); + + /* Join two non-empty values with a single space. */ + const char *const sp = *prev ? " " : ""; + + strvec_pop(values); + strvec_pushf(values, "%s%s%s", prev, sp, buf.buf); + free(prev); + } + + goto exit; + } + + /* Not a continuation of a previously matched auth header line. */ + http_auth.header_is_last_match = 0; + + /* + * If this is a HTTP status line and not a header field, this signals + * a different HTTP response. libcurl writes all the output of all + * response headers of all responses, including redirects. + * We only care about the last HTTP request response's headers so clear + * the existing array. + */ + if (skip_iprefix_mem(ptr, size, "http/", &val, &val_len)) + strvec_clear(values); + +exit: + strbuf_release(&buf); + return size; +} + size_t fwrite_null(char *ptr, size_t eltsize, size_t nmemb, void *strbuf) { return nmemb; @@ -1895,6 +2005,8 @@ static int http_request(const char *url, fwrite_buffer); } + curl_easy_setopt(slot->curl, CURLOPT_HEADERFUNCTION, fwrite_wwwauth); + accept_language = http_get_accept_language_header(); if (accept_language) @@ -5,10 +5,13 @@ * * Copyright (C) 2005 Linus Torvalds */ -#include "cache.h" +#include "git-compat-util.h" +#include "ident.h" #include "config.h" #include "date.h" +#include "gettext.h" #include "mailmap.h" +#include "strbuf.h" static struct strbuf git_default_name = STRBUF_INIT; static struct strbuf git_default_email = STRBUF_INIT; diff --git a/ident.h b/ident.h new file mode 100644 index 0000000000..96a64896a0 --- /dev/null +++ b/ident.h @@ -0,0 +1,67 @@ +#ifndef IDENT_H +#define IDENT_H + +#include "string-list.h" + +struct ident_split { + const char *name_begin; + const char *name_end; + const char *mail_begin; + const char *mail_end; + const char *date_begin; + const char *date_end; + const char *tz_begin; + const char *tz_end; +}; + +#define IDENT_STRICT 1 +#define IDENT_NO_DATE 2 +#define IDENT_NO_NAME 4 + +enum want_ident { + WANT_BLANK_IDENT, + WANT_AUTHOR_IDENT, + WANT_COMMITTER_IDENT +}; + +const char *ident_default_name(void); +const char *ident_default_email(void); +/* + * Prepare an ident to fall back on if the user didn't configure it. + */ +void prepare_fallback_ident(const char *name, const char *email); +void reset_ident_date(void); +/* + * Signals an success with 0, but time part of the result may be NULL + * if the input lacks timestamp and zone + */ +int split_ident_line(struct ident_split *, const char *, int); + +/* + * Given a commit or tag object buffer and the commit or tag headers, replaces + * the idents in the headers with their canonical versions using the mailmap mechanism. + */ +void apply_mailmap_to_header(struct strbuf *, const char **, struct string_list *); + +/* + * Compare split idents for equality or strict ordering. Note that we + * compare only the ident part of the line, ignoring any timestamp. + * + * Because there are two fields, we must choose one as the primary key; we + * currently arbitrarily pick the email. + */ +int ident_cmp(const struct ident_split *, const struct ident_split *); + +const char *git_author_info(int); +const char *git_committer_info(int); +const char *fmt_ident(const char *name, const char *email, + enum want_ident whose_ident, + const char *date_str, int); +const char *fmt_name(enum want_ident); + +int committer_ident_sufficiently_given(void); +int author_ident_sufficiently_given(void); + +int git_ident_config(const char *, const char *, void *); + +#endif diff --git a/imap-send.c b/imap-send.c index a50af56b82..93e9018439 100644 --- a/imap-send.c +++ b/imap-send.c @@ -21,7 +21,7 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "credential.h" #include "exec-cmd.h" diff --git a/json-writer.c b/json-writer.c index f1cfd8fa8c..005c820aa4 100644 --- a/json-writer.c +++ b/json-writer.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "json-writer.h" void jw_init(struct json_writer *jw) @@ -26,7 +26,6 @@ #ifndef __AC_KHASH_H #define __AC_KHASH_H -#include "cache.h" #include "hashmap.h" #define AC_VERSION_KHASH_H "0.2.8" @@ -32,7 +32,7 @@ String Matching: An Aid to Bibliographic Search," CACM June 1975, Vol. 18, No. 6, which describes the failure function used below. */ -#include "cache.h" +#include "git-compat-util.h" #include "kwset.h" #include "compat/obstack.h" diff --git a/levenshtein.c b/levenshtein.c index d2632690d5..fd8026fe20 100644 --- a/levenshtein.c +++ b/levenshtein.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "levenshtein.h" /* diff --git a/line-log.c b/line-log.c index a7f3e7f6ce..6e7fc4b2e0 100644 --- a/line-log.c +++ b/line-log.c @@ -1,6 +1,8 @@ #include "git-compat-util.h" +#include "alloc.h" #include "line-range.h" #include "cache.h" +#include "hex.h" #include "tag.h" #include "blob.h" #include "tree.h" @@ -1281,7 +1283,8 @@ int line_log_process_ranges_arbitrary_commit(struct rev_info *rev, struct commit return changed; } -static enum rewrite_result line_log_rewrite_one(struct rev_info *rev, struct commit **pp) +static enum rewrite_result line_log_rewrite_one(struct rev_info *rev UNUSED, + struct commit **pp) { for (;;) { struct commit *p = *pp; diff --git a/line-log.h b/line-log.h index 82ae8d98a4..adff361b1b 100644 --- a/line-log.h +++ b/line-log.h @@ -5,6 +5,7 @@ struct rev_info; struct commit; +struct string_list; /* A range [start,end]. Lines are numbered starting at 0, and the * ranges include start but exclude end. */ diff --git a/linear-assignment.c b/linear-assignment.c index ecffc09be6..5416cbcf40 100644 --- a/linear-assignment.c +++ b/linear-assignment.c @@ -3,7 +3,7 @@ * algorithm for dense and sparse linear assignment problems</i>. Computing, * 38(4), 325-340. */ -#include "cache.h" +#include "git-compat-util.h" #include "linear-assignment.h" #define COST(column, row) cost[(column) + column_count * (row)] diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c index ee01bcd2cc..1d25a5737d 100644 --- a/list-objects-filter-options.c +++ b/list-objects-filter-options.c @@ -1,6 +1,8 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "commit.h" #include "config.h" +#include "gettext.h" #include "revision.h" #include "strvec.h" #include "list-objects.h" diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h index 1fe393f447..ef03b45132 100644 --- a/list-objects-filter-options.h +++ b/list-objects-filter-options.h @@ -1,9 +1,10 @@ #ifndef LIST_OBJECTS_FILTER_OPTIONS_H #define LIST_OBJECTS_FILTER_OPTIONS_H -#include "cache.h" +#include "object.h" #include "parse-options.h" #include "string-list.h" +#include "strbuf.h" /* * The list of defined filters for list-objects. diff --git a/list-objects-filter.c b/list-objects-filter.c index 7ed21cb299..5d7b331660 100644 --- a/list-objects-filter.c +++ b/list-objects-filter.c @@ -1,5 +1,7 @@ #include "cache.h" +#include "alloc.h" #include "dir.h" +#include "hex.h" #include "tag.h" #include "commit.h" #include "tree.h" diff --git a/list-objects.c b/list-objects.c index 7528fe1db2..ab5745bbfe 100644 --- a/list-objects.c +++ b/list-objects.c @@ -1,6 +1,7 @@ #include "cache.h" #include "tag.h" #include "commit.h" +#include "hex.h" #include "tree.h" #include "blob.h" #include "diff.h" diff --git a/log-tree.c b/log-tree.c index 1dd5fcbf7b..3adcb576e4 100644 --- a/log-tree.c +++ b/log-tree.c @@ -2,6 +2,7 @@ #include "commit-reach.h" #include "config.h" #include "diff.h" +#include "hex.h" #include "object-store.h" #include "repository.h" #include "tmp-objdir.h" @@ -12,6 +13,7 @@ #include "merge-ort.h" #include "reflog-walk.h" #include "refs.h" +#include "replace-object.h" #include "string-list.h" #include "color.h" #include "gpg-interface.h" @@ -196,7 +198,8 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid, return 0; } -static int add_graft_decoration(const struct commit_graft *graft, void *cb_data) +static int add_graft_decoration(const struct commit_graft *graft, + void *cb_data UNUSED) { struct commit *commit = lookup_commit(the_repository, &graft->oid); if (!commit) @@ -1,4 +1,5 @@ #include "cache.h" +#include "hex.h" #include "repository.h" #include "refs.h" #include "remote.h" @@ -8,38 +9,32 @@ #include "config.h" #include "string-list.h" -static int config_read; -static int advertise_unborn; -static int allow_unborn; - -static void ensure_config_read(void) +static enum { + UNBORN_IGNORE = 0, + UNBORN_ALLOW, + UNBORN_ADVERTISE /* implies ALLOW */ +} unborn_config(struct repository *r) { const char *str = NULL; - if (config_read) - return; - - if (repo_config_get_string_tmp(the_repository, "lsrefs.unborn", &str)) { + if (repo_config_get_string_tmp(r, "lsrefs.unborn", &str)) { /* * If there is no such config, advertise and allow it by * default. */ - advertise_unborn = 1; - allow_unborn = 1; + return UNBORN_ADVERTISE; } else { if (!strcmp(str, "advertise")) { - advertise_unborn = 1; - allow_unborn = 1; + return UNBORN_ADVERTISE; } else if (!strcmp(str, "allow")) { - allow_unborn = 1; + return UNBORN_ALLOW; } else if (!strcmp(str, "ignore")) { - /* do nothing */ + return UNBORN_IGNORE; } else { die(_("invalid value for '%s': '%s'"), "lsrefs.unborn", str); } } - config_read = 1; } /* @@ -159,7 +154,6 @@ int ls_refs(struct repository *r, struct packet_reader *request) strbuf_init(&data.buf, 0); string_list_init_dup(&data.hidden_refs); - ensure_config_read(); git_config(ls_refs_config, &data); while (packet_reader_read(request) == PACKET_READ_NORMAL) { @@ -175,7 +169,7 @@ int ls_refs(struct repository *r, struct packet_reader *request) strvec_push(&data.prefixes, out); } else if (!strcmp("unborn", arg)) - data.unborn = allow_unborn; + data.unborn = !!unborn_config(r); else die(_("unexpected line: '%s'"), arg); } @@ -206,11 +200,8 @@ int ls_refs(struct repository *r, struct packet_reader *request) int ls_refs_advertise(struct repository *r, struct strbuf *value) { - if (value) { - ensure_config_read(); - if (advertise_unborn) - strbuf_addstr(value, "unborn"); - } + if (value && unborn_config(r) == UNBORN_ADVERTISE) + strbuf_addstr(value, "unborn"); return 1; } diff --git a/mailinfo.c b/mailinfo.c index 833d28612f..9f1495ddcf 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" +#include "gettext.h" +#include "hex.h" #include "utf8.h" #include "strbuf.h" #include "mailinfo.h" diff --git a/match-trees.c b/match-trees.c index 49398e599f..c38dcbac7c 100644 --- a/match-trees.c +++ b/match-trees.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "hex.h" #include "tree.h" #include "tree-walk.h" #include "object-store.h" diff --git a/mem-pool.c b/mem-pool.c index 599d8e895f..c34846d176 100644 --- a/mem-pool.c +++ b/mem-pool.c @@ -2,7 +2,7 @@ * Memory Pool implementation logic. */ -#include "cache.h" +#include "git-compat-util.h" #include "mem-pool.h" #define BLOCK_GROWTH_SIZE (1024 * 1024 - sizeof(struct mp_block)) diff --git a/merge-blobs.c b/merge-blobs.c index 8138090f81..aedcab8113 100644 --- a/merge-blobs.c +++ b/merge-blobs.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "run-command.h" #include "xdiff-interface.h" #include "ll-merge.h" diff --git a/merge-ort.c b/merge-ort.c index d1611ca400..4c5be8ed91 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -26,6 +26,7 @@ #include "diff.h" #include "diffcore.h" #include "dir.h" +#include "hex.h" #include "entry.h" #include "ll-merge.h" #include "object-store.h" diff --git a/merge-recursive.c b/merge-recursive.c index ae469f8cc8..89731f4090 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -10,7 +10,6 @@ #include "alloc.h" #include "attr.h" #include "blob.h" -#include "builtin.h" #include "cache-tree.h" #include "commit.h" #include "commit-reach.h" @@ -18,6 +17,7 @@ #include "diff.h" #include "diffcore.h" #include "dir.h" +#include "hex.h" #include "ll-merge.h" #include "lockfile.h" #include "object-store.h" @@ -1,6 +1,7 @@ #include "cache.h" #include "diff.h" #include "diffcore.h" +#include "hex.h" #include "lockfile.h" #include "commit.h" #include "run-command.h" @@ -1,7 +1,9 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" #include "csum-file.h" #include "dir.h" +#include "hex.h" #include "lockfile.h" #include "packfile.h" #include "object-store.h" @@ -1607,7 +1609,7 @@ struct clear_midx_data { const char *ext; }; -static void clear_midx_file_ext(const char *full_path, size_t full_path_len, +static void clear_midx_file_ext(const char *full_path, size_t full_path_len UNUSED, const char *file_name, void *_data) { struct clear_midx_data *data = _data; diff --git a/negotiator/noop.c b/negotiator/noop.c index 60569b8350..7b72937686 100644 --- a/negotiator/noop.c +++ b/negotiator/noop.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "noop.h" #include "../commit.h" #include "../fetch-negotiator.h" diff --git a/negotiator/skipping.c b/negotiator/skipping.c index 0f5ac48e87..264acf8bbe 100644 --- a/negotiator/skipping.c +++ b/negotiator/skipping.c @@ -2,6 +2,7 @@ #include "skipping.h" #include "../commit.h" #include "../fetch-negotiator.h" +#include "../hex.h" #include "../prio-queue.h" #include "../refs.h" #include "../tag.h" @@ -50,7 +51,7 @@ struct data { int non_common_revs; }; -static int compare(const void *a_, const void *b_, void *unused) +static int compare(const void *a_, const void *b_, void *data UNUSED) { const struct entry *a = a_; const struct entry *b = b_; diff --git a/notes-merge.c b/notes-merge.c index b4cc594a79..5b1a9ff13f 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -5,6 +5,7 @@ #include "repository.h" #include "diff.h" #include "diffcore.h" +#include "hex.h" #include "xdiff-interface.h" #include "ll-merge.h" #include "dir.h" @@ -1,5 +1,6 @@ #include "cache.h" #include "config.h" +#include "hex.h" #include "notes.h" #include "object-store.h" #include "blob.h" @@ -752,7 +753,7 @@ static int write_each_non_note_until(const char *note_path, return 0; } -static int write_each_note(const struct object_id *object_oid, +static int write_each_note(const struct object_id *object_oid UNUSED, const struct object_id *note_oid, char *note_path, void *cb_data) { @@ -780,8 +781,9 @@ struct note_delete_list { }; static int prune_notes_helper(const struct object_id *object_oid, - const struct object_id *note_oid, char *note_path, - void *cb_data) + const struct object_id *note_oid UNUSED, + char *note_path UNUSED, + void *cb_data) { struct note_delete_list **l = (struct note_delete_list **) cb_data; struct note_delete_list *n; @@ -848,8 +850,8 @@ int combine_notes_overwrite(struct object_id *cur_oid, return 0; } -int combine_notes_ignore(struct object_id *cur_oid, - const struct object_id *new_oid) +int combine_notes_ignore(struct object_id *cur_oid UNUSED, + const struct object_id *new_oid UNUSED) { return 0; } diff --git a/object-file.c b/object-file.c index 939865c1ae..8fab8dbe80 100644 --- a/object-file.c +++ b/object-file.c @@ -6,8 +6,10 @@ * This handles basic git object files - packing, unpacking, * creation etc. */ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" +#include "hex.h" #include "string-list.h" #include "lockfile.h" #include "delta.h" @@ -2644,7 +2646,8 @@ int for_each_loose_object(each_loose_object_fn cb, void *data, return 0; } -static int append_loose_object(const struct object_id *oid, const char *path, +static int append_loose_object(const struct object_id *oid, + const char *path UNUSED, void *data) { oidtree_insert(data, oid); diff --git a/object-name.c b/object-name.c index 2dd1a0f56e..69db1ec498 100644 --- a/object-name.c +++ b/object-name.c @@ -1,5 +1,6 @@ #include "cache.h" #include "config.h" +#include "hex.h" #include "tag.h" #include "commit.h" #include "tree.h" @@ -223,7 +224,7 @@ static int finish_object_disambiguation(struct disambiguate_state *ds, static int disambiguate_commit_only(struct repository *r, const struct object_id *oid, - void *cb_data_unused) + void *cb_data UNUSED) { int kind = oid_object_info(r, oid, NULL); return kind == OBJ_COMMIT; @@ -231,7 +232,7 @@ static int disambiguate_commit_only(struct repository *r, static int disambiguate_committish_only(struct repository *r, const struct object_id *oid, - void *cb_data_unused) + void *cb_data UNUSED) { struct object *obj; int kind; @@ -251,7 +252,7 @@ static int disambiguate_committish_only(struct repository *r, static int disambiguate_tree_only(struct repository *r, const struct object_id *oid, - void *cb_data_unused) + void *cb_data UNUSED) { int kind = oid_object_info(r, oid, NULL); return kind == OBJ_TREE; @@ -259,7 +260,7 @@ static int disambiguate_tree_only(struct repository *r, static int disambiguate_treeish_only(struct repository *r, const struct object_id *oid, - void *cb_data_unused) + void *cb_data UNUSED) { struct object *obj; int kind; @@ -279,7 +280,7 @@ static int disambiguate_treeish_only(struct repository *r, static int disambiguate_blob_only(struct repository *r, const struct object_id *oid, - void *cb_data_unused) + void *cb_data UNUSED) { int kind = oid_object_info(r, oid, NULL); return kind == OBJ_BLOB; @@ -473,7 +474,7 @@ static int collect_ambiguous(const struct object_id *oid, void *data) return 0; } -static int repo_collect_ambiguous(struct repository *r, +static int repo_collect_ambiguous(struct repository *r UNUSED, const struct object_id *oid, void *data) { @@ -665,7 +666,7 @@ static int extend_abbrev_len(const struct object_id *oid, void *cb_data) return 0; } -static int repo_extend_abbrev_len(struct repository *r, +static int repo_extend_abbrev_len(struct repository *r UNUSED, const struct object_id *oid, void *cb_data) { diff --git a/object-store.h b/object-store.h index 1a713d89d7..82201ec3e7 100644 --- a/object-store.h +++ b/object-store.h @@ -1,7 +1,7 @@ #ifndef OBJECT_STORE_H #define OBJECT_STORE_H -#include "cache.h" +#include "object.h" #include "oidmap.h" #include "list.h" #include "oid-array.h" @@ -284,6 +284,69 @@ int pretend_object_file(void *, unsigned long, enum object_type, int force_object_loose(const struct object_id *oid, time_t mtime); +struct object_info { + /* Request */ + enum object_type *typep; + unsigned long *sizep; + off_t *disk_sizep; + struct object_id *delta_base_oid; + struct strbuf *type_name; + void **contentp; + + /* Response */ + enum { + OI_CACHED, + OI_LOOSE, + OI_PACKED, + OI_DBCACHED + } whence; + union { + /* + * struct { + * ... Nothing to expose in this case + * } cached; + * struct { + * ... Nothing to expose in this case + * } loose; + */ + struct { + struct packed_git *pack; + off_t offset; + unsigned int is_delta; + } packed; + } u; +}; + +/* + * Initializer for a "struct object_info" that wants no items. You may + * also memset() the memory to all-zeroes. + */ +#define OBJECT_INFO_INIT { 0 } + +/* Invoke lookup_replace_object() on the given hash */ +#define OBJECT_INFO_LOOKUP_REPLACE 1 +/* Allow reading from a loose object file of unknown/bogus type */ +#define OBJECT_INFO_ALLOW_UNKNOWN_TYPE 2 +/* Do not retry packed storage after checking packed and loose storage */ +#define OBJECT_INFO_QUICK 8 +/* + * Do not attempt to fetch the object if missing (even if fetch_is_missing is + * nonzero). + */ +#define OBJECT_INFO_SKIP_FETCH_OBJECT 16 +/* + * This is meant for bulk prefetching of missing blobs in a partial + * clone. Implies OBJECT_INFO_SKIP_FETCH_OBJECT and OBJECT_INFO_QUICK + */ +#define OBJECT_INFO_FOR_PREFETCH (OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK) + +/* Die if object corruption (not just an object being missing) was detected. */ +#define OBJECT_INFO_DIE_IF_CORRUPT 32 + +int oid_object_info_extended(struct repository *r, + const struct object_id *, + struct object_info *, unsigned flags); + /* * Open the loose object at path, check its hash, and return the contents, * use the "oi" argument to assert things about the object, or e.g. populate its @@ -381,69 +444,6 @@ static inline void obj_read_unlock(void) pthread_mutex_unlock(&obj_read_mutex); } -struct object_info { - /* Request */ - enum object_type *typep; - unsigned long *sizep; - off_t *disk_sizep; - struct object_id *delta_base_oid; - struct strbuf *type_name; - void **contentp; - - /* Response */ - enum { - OI_CACHED, - OI_LOOSE, - OI_PACKED, - OI_DBCACHED - } whence; - union { - /* - * struct { - * ... Nothing to expose in this case - * } cached; - * struct { - * ... Nothing to expose in this case - * } loose; - */ - struct { - struct packed_git *pack; - off_t offset; - unsigned int is_delta; - } packed; - } u; -}; - -/* - * Initializer for a "struct object_info" that wants no items. You may - * also memset() the memory to all-zeroes. - */ -#define OBJECT_INFO_INIT { 0 } - -/* Invoke lookup_replace_object() on the given hash */ -#define OBJECT_INFO_LOOKUP_REPLACE 1 -/* Allow reading from a loose object file of unknown/bogus type */ -#define OBJECT_INFO_ALLOW_UNKNOWN_TYPE 2 -/* Do not retry packed storage after checking packed and loose storage */ -#define OBJECT_INFO_QUICK 8 -/* - * Do not attempt to fetch the object if missing (even if fetch_is_missing is - * nonzero). - */ -#define OBJECT_INFO_SKIP_FETCH_OBJECT 16 -/* - * This is meant for bulk prefetching of missing blobs in a partial - * clone. Implies OBJECT_INFO_SKIP_FETCH_OBJECT and OBJECT_INFO_QUICK - */ -#define OBJECT_INFO_FOR_PREFETCH (OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK) - -/* Die if object corruption (not just an object being missing) was detected. */ -#define OBJECT_INFO_DIE_IF_CORRUPT 32 - -int oid_object_info_extended(struct repository *r, - const struct object_id *, - struct object_info *, unsigned flags); - /* * Iterate over the files in the loose-object parts of the object * directory "path", triggering the following callbacks: @@ -1,4 +1,5 @@ #include "cache.h" +#include "hex.h" #include "object.h" #include "replace-object.h" #include "object-store.h" @@ -1,7 +1,7 @@ #ifndef OBJECT_H #define OBJECT_H -#include "cache.h" +#include "hash.h" struct buffer_slab; @@ -81,6 +81,26 @@ struct object_array { */ #define FLAG_BITS 28 +#define TYPE_BITS 3 + +/* + * Values in this enum (except those outside the 3 bit range) are part + * of pack file format. See gitformat-pack(5) for more information. + */ +enum object_type { + OBJ_BAD = -1, + OBJ_NONE = 0, + OBJ_COMMIT = 1, + OBJ_TREE = 2, + OBJ_BLOB = 3, + OBJ_TAG = 4, + /* 5 for future expansion */ + OBJ_OFS_DELTA = 6, + OBJ_REF_DELTA = 7, + OBJ_ANY, + OBJ_MAX +}; + /* * The object type is stored in 3 bits. */ diff --git a/oid-array.c b/oid-array.c index 73ba76e9e9..e8228c777b 100644 --- a/oid-array.c +++ b/oid-array.c @@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "oid-array.h" #include "hash-lookup.h" @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "oidmap.h" static int oidmap_neq(const void *hashmap_cmp_fn_data UNUSED, @@ -1,7 +1,6 @@ #ifndef OIDMAP_H #define OIDMAP_H -#include "cache.h" #include "hashmap.h" /* @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" #include "oidset.h" +#include "hex.h" +#include "strbuf.h" void oidset_init(struct oidset *set, size_t initial_size) { @@ -2,6 +2,7 @@ * A wrapper around cbtree which stores oids * May be used to replace oid-array for prefix (abbreviation) matches */ +#include "git-compat-util.h" #include "oidtree.h" #include "alloc.h" #include "hash.h" diff --git a/oss-fuzz/fuzz-commit-graph.c b/oss-fuzz/fuzz-commit-graph.c index 914026f5d8..2992079dd9 100644 --- a/oss-fuzz/fuzz-commit-graph.c +++ b/oss-fuzz/fuzz-commit-graph.c @@ -1,3 +1,4 @@ +#include "git-compat-util.h" #include "commit-graph.h" #include "repository.h" diff --git a/oss-fuzz/fuzz-pack-headers.c b/oss-fuzz/fuzz-pack-headers.c index 99da1d0fd3..150c0f5fa2 100644 --- a/oss-fuzz/fuzz-pack-headers.c +++ b/oss-fuzz/fuzz-pack-headers.c @@ -1,3 +1,4 @@ +#include "git-compat-util.h" #include "packfile.h" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); diff --git a/oss-fuzz/fuzz-pack-idx.c b/oss-fuzz/fuzz-pack-idx.c index 0c3d777aac..609a343ee3 100644 --- a/oss-fuzz/fuzz-pack-idx.c +++ b/oss-fuzz/fuzz-pack-idx.c @@ -1,3 +1,4 @@ +#include "git-compat-util.h" #include "object-store.h" #include "packfile.h" diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index cfa67a510f..891d9d2772 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -1,4 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" +#include "hex.h" #include "object-store.h" #include "commit.h" #include "tag.h" diff --git a/pack-bitmap.c b/pack-bitmap.c index d2a42abf28..ca7c81b5c9 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "commit.h" +#include "hex.h" #include "strbuf.h" #include "tag.h" #include "diff.h" @@ -951,7 +953,8 @@ static void show_object(struct object *object, const char *name, void *data_) bitmap_set(data->base, bitmap_pos); } -static void show_commit(struct commit *commit, void *data) +static void show_commit(struct commit *commit UNUSED, + void *data UNUSED) { } @@ -1940,7 +1943,8 @@ static void test_bitmap_type(struct bitmap_test_data *tdata, type_name(bitmap_type)); } -static void test_show_object(struct object *object, const char *name, +static void test_show_object(struct object *object, + const char *name UNUSED, void *data) { struct bitmap_test_data *tdata = data; diff --git a/pack-check.c b/pack-check.c index bfb593ba72..7ed594d667 100644 --- a/pack-check.c +++ b/pack-check.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "hex.h" #include "repository.h" #include "pack.h" #include "pack-revindex.h" diff --git a/pack-mtimes.h b/pack-mtimes.h index cc957b3e85..107327cec0 100644 --- a/pack-mtimes.h +++ b/pack-mtimes.h @@ -1,8 +1,6 @@ #ifndef PACK_MTIMES_H #define PACK_MTIMES_H -#include "git-compat-util.h" - #define MTIMES_SIGNATURE 0x4d544d45 /* "MTME" */ #define MTIMES_VERSION 1 diff --git a/pack-objects.c b/pack-objects.c index 272e8d4517..ccab09fe65 100644 --- a/pack-objects.c +++ b/pack-objects.c @@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "object.h" #include "pack.h" #include "pack-objects.h" diff --git a/pack-write.c b/pack-write.c index 3363729748..041e573bc1 100644 --- a/pack-write.c +++ b/pack-write.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "hex.h" #include "pack.h" #include "csum-file.h" #include "remote.h" diff --git a/packfile.c b/packfile.c index 79e21ab18e..fc2d7c2190 100644 --- a/packfile.c +++ b/packfile.c @@ -1,4 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" +#include "hex.h" #include "list.h" #include "pack.h" #include "repository.h" @@ -2204,8 +2206,8 @@ int for_each_packed_object(each_packed_object_fn cb, void *data, } static int add_promisor_object(const struct object_id *oid, - struct packed_git *pack, - uint32_t pos, + struct packed_git *pack UNUSED, + uint32_t pos UNUSED, void *set_) { struct oidset *set = set_; diff --git a/parallel-checkout.c b/parallel-checkout.c index 4f6819f240..2455aa356d 100644 --- a/parallel-checkout.c +++ b/parallel-checkout.c @@ -1,6 +1,8 @@ #include "cache.h" +#include "alloc.h" #include "config.h" #include "entry.h" +#include "hex.h" #include "parallel-checkout.h" #include "pkt-line.h" #include "progress.h" diff --git a/patch-ids.c b/patch-ids.c index 3153446626..a4473a88fa 100644 --- a/patch-ids.c +++ b/patch-ids.c @@ -2,6 +2,7 @@ #include "diff.h" #include "commit.h" #include "hash-lookup.h" +#include "hex.h" #include "patch-ids.h" static int patch_id_defined(struct commit *commit) @@ -2,6 +2,7 @@ * Utilities for paths and pathnames */ #include "cache.h" +#include "hex.h" #include "repository.h" #include "strbuf.h" #include "string-list.h" @@ -347,7 +348,8 @@ static void init_common_trie(void) * Helper function for update_common_dir: returns 1 if the dir * prefix is common. */ -static int check_common(const char *unmatched, void *value, void *baton) +static int check_common(const char *unmatched, void *value, + void *baton UNUSED) { struct common_dir *dir = value; diff --git a/pathspec.h b/pathspec.h index 41f6adfbb4..a5b38e0907 100644 --- a/pathspec.h +++ b/pathspec.h @@ -171,6 +171,11 @@ int match_pathspec_attrs(struct index_state *istate, const char *name, int namelen, const struct pathspec_item *item); +int match_pathspec(struct index_state *istate, + const struct pathspec *pathspec, + const char *name, int namelen, + int prefix, char *seen, int is_dir); + /* * Determine whether a pathspec will match only entire index entries (non-sparse * files and/or entire sparse directories). If the pathspec has the potential to diff --git a/pkt-line.c b/pkt-line.c index ce4e73b683..1ea7f8600e 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -1,5 +1,6 @@ #include "cache.h" #include "pkt-line.h" +#include "hex.h" #include "run-command.h" char packet_buffer[LARGE_PACKET_MAX]; diff --git a/pkt-line.h b/pkt-line.h index 79c538b99e..8e9846f315 100644 --- a/pkt-line.h +++ b/pkt-line.h @@ -1,7 +1,6 @@ #ifndef PKTLINE_H #define PKTLINE_H -#include "git-compat-util.h" #include "strbuf.h" #include "sideband.h" @@ -1,7 +1,7 @@ # Bulgarian translation of git po-file. -# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Alexander Shopov <ash@kambanaria.org>. +# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Alexander Shopov <ash@kambanaria.org>. # This file is distributed under the same license as the git package. -# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022. +# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023. # ======================== # DICTIONARY TO MERGE IN GIT GUI # ------------------------ @@ -196,6 +196,10 @@ # scalar repo Ñкаларно хранилище # unclean завършвам работа/задача Ñ Ð³Ñ€ÐµÑˆÐºÐ° # cache tree кеш за обекти-дървета +# gitattributes file файл Ñ Ð°Ñ‚Ñ€Ð¸Ð±ÑƒÑ‚Ð¸ на git +# advertised обÑвен за наличен +# superproject Ñвръхпроект +# # ------------------------ # „$var“ - може да не Ñработва за shell има gettext и eval_gettext - проверка - намират Ñе леÑно по „$ # ------------------------ @@ -212,10 +216,10 @@ # for i in `sort -u FILES`; do cnt=`grep $i FILES | wc -l`; echo $cnt $i ;done | sort -n msgid "" msgstr "" -"Project-Id-Version: git 2.39\n" +"Project-Id-Version: git 2.40\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-12-06 15:52+0100\n" -"PO-Revision-Date: 2022-12-06 16:55+0200\n" +"POT-Creation-Date: 2023-03-01 01:20+0000\n" +"PO-Revision-Date: 2023-03-02 08:54+0200\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -250,13 +254,13 @@ msgstr "неуÑпешно добавÑне в индекÑа на „%s“" msgid "could not write index" msgstr "индекÑÑŠÑ‚ не може да бъде запиÑан" -#, c-format, perl-format +#, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "%d файл обновен\n" msgstr[1] "%d файла обновени\n" -#, c-format, perl-format +#, c-format msgid "note: %s is untracked now.\n" msgstr "БЕЛЕЖКÐ: „%s“ вече не Ñе Ñледи.\n" @@ -270,7 +274,7 @@ msgstr "ОтмÑна" msgid "Could not parse HEAD^{tree}" msgstr "УказателÑÑ‚ „HEAD^{tree}“ не може да бъде анализиран" -#, c-format, perl-format +#, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "%d файл Ñ Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð¸ промѐни\n" @@ -283,7 +287,7 @@ msgstr "ÐÑма неÑледени файлове.\n" msgid "Add untracked" msgstr "ДобавÑне на неÑледени" -#, c-format, perl-format +#, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "%d файл добавен\n" @@ -377,19 +381,19 @@ msgstr "индекÑÑŠÑ‚ не може да бъде обновен" msgid "Bye.\n" msgstr "Изход.\n" -#, c-format, perl-format +#, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "ДобавÑне на промÑната на права̀та за доÑтъп [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "ДобавÑне на изтриването [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "ДобавÑне на добавÑнето [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "ДобавÑне на това парче [y,n,q,a,d%s,?]? " @@ -413,19 +417,19 @@ msgstr "" "a — добавÑне на това и вÑички Ñледващи парчета от файла в индекÑа\n" "d — без добавÑне на това и вÑички Ñледващи парчета от файла в индекÑа\n" -#, c-format, perl-format +#, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Скатаване на промÑната на права̀та за доÑтъп [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Скатаване на добавÑнето [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? " @@ -449,19 +453,19 @@ msgstr "" "a — Ñкатаване на това и вÑички Ñледващи парчета от файла\n" "d — без Ñкатаване на това и вÑички Ñледващи парчета от файла\n" -#, c-format, perl-format +#, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Изваждане на промÑната на права̀та за доÑтъп [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Изваждане на добавÑнето [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? " @@ -485,20 +489,20 @@ msgstr "" "a — изваждане на това и вÑички Ñледващи парчета от файла от индекÑа\n" "d — без изваждане на това и вÑички Ñледващи парчета от файла от индекÑа\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "" "Прилагане на промÑната на права̀та за доÑтъп към индекÑа [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Прилагане на изтриването към индекÑа [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Прилагане на добавÑнето към индекÑа [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Прилагане на това парче към индекÑа [y,n,q,a,d%s,?]? " @@ -522,21 +526,21 @@ msgstr "" "a — прилагане на това и вÑички Ñледващи парчета от файла към индекÑа\n" "d — без прилагане на това и вÑички Ñледващи парчета от файла към индекÑа\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "" "Премахване на промÑната в права̀та за доÑтъп от работното дърво [y,n,q,a," "d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Премахване на добавÑнето от работното дърво [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? " @@ -563,23 +567,23 @@ msgstr "" "d — без премахване на това и вÑички Ñледващи парчета от файла от работното " "дърво\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Премахване на промÑната в права̀та за доÑтъп от индекÑа и работното дърво [y," "n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Премахване на изтриването от индекÑа и работното дърво [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Премахване на добавÑнето от индекÑа и работното дърво [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "Премахване на парчето от индекÑа и работното дърво [y,n,q,a,d%s,?]? " @@ -599,22 +603,22 @@ msgstr "" "d — без премахване на това и вÑички Ñледващи парчета от файла от индекÑа и " "работното дърво\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Прилагане на промÑната в права̀та за доÑтъп от индекÑа и работното дърво [y,n," "q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Прилагане на изтриването от индекÑа и работното дърво [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на добавÑнето от индекÑа и работното дърво [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на парчето от индекÑа и работното дърво [y,n,q,a,d%s,?]? " @@ -634,21 +638,21 @@ msgstr "" "d — без прилагане на това и вÑички Ñледващи парчета от файла от индекÑа и " "работното дърво\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" "Прилагане на промÑната в права̀та за доÑтъп към работното дърво [y,n,q,a," "d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на добавÑнето към работното дърво [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Прилагане на парчето към работното дърво [y,n,q,a,d%s,?]? " @@ -725,8 +729,6 @@ msgstr "" "За да пропуÑнете редовете, започващи Ñ â€ž%c“: изтрийте ги.\n" "Редовете, които започват Ñ â€ž%c“ ще бъдат пропуÑнати.\n" -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -742,20 +744,12 @@ msgstr "заглавната чаÑÑ‚ парчето не може да Ñе аРmsgid "'git apply --cached' failed" msgstr "неуÑпешно изпълнение на „git apply --cached“" -#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -1621,6 +1615,12 @@ msgstr "изчитане на „.gitattributes“ в работната дирРmsgid "report archived files on stderr" msgstr "извеждане на архивираните файлове на Ñтандартната грешка" +msgid "time" +msgstr "ВРЕМЕ" + +msgid "set modification time of archive entries" +msgstr "задаване на ВРЕМЕ на промÑна на елементите в архива" + msgid "set compression level" msgstr "задаване на нивото на компреÑиране" @@ -1661,6 +1661,13 @@ msgstr "Ðргументът не Ñе поддържа за форма̀та †msgid "%.*s is not a valid attribute name" msgstr "„%.*s“ е неправилно име за атрибут" +msgid "unable to add additional attribute" +msgstr "не може да Ñе добави нов атрибут" + +#, c-format +msgid "ignoring overly long attributes line %d" +msgstr "преÑкачане на прекалено дълъг ред за атрибути: %d" + #, c-format msgid "%s not allowed: %s:%d" msgstr "%s: командата не е позволена: „%s:%d“" @@ -1673,6 +1680,18 @@ msgstr "" "Ðко ви Ñ‚Ñ€Ñбва начална удивителна, ползвайте „\\!“." #, c-format +msgid "cannot fstat gitattributes file '%s'" +msgstr "неуÑпешно изпълнение на „fstat“ върху файла за атрибути на git „%s“" + +#, c-format +msgid "ignoring overly large gitattributes file '%s'" +msgstr "преÑкачане на прекалено Ð³Ð¾Ð»ÐµÐ¼Ð¸Ñ Ñ„Ð°Ð¹Ð» за атрибути на git: „%s“" + +#, c-format +msgid "ignoring overly large gitattributes blob '%s'" +msgstr "преÑкачане на прекалено Ð³Ð¾Ð»ÐµÐ¼Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚-BLOB за атрибути на git: „%s“" + +#, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Ðеправилно цитирано Ñъдържание във файла „%s“: %s" @@ -1951,12 +1970,12 @@ msgstr "подмодул „%s“: подмодулът липÑва" #, c-format msgid "" -"You may try updating the submodules using 'git checkout %s && git submodule " -"update --init'" +"You may try updating the submodules using 'git checkout --no-recurse-" +"submodules %s && git submodule update --init'" msgstr "" "Може да обновите подмодулите Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ñ‚Ð°:\n" "\n" -" git checkout %s && git submodule update --init" +" git checkout --no-recurse-submodules %s && git submodule update --init" #, c-format msgid "submodule '%s': cannot create branch '%s'" @@ -1991,6 +2010,13 @@ msgstr "изтриване на „%s“\n" msgid "Unstaged changes after refreshing the index:" msgstr "Промѐни, които и Ñлед обновÑването на индекÑа не Ñа добавени към него:" +msgid "" +"the add.interactive.useBuiltin setting has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"ÐаÑтройката „add.interactive.useBuiltin“ е премахната!\n" +"За подробноÑти Ñ Ð¿Ð¾Ñ‚ÑŠÑ€Ñете в изхода от „git help config“." + msgid "Could not read the index" msgstr "ИндекÑÑŠÑ‚ не може да бъде прочетен" @@ -2399,6 +2425,11 @@ msgstr "git am [ОПЦИЯ…] (--continue | --skip | --abort)" msgid "run interactively" msgstr "интерактивна работа" +msgid "bypass pre-applypatch and applypatch-msg hooks" +msgstr "" +"без изпълнение на куките преди прилагане на кръпка и Ñъобщение преди " +"прилагане на кръпка" + msgid "historical option -- no-op" msgstr "изоÑтавена опциÑ, ÑъщеÑтвува по иÑторичеÑки причини, нищо не прави" @@ -2548,31 +2579,28 @@ msgstr "git archive: протоколна грешка" msgid "git archive: expected a flush" msgstr "git archive: очакваше Ñе изчиÑтване на буферите чрез „flush“" -msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [ПОДÐÐ’ÐÐЕ]" - msgid "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " -"[<paths>...]" +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{new,bad}=ЛОШО --term-{old,good}" -"=ДОБРО] [--no-checkout] [--first-parent] [ЛОШО [ДОБРО…]] [--] [ПЪТ…]" +"git bisect start [--term-{new,bad}=УПРÐВЛЯВÐЩÐ_ДУМР--term-{old,good}" +"=УПРÐВЛЯВÐЩÐ_ДУМÐ] [--no-checkout] [--first-parent] [ЛОШО [ДОБРО…]] [--] " +"[ПЪТ…]" -msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "git bisect--helper --bisect-state (ЛОШО) [ВЕРСИЯ]" +msgid "git bisect (good|bad) [<rev>...]" +msgstr "git bisect (good|bad) [ВЕРСИЯ…]" -msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "git bisect--helper --bisect-state (ДОБРО) [ВЕРСИЯ…]" +msgid "git bisect skip [(<rev>|<range>)...]" +msgstr "git bisect skip [(ВЕРСИЯ|ДИÐПÐЗОÐ)…]" -msgid "git bisect--helper --bisect-replay <filename>" -msgstr "git bisect--helper --bisect-replay ИМЕ_ÐÐ_ФÐЙЛ" +msgid "git bisect reset [<commit>]" +msgstr "git bisect reset [ПОДÐÐ’ÐÐЕ]" -msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" -msgstr "git bisect--helper --bisect-skip [(ВЕРСИЯ|ДИÐПÐЗОÐ)…]" +msgid "git bisect replay <logfile>" +msgstr "git bisect replay ИМЕ_ÐÐ_ФÐЙЛ" -msgid "git bisect--helper --bisect-run <cmd>..." -msgstr "git bisect--helper --bisect-run КОМÐÐДÐ…" +msgid "git bisect run <cmd>..." +msgstr "git bisect run КОМÐÐДÐ…" #, c-format msgid "cannot open file '%s' in mode '%s'" @@ -2721,11 +2749,6 @@ msgstr "" "ÐеуÑпешно преминаване към „%s“. Изпълнете командата „git bisect start " "СЪЩЕСТВУВÐЩ_КЛОГ." -msgid "won't bisect on cg-seek'ed tree" -msgstr "" -"не може да Ñе Ñ‚ÑŠÑ€Ñи двоично, когато е изпълнена командата „cg-seek“ от " -"„cogito“" - msgid "bad HEAD - strange symbolic ref" msgstr "Ðеправилен указател „HEAD“ — необичаен Ñимволен указател" @@ -2781,7 +2804,7 @@ msgid "bisect run failed: no command provided." msgstr "неуÑпешно двоично Ñ‚ÑŠÑ€Ñене, не е зададена команда." #, c-format -msgid "unable to verify '%s' on good revision" +msgid "unable to verify %s on good revision" msgstr "„%s“ не може да провери Ñ Ð´Ð¾Ð±Ñ€Ð° верÑиÑ" #, c-format @@ -2789,7 +2812,7 @@ msgid "bogus exit code %d for good revision" msgstr "неправилен изходен код %d за добро подаване" #, c-format -msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" msgstr "" "неуÑпешно двоично Ñ‚ÑŠÑ€Ñене: изходниÑÑ‚ код от командата „%2$s“ е %1$d — това е " "извън интервала [0, 128)" @@ -2801,37 +2824,42 @@ msgstr "файлът „%s“ не може да бъде отворен за з msgid "bisect run cannot continue any more" msgstr "двоичното Ñ‚ÑŠÑ€Ñене не може да продължи" -#, c-format msgid "bisect run success" msgstr "уÑпешно двоично Ñ‚ÑŠÑ€Ñене" -#, c-format msgid "bisect found first bad commit" msgstr "двоичното Ñ‚ÑŠÑ€Ñене откри първото лошо подаване" #, c-format -msgid "" -"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " -"code %d" -msgstr "" -"неуÑпешно двоично Ñ‚ÑŠÑ€Ñене: „git bisect--helper --bisect-state %s“ завърши Ñ " -"код за грешка: %d" +msgid "bisect run failed: 'git bisect %s' exited with error code %d" +msgstr "неуÑпешно двоично Ñ‚ÑŠÑ€Ñене: „git bisect %s“ завърши Ñ ÐºÐ¾Ð´ за грешка: %d" -msgid "--bisect-reset requires either no argument or a commit" -msgstr "опциÑта „--bisect-reset“ изиÑква или 0 аргументи, или 1 — подаване" - -msgid "--bisect-terms requires 0 or 1 argument" -msgstr "опциÑта „--bisect-terms“ изиÑква 0 или 1 аргумента" +#, c-format +msgid "'%s' requires either no argument or a commit" +msgstr "„%s“ изиÑква или 0 аргументи, или едно подаване" -msgid "--bisect-next requires 0 arguments" -msgstr "опциÑта „--bisect-next“ не приема аргументи" +#, c-format +msgid "'%s' requires 0 or 1 argument" +msgstr "„%s“ изиÑква 0 или 1 аргумент" -msgid "--bisect-log requires 0 arguments" -msgstr "опциÑта „--bisect-log“ не приема аргументи" +#, c-format +msgid "'%s' requires 0 arguments" +msgstr "„%s“ изиÑква 0 аргументи" msgid "no logfile given" msgstr "не е зададен журнален файл" +#, c-format +msgid "'%s' failed: no command provided." +msgstr "неуÑпешно изпълнение на „%s“: не е зададена команда." + +msgid "need a command" +msgstr "необходима е команда" + +#, c-format +msgid "unknown command: '%s'" +msgstr "непозната команда: „%s“" + msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗÐ_ВЕРСИЯТÐ…] [ВЕРСИЯ] [--] ФÐЙЛ" @@ -3425,6 +3453,9 @@ msgstr "git bundle list-heads ФÐЙЛ [ИМЕ_ÐÐ_УКÐЗÐТЕЛ…]" msgid "git bundle unbundle [--progress] <file> [<refname>...]" msgstr "git bundle unbundle [--progress] ФÐЙЛ [ИМЕ_ÐÐ_УКÐЗÐТЕЛ…]" +msgid "need a <file> argument" +msgstr "необходим е аргумент ФÐЙЛ" + msgid "do not show progress meter" msgstr "без извеждане на напредъка" @@ -3479,10 +3510,6 @@ msgstr "командата „%s“ изиÑква аргумент" msgid "%s takes no arguments" msgstr "командата „%s“ не приема аргументи" -#, c-format -msgid "unknown command: '%s'" -msgstr "непозната команда: „%s“" - msgid "only one batch option may be specified" msgstr "може да укажете Ñамо една пакетна опциÑ" @@ -3625,11 +3652,18 @@ msgstr "опциÑта „-%c“ изиÑква обект" msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "в режим Ñ Ð¿Ð¾Ñочен ВИД ОБЕКТ Ñе изиÑкват точно два аргумента, а не %d" -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." -msgstr "git check-attr [-a | --all | ÐТРИБУТ…] [--] ПЪТ…" +msgid "" +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " +"<pathname>..." +msgstr "" +"git check-attr [--source УКÐЗÐТЕЛ_КЪМ_ДЪРВО] [-a | --all | ÐТРИБУТ…] [--] " +"ПЪТ…" -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" -msgstr "git check-attr --stdin [-z] [-a | --all | ÐТРИБУТ…]" +msgid "" +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" +msgstr "" +"git check-attr --stdin [-z] [--source УКÐЗÐТЕЛ_КЪМ_ДЪРВО] [-a | --all | " +"ÐТРИБУТ…]" msgid "report all attributes set on file" msgstr "извеждане на вÑички атрибути, зададени върху файл" @@ -3643,6 +3677,12 @@ msgstr "изчитане на имената на файловете от Ñта msgid "terminate input and output records by a NUL character" msgstr "разделÑне на входните и изходните запиÑи Ñ Ð½ÑƒÐ»ÐµÐ²Ð¸Ñ Ð·Ð½Ð°Ðº „NUL“" +msgid "<tree-ish>" +msgstr "УКÐЗÐТЕЛ_КЪМ_ДЪРВО" + +msgid "which tree-ish to check attributes at" +msgstr "към кой УКÐЗÐТЕЛ_КЪМ_ДЪРВО да Ñе премине" + msgid "suppress progress reporting" msgstr "без показване на напредъка" @@ -4231,7 +4271,7 @@ msgstr "" "* — избиране на вÑички обекти\n" " — (празно) завършване на избирането\n" -#, c-format, perl-format +#, c-format msgid "Huh (%s)?\n" msgstr "Ðеправилен избор (%s).\n" @@ -4382,9 +4422,6 @@ msgstr "ДЪЛБОЧИÐÐ" msgid "create a shallow clone of that depth" msgstr "плитко клониране до тази ДЪЛБОЧИÐÐ" -msgid "time" -msgstr "ВРЕМЕ" - msgid "create a shallow clone since a specific time" msgstr "плитко клониране до момент във времето" @@ -4635,6 +4672,9 @@ msgstr "" msgid "failed to fetch objects from bundle URI '%s'" msgstr "неуÑпешно доÑтавÑне на обекти от пратка на Ð°Ð´Ñ€ÐµÑ â€ž%s“" +msgid "failed to fetch advertised bundles" +msgstr "неуÑпешно доÑтавÑне на обÑвените за налични пратки" + msgid "remote transport reported error" msgstr "отдалечениÑÑ‚ транÑпорт върна грешка" @@ -5918,29 +5958,6 @@ msgstr "не е зададена програма за „--tool=ПРОГРÐМРmsgid "no <cmd> given for --extcmd=<cmd>" msgstr "не е зададена команда за „--extcmd=КОМÐÐДГ" -msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -msgstr "git env--helper --type=[bool|ulong] ОПЦИИ ПРОМЕÐЛИВИ" - -msgid "default for git_env_*(...) to fall back on" -msgstr "Ñтандартна, резервна ÑтойноÑÑ‚ за „git_env_*(…)“" - -msgid "be quiet only use git_env_*() value as exit code" -msgstr "" -"без извеждане на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ â€” ÑтойноÑтта на „git_env_*()“ да е изходен код" - -#, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "" -"опциÑта „--default“ изиÑква булева ÑтойноÑÑ‚ при „--type=bool“, а не „%s“" - -#, c-format -msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not " -"`%s`" -msgstr "" -"опциÑта „--default“ изиÑква целочиÑлена ÑтойноÑÑ‚ без знак при „--" -"type=ulong“, а не „%s“" - msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [ОПЦИЯ_ЗÐ_СПИСЪКÐ_С_ВЕРСИИ…]" @@ -6349,6 +6366,10 @@ msgstr "отрицателна дълбочина като аргумент на msgid "--unshallow on a complete repository does not make sense" msgstr "не може да използвате опциÑта „--unshallow“ върху пълно хранилище" +#, c-format +msgid "failed to fetch bundles from '%s'" +msgstr "неуÑпешно доÑтавÑне на пратки от „%s“" + msgid "fetch --all does not take a repository argument" msgstr "към „git fetch --all“ не може да добавите аргумент-хранилище" @@ -7393,12 +7414,18 @@ msgstr "употреба: %s%s" msgid "'git help config' for more information" msgstr "За повече Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¸Ð·Ð¿ÑŠÐ»Ð½ÐµÑ‚Ðµ „git help config“" -msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" -msgstr "git hook run [--ignore-missing] КУКР[-- ÐРГУМЕÐТ_ЗÐ_КУКÐ…]" +msgid "" +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" +"args>]" +msgstr "" +"git hook run [--ignore-missing] [--to-stdin=ПЪТ] КУКР[-- ÐРГУМЕÐТ_ЗÐ_КУКÐ…]" msgid "silently ignore missing requested <hook-name>" msgstr "преÑкачане на заÑвена КУКÐ, коÑто липÑва" +msgid "file to read into hooks' stdin" +msgstr "файл за изчитане от ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð²Ñ…Ð¾Ð´ на куката" + #, c-format msgid "object type mismatch at %s" msgstr "неправилен вид на обекта „%s“" @@ -8251,11 +8278,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" -" [--symref] [<repository> [<refs>...]]" +" [--symref] [<repository> [<patterns>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=КОМÐÐДÐ]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=КЛЮЧ]\n" -" [--symref] [ХРÐÐИЛИЩЕ [УКÐЗÐТЕЛ…]]" +" [--symref] [ХРÐÐИЛИЩЕ [ШÐБЛОÐ]]" msgid "do not print remote URL" msgstr "без извеждане на адреÑите на отдалечените хранилища" @@ -8507,9 +8534,15 @@ msgstr "позволÑване на Ñливане на незавиÑими Ð¸Ñ msgid "perform multiple merges, one per line of input" msgstr "извършване на множеÑтво ÑливаниÑ, по едно на ред" +msgid "specify a merge-base for the merge" +msgstr "база за Ñливането" + msgid "--trivial-merge is incompatible with all other options" msgstr "„--trivial-merge“ е неÑъвмеÑтима Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ‚Ðµ опции" +msgid "--merge-base is incompatible with --stdin" +msgstr "опциите „--merge-base“ и „--stdin“ Ñа неÑъвмеÑтими" + #, c-format msgid "malformed input line: '%s'." msgstr "входен ред Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÐµÐ½ формат: „%s“." @@ -10455,6 +10488,9 @@ msgstr "" msgid "could not switch to %s" msgstr "не може да Ñе премине към „%s“" +msgid "apply options and merge options cannot be used together" +msgstr "опциите за прилагане и Ñливане Ñа неÑъвмеÑтими" + #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " @@ -10700,8 +10736,19 @@ msgid "--strategy requires --merge or --interactive" msgstr "" "опциÑта „--strategy“ изиÑква нÑÐºÐ¾Ñ Ð¾Ñ‚ опциите „--merge“ или „--interactive“" -msgid "apply options and merge options cannot be used together" -msgstr "опциите за прилагане и Ñливане Ñа неÑъвмеÑтими" +msgid "" +"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"autosquash" +msgstr "" +"опциите за прилагане Ñа неÑъвмеÑтими Ñ â€žrebase.autosquash“. Пробвайте да " +"добавите опциÑта „--no-autosquash“" + +msgid "" +"apply options are incompatible with rebase.updateRefs. Consider adding --no-" +"update-refs" +msgstr "" +"опциите за прилагане Ñа неÑъвмеÑтими Ñ â€žrebase.updateRefs“. Пробвайте да " +"добавите опциÑта „--no-update-refs“" #, c-format msgid "Unknown rebase backend: %s" @@ -12221,7 +12268,7 @@ msgid "show refs unreachable from any other ref" msgstr "извеждане на недоÑтижимите указатели" msgid "show commits in topological order" -msgstr "извеждане на подаваниÑта в топологичеÑка подредба" +msgstr "извеждане на подаваниÑта в топологична подредба" msgid "show only commits not on the first branch" msgstr "извеждане Ñамо на подаваниÑта, които не Ñа от Ð¿ÑŠÑ€Ð²Ð¸Ñ ÐºÐ»Ð¾Ð½" @@ -12231,7 +12278,7 @@ msgstr "извеждане на ÑливаниÑта, които може да Ñ msgid "topologically sort, maintaining date order where possible" msgstr "" -"топологичеÑка подредба, при запазване на подредбата по дата, доколкото е\n" +"топологична подредба, при запазване на подредбата по дата, доколкото е\n" "възможно" msgid "<n>[,<base>]" @@ -13247,10 +13294,6 @@ msgstr "„%s“ е неправилно име за подмодул" msgid "git submodule--helper <command>" msgstr "git submodule--helper КОМÐÐДÐ" -#, c-format -msgid "%s doesn't support --super-prefix" -msgstr "„%s“ не поддържа опциÑта „--super-prefix“" - msgid "git symbolic-ref [-m <reason>] <name> <ref>" msgstr "git symbolic-ref [-m ПРИЧИÐÐ] ИМЕ УКÐЗÐТЕЛ" @@ -14013,6 +14056,11 @@ msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "„core.fsyncMethod = batch“ не Ñе поддържа на тази платформа" #, c-format +msgid "could not parse bundle list key %s with value '%s'" +msgstr "" +"ключът за ÑпиÑък Ñ Ð¿Ñ€Ð°Ñ‚ÐºÐ¸ „%s“ не може да Ñе анализира ÑÑŠÑ ÑтойноÑÑ‚ „%s“" + +#, c-format msgid "bundle list at '%s' has no mode" msgstr "липÑва режим в ÑпиÑъка от пратки „%s“" @@ -14023,6 +14071,13 @@ msgid "insufficient capabilities" msgstr "недоÑтатъчно възможноÑти" #, c-format +msgid "file downloaded from '%s' is not a bundle" +msgstr "изтеглениÑÑ‚ от Ð°Ð´Ñ€ÐµÑ â€ž%s“ файл не е пратка" + +msgid "failed to store maximum creation token" +msgstr "неуÑпешно запазване на данните за поÑледно Ñъздаденото" + +#, c-format msgid "unrecognized bundle mode from URI '%s'" msgstr "непознат режим на пратки от Ð°Ð´Ñ€ÐµÑ â€ž%s“" @@ -14039,6 +14094,13 @@ msgstr "неуÑпешно изтеглÑне на пратка от адреÑ: msgid "file at URI '%s' is not a bundle or bundle list" msgstr "файлът на Ð°Ð´Ñ€ÐµÑ â€ž%s“ не е нито пратка, нито ÑпиÑък Ñ Ð¿Ñ€Ð°Ñ‚ÐºÐ¸" +#, c-format +msgid "bundle-uri: unexpected argument: '%s'" +msgstr "bundle-uri: непознат аргумент: %s" + +msgid "bundle-uri: expected flush after arguments" +msgstr "bundle-uri: Ñлед аргументите Ñе очаква изчиÑтване на буферите" + msgid "bundle-uri: got an empty line" msgstr "bundle-uri: получен е празен ред" @@ -14070,6 +14132,13 @@ msgstr "Ð’ хранилището липÑват Ñледните необход msgid "need a repository to verify a bundle" msgstr "за проверката на пратка е необходимо хранилище" +msgid "" +"some prerequisite commits exist in the object store, but are not connected " +"to the repository's history" +msgstr "" +"в хранилището на обекти ÑъщеÑтвуват необходими подаваниÑ, които не Ñа " +"Ñвързани Ñ Ð¸ÑториÑта на хранилището" + #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %<PRIuMAX> refs:" @@ -15526,15 +15595,23 @@ msgid "unknown object format '%s' specified by server" msgstr "Ñървърът указа непознат формат на обект: „%s“" #, c-format +msgid "error on bundle-uri response line %d: %s" +msgstr "грешка на ред %d в отговора на командата „bundle-uri“: %s" + +msgid "expected flush after bundle-uri listing" +msgstr "" +"Ñлед изброÑването на адреÑите на пратките Ñе очаква изчиÑтване на буферите" + +msgid "expected response end packet after ref listing" +msgstr "Ñлед изброÑването на указателите Ñе очаква пакет за край" + +#, c-format msgid "invalid ls-refs response: %s" msgstr "неправилен отговор на „ls-refs“: „%s“" msgid "expected flush after ref listing" msgstr "Ñлед изброÑването на указателите Ñе очаква изчиÑтване на буферите" -msgid "expected response end packet after ref listing" -msgstr "Ñлед изброÑването на указателите Ñе очаква пакет за край" - #, c-format msgid "protocol '%s' is not supported" msgstr "протокол „%s“ не Ñе поддържа" @@ -16673,7 +16750,7 @@ msgstr "такъв отдалечен указател нÑма: %s" #, c-format msgid "Server does not allow request for unadvertised object %s" -msgstr "Сървърът не позволÑва заÑвка за необÑвен обект „%s“" +msgstr "Сървърът не позволÑва заÑвка за необÑвен за наличен обект „%s“" #, c-format msgid "fsmonitor_ipc__send_query: invalid path '%s'" @@ -16720,16 +16797,20 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]" +" [--config-env=<name>=<envvar>] <command> [<args>]" msgstr "" +"git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" +" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" +" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" [--config-env=<name>=<envvar>] <command> [<args>]\n" "git [-v | --version] [-h | --help] [-C ПЪТ] [-c ИМЕ=СТОЙÐОСТ]\n" " [--exec-path[=ПЪТ]] [--html-path] [--man-path] [--info-path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=ПЪТ] [--work-tree=ПЪТ] [--namespace=ИМЕ]\n" -" [--super-prefix=ПЪТ] [--config-env=ИМЕ=ПРОМЕÐЛИВÐ_ÐÐ_СРЕДÐТÐ]\n" -" КОМÐÐДР[ÐРГ…]" +" [--config-env=ИМЕ=ПРОМЕÐЛИВÐ_ÐÐ_СРЕДÐТÐ] КОМÐÐДР[ÐРГ…]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -16757,10 +16838,6 @@ msgid "no namespace given for --namespace\n" msgstr "опциÑта „--namespace“ изиÑква име\n" #, c-format -msgid "no prefix given for --super-prefix\n" -msgstr "опциÑта „--super-prefix“ изиÑква префикÑ\n" - -#, c-format msgid "-c expects a configuration string\n" msgstr "опциÑта „-c“ изиÑква низ за наÑтройка\n" @@ -16880,8 +16957,13 @@ msgstr "" msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "неуÑпешно изпълнение на „gpg.ssh.defaultKeyCommand“: %s %s" -msgid "gpg failed to sign the data" -msgstr "Програмата „gpg“ не подпиÑа данните" +#, c-format +msgid "" +"gpg failed to sign the data:\n" +"%s" +msgstr "" +"Програмата „gpg“ не подпиÑа данните:\n" +"%s" msgid "user.signingKey needs to be set for ssh signing" msgstr "" @@ -17473,7 +17555,7 @@ msgid "" " or update to an existing commit which has merged those changes\n" msgstr "" " ⃠преминаване към подмодула (%s), Ñлед които или де Ñе Ñлее подаването\n" -" „%s“, или да Ñе обновÑви към ÑъщеÑтвуващо подаване, в които\n" +" „%s“, или да Ñе обнови към ÑъщеÑтвуващо подаване, в които\n" " тези промени Ñа Ñлети\n" #, c-format @@ -18070,6 +18152,10 @@ msgid "garbage at end of loose object '%s'" msgstr "грешни данни в ÐºÑ€Ð°Ñ Ð½Ð° Ð½ÐµÐ¿Ð°ÐºÐµÑ‚Ð¸Ñ€Ð°Ð½Ð¸Ñ Ð¾Ð±ÐµÐºÑ‚ „%s“" #, c-format +msgid "unable to open loose object %s" +msgstr "непакетираниÑÑ‚ обект „%s“ не може да Ñе отвори" + +#, c-format msgid "unable to parse %s header" msgstr "заглавната чаÑÑ‚ на „%s“ не може да бъде анализирана" @@ -18085,18 +18171,14 @@ msgid "header for %s too long, exceeds %d bytes" msgstr "заглавната чаÑÑ‚ на „%s“ е прекалено дълга — Ð½Ð°Ð´Ñ…Ð²ÑŠÑ€Ð»Ñ %d байта" #, c-format -msgid "failed to read object %s" -msgstr "обектът „%s“ не може да бъде прочетен" +msgid "loose object %s (stored in %s) is corrupt" +msgstr "непакетираниÑÑ‚ обект „%s“ (в „%s“) е повреден" #, c-format msgid "replacement %s not found for %s" msgstr "замеÑтителÑÑ‚ „%s“ на „%s“ не може да бъде открит" #, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "непакетираниÑÑ‚ обект „%s“ (в „%s“) е повреден" - -#, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "пакетираниÑÑ‚ обект „%s“ (в „%s“) е повреден" @@ -18108,9 +18190,6 @@ msgstr "файлът „%s“ не може да бъде запиÑан" msgid "unable to set permission to '%s'" msgstr "права̀та за доÑтъп до „%s“ не може да бъдат зададени" -msgid "file write error" -msgstr "грешка при Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° файл" - msgid "error when closing loose object file" msgstr "грешка при затварÑнето на файла Ñ Ð½ÐµÐ¿Ð°ÐºÐµÑ‚Ð¸Ñ€Ð°Ð½ обект" @@ -18157,11 +18236,12 @@ msgstr "директориÑта „%s“ не може да бъде Ñъзда msgid "cannot read object for %s" msgstr "обектът за „%s“ не може да Ñе прочете" -msgid "corrupt commit" -msgstr "повредено подаване" +#, c-format +msgid "object fails fsck: %s" +msgstr "„fsck“ откри грешка в обект: „%s“" -msgid "corrupt tag" -msgstr "повреден етикет" +msgid "refusing to create malformed object" +msgstr "не може да Ñе Ñъздаде Ñгрешен обект" #, c-format msgid "read error while indexing %s" @@ -18432,10 +18512,6 @@ msgstr "неправилно отмеÑтване по XOR в пакетен иРmsgid "cannot fstat bitmap file" msgstr "не може да Ñе получи Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° файла Ñ Ð±Ð¸Ñ‚Ð¾Ð²Ð¸ маÑки Ñ â€žfstat“" -#, c-format -msgid "ignoring extra bitmap file: '%s'" -msgstr "игнориране на Ð¸Ð·Ð»Ð¸ÑˆÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð» Ñ Ð±Ð¸Ñ‚Ð¾Ð²Ð¸ маÑки: „%s“" - msgid "checksum doesn't match in MIDX and bitmap" msgstr "" "Ñумата за проверка Ñе различава във файла Ñ Ð¸Ð½Ð´ÐµÐºÑа за множеÑтво пакети и " @@ -18721,6 +18797,9 @@ msgstr "по-малко подробноÑти" msgid "use <n> digits to display object names" msgstr "да Ñе показват такъв БРОЙ цифри от имената на обектите" +msgid "prefixed path to initial superproject" +msgstr "път Ñ Ð¿Ñ€ÐµÑ„Ð¸ÐºÑ ÐºÑŠÐ¼ Ð¿ÑŠÑ€Ð²Ð¾Ð½Ð°Ñ‡Ð°Ð»Ð½Ð¸Ñ Ñвръхпроект" + msgid "how to strip spaces and #comments from message" msgstr "кои празни знаци и #коментари да Ñе махат от ÑъобщениÑта" @@ -19240,6 +19319,14 @@ msgid "ahead %d, behind %d" msgstr "напред Ñ %d, назад Ñ %d" #, c-format +msgid "%%(%.*s) does not take arguments" +msgstr "%%(%.*s) не приема аргументи" + +#, c-format +msgid "unrecognized %%(%.*s) argument: %s" +msgstr "непознат аргумент за „%%(%.*s)“: %s" + +#, c-format msgid "expected format: %%(color:<color>)" msgstr "очакван формат: %%(color:ЦВЯТ)" @@ -19256,22 +19343,6 @@ msgid "Integer value expected refname:rstrip=%s" msgstr "очаква Ñе цÑло чиÑло за „refname:rstrip=%s“" #, c-format -msgid "unrecognized %%(%s) argument: %s" -msgstr "непознат аргумент за „%%(%s)“: %s" - -#, c-format -msgid "%%(objecttype) does not take arguments" -msgstr "%%(objecttype) не приема аргументи" - -#, c-format -msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) не приема аргументи" - -#, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) не приема аргументи" - -#, c-format msgid "expected %%(trailers:key=<value>)" msgstr "очаква Ñе %%(trailers:key=ЕПИЛОГ)" @@ -19288,10 +19359,6 @@ msgid "positive value expected '%s' in %%(%s)" msgstr "очаква Ñе положителна ÑтойноÑÑ‚ за „%s“ в %%(%s)" #, c-format -msgid "unrecognized email option: %s" -msgstr "непозната Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð° е-поща: %s" - -#, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "очакван формат: %%(align:ШИРОЧИÐÐ,ПОЗИЦИЯ)" @@ -19304,12 +19371,12 @@ msgid "unrecognized width:%s" msgstr "непозната широчина: %s" #, c-format -msgid "positive width expected with the %%(align) atom" -msgstr "очаква Ñе положителна широчина Ñ Ð»ÐµÐºÑемата „%%(align)“" +msgid "unrecognized %%(%s) argument: %s" +msgstr "непознат аргумент за „%%(%s)“: %s" #, c-format -msgid "%%(rest) does not take arguments" -msgstr "%%(rest) не приема аргументи" +msgid "positive width expected with the %%(align) atom" +msgstr "очаква Ñе положителна широчина Ñ Ð»ÐµÐºÑемата „%%(align)“" #, c-format msgid "malformed field name: %.*s" @@ -20601,6 +20668,23 @@ msgid "git %s: failed to refresh the index" msgstr "git %s: неуÑпешно обновÑване на индекÑа" #, c-format +msgid "'%s' is not a valid label" +msgstr "„%s“ е неправилен етикет" + +#, c-format +msgid "'%s' is not a valid refname" +msgstr "„%s“ е неправилно име на указател" + +#, c-format +msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" +msgstr "" +"командата „update-ref“ изиÑква пълно име на указател, напр. „refs/heads/%s“" + +#, c-format +msgid "invalid command '%.*s'" +msgstr "неправилна команда „%.*s“" + +#, c-format msgid "%s does not accept arguments: '%s'" msgstr "„%s“ не приема аргументи: „%s“" @@ -21426,6 +21510,16 @@ msgstr "„ls-tree“ завърши Ñ Ð½ÐµÐ¾Ñ‡Ð°ÐºÐ²Ð°Ð½ изходен код msgid "failed to lstat '%s'" msgstr "не може да бъде получена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ñ‡Ñ€ÐµÐ· „lstat“ за „%s“" +msgid "no remote configured to get bundle URIs from" +msgstr "не е наÑтроено отдалечено хранилище за ÑпиÑъците Ñ Ð°Ð´Ñ€ÐµÑи на пратки" + +#, c-format +msgid "remote '%s' has no configured URL" +msgstr "не е зададен никакъв Ð°Ð´Ñ€ÐµÑ Ð·Ð° отдалеченото хранилище„%s“" + +msgid "could not get the bundle-uri list" +msgstr "ÑпиÑъкът Ñ Ð°Ð´Ñ€ÐµÑи на пратки не може да Ñе получи" + msgid "test-tool cache-tree <options> (control|prime|update)" msgstr "test-tool cache-tree ОПЦИЯ… (control|prime|update)" @@ -21785,6 +21879,14 @@ msgstr "ПреуÑтановÑване на дейÑтвието." msgid "failed to push all needed submodules" msgstr "неуÑпешно изтлаÑкване на вÑички необходими подмодули" +msgid "bundle-uri operation not supported by protocol" +msgstr "операциÑта „bundle-uri“ (адреÑи на пратки) не Ñе поддържа от протокола" + +msgid "could not retrieve server-advertised bundle-uri list" +msgstr "" +"ÑпъÑъкът Ñ Ð°Ð´Ñ€ÐµÑи на пратки обÑвени за налични от Ñървъра не може да Ñе " +"получи " + msgid "too-short tree object" msgstr "прекалено кратък обект-дърво" @@ -22533,14 +22635,18 @@ msgstr "Игнорирани файлове" #, c-format msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." +"It took %.2f seconds to enumerate untracked files,\n" +"but the results were cached, and subsequent runs may be faster." msgstr "" -"БÑха необходими %.2f Ñекунди за изброÑването на неÑледените файлове.\n" -"ДобавÑнето на опциÑта „-uno“ към командата „git status“ ще уÑкори\n" -"изпълнението, но ще Ñ‚Ñ€Ñбва да добавÑте новите файлове ръчно.\n" -"За повече подробноÑти погледнете „git status help“." +"ИзброÑването на неÑледените файлове отне %.2f Ñекунди, но\n" +"резултатите Ñа запомнени и може да забързат поÑледващиге изброÑваниÑ." + +#, c-format +msgid "It took %.2f seconds to enumerate untracked files." +msgstr "ИзброÑването на неÑледените файлове отне %.2f Ñекунди." + +msgid "See 'git help status' for information on how to improve this." +msgstr "Вижте в „git help status“ за начините да подобрите това." #, c-format msgid "Untracked files not listed%s" @@ -22689,294 +22795,6 @@ msgstr "" msgid "Unable to determine absolute path of git directory" msgstr "ÐбÑолютниÑÑ‚ път на работното дърво не може да Ñе определи" -#. TRANSLATORS: you can adjust this to align "git add -i" status menu -#, perl-format -msgid "%12s %12s %s" -msgstr "%14s %14s %s" - -#, perl-format -msgid "touched %d path\n" -msgid_plural "touched %d paths\n" -msgstr[0] "%d файл заÑегнат\n" -msgstr[1] "%d файла заÑегнати\n" - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging." -msgstr "" -"Ðко кръпката може да Ñе приложи чиÑто, редактираното парче ще бъде " -"незабавно\n" -"добавено към индекÑа" - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for stashing." -msgstr "" -"Ðко кръпката може да Ñе приложи чиÑто, редактираното парче ще бъде " -"незабавно\n" -"Ñкътано" - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for unstaging." -msgstr "" -"Ðко кръпката може да Ñе приложи чиÑто, редактираното парче ще бъде " -"незабавно\n" -"извадено от индекÑа." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for applying." -msgstr "" -"Ðко кръпката може да Ñе приложи чиÑто, редактираното парче ще бъде " -"незабавно\n" -"набелÑзано за прилагане." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding." -msgstr "" -"Ðко кръпката може да Ñе приложи чиÑто, редактираното парче ще бъде " -"незабавно\n" -"набелÑзано за занулÑване." - -#, perl-format -msgid "failed to open hunk edit file for writing: %s" -msgstr "файлът за редактиране на парчето код не може да бъде отворен: „%s“" - -#, perl-format -msgid "" -"---\n" -"To remove '%s' lines, make them ' ' lines (context).\n" -"To remove '%s' lines, delete them.\n" -"Lines starting with %s will be removed.\n" -msgstr "" -"———\n" -"За да пропуÑнете редовете започващи Ñ â€ž%s“ — заменете знака ÑÑŠÑ â€ž “ (Ñтават " -"контекÑÑ‚)\n" -"За да пропуÑнете редовете започващи Ñ â€ž%s“ — изтрийте ги.\n" -"Редовете, които започват Ñ â€ž%s“ ще бъдат пропуÑнати.\n" - -#, perl-format -msgid "failed to open hunk edit file for reading: %s" -msgstr "" -"файлът за редактиране на парчето код не може да бъде отворен за четене: „%s“" - -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this hunk and all later hunks in the file\n" -"d - do not stage this hunk or any of the later hunks in the file" -msgstr "" -"y — добавÑне на парчето в индекÑа\n" -"n — без добавÑне на парчето в индекÑа\n" -"q — изход, без добавÑне на това и вÑички оÑтаващи парчета от файла\n" -"a — добавÑне на това и вÑички Ñледващи парчета от файла в индекÑа\n" -"d — без добавÑне на това и вÑички Ñледващи парчета от файла в индекÑа" - -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file" -msgstr "" -"y — Ñкатаване на парчето\n" -"n — без Ñкатаване на парчето\n" -"q — изход, без Ñкатаване на това и вÑички оÑтаващи парчета\n" -"a — Ñкатаване на това и вÑички Ñледващи парчета от файла\n" -"d — без Ñкатаване на това и вÑички Ñледващи парчета от файла" - -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"a - unstage this hunk and all later hunks in the file\n" -"d - do not unstage this hunk or any of the later hunks in the file" -msgstr "" -"y — изваждане на парчето от индекÑа\n" -"n — без изваждане на парчето от индекÑа\n" -"q — изход, без изваждане на това и вÑички оÑтаващи парчета от индекÑа\n" -"a — изваждане на това и вÑички Ñледващи парчета от файла от индекÑа\n" -"d — без изваждане на това и вÑички Ñледващи парчета от файла от индекÑа" - -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y — прилагане на парчето към индекÑа\n" -"n — без прилагане на парчето към индекÑа\n" -"q — изход, без прилагане на това и вÑички оÑтаващи парчета към индекÑа\n" -"a — прилагане на това и вÑички Ñледващи парчета от файла към индекÑа\n" -"d — без прилагане на това и вÑички Ñледващи парчета от файла към индекÑа" - -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y — премахване на парчето от работното дърво\n" -"n — без премахване на парчето от работното дърво\n" -"q — изход, без премахване на това и вÑички оÑтаващи парчета от работното " -"дърво\n" -"a — премахване на това и вÑички Ñледващи парчета от файла от работното " -"дърво\n" -"d — без премахване на това и вÑички Ñледващи парчета от файла от работното " -"дърво" - -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y — премахване на парчето от индекÑа и работното дърво\n" -"n — без премахване на парчето от индекÑа и работното дърво\n" -"q — изход, без премахване на това и вÑички оÑтаващи парчета от индекÑа и " -"работното дърво\n" -"a — премахване на това и вÑички Ñледващи парчета от файла от индекÑа и " -"работното дърво\n" -"d — без премахване на това и вÑички Ñледващи парчета от файла от индекÑа и " -"работното дърво" - -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y — прилагане на парчето от индекÑа и работното дърво\n" -"n — без прилагане на парчето от индекÑа и работното дърво\n" -"q — изход, без прилагане на това и вÑички оÑтаващи парчета от индекÑа и " -"работното дърво\n" -"a — прилагане на това и вÑички Ñледващи парчета от файла от индекÑа и " -"работното дърво\n" -"d — без прилагане на това и вÑички Ñледващи парчета от файла от индекÑа и " -"работното дърво" - -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y — прилагане на парчето към работното дърво\n" -"n — без прилагане на парчето към работното дърво\n" -"q — изход, без прилагане на това и вÑички оÑтаващи парчета\n" -"a — прилагане на това и вÑички Ñледващи парчета от файла\n" -"d — без прилагане на това и вÑички Ñледващи парчета от файла" - -msgid "" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"g — избор към кое парче да Ñе премине\n" -"/ — Ñ‚ÑŠÑ€Ñене на парче, напаÑващо към даден регулÑрен израз\n" -"j — без решение за парчето, към Ñледващото парче без решение\n" -"J — без решение за парчето, към Ñледващото парче\n" -"k — без решение за парчето, към предишното парче без решение\n" -"K — без решение за парчето, към предишното парче\n" -"s — разделÑне на текущото парче на по-малки\n" -"e — ръчно редактиране на текущото парче\n" -"? — извеждане не помощта\n" - -msgid "The selected hunks do not apply to the index!\n" -msgstr "Избраните парчета не може да Ñе добавÑÑ‚ в индекÑа!\n" - -#, perl-format -msgid "ignoring unmerged: %s\n" -msgstr "пренебрегване на неÑлÑтото: „%s“\n" - -msgid "No other hunks to goto\n" -msgstr "ÐÑма други парчета\n" - -#, perl-format -msgid "Invalid number: '%s'\n" -msgstr "Ðеправилен номер: „%s“\n" - -#, perl-format -msgid "Sorry, only %d hunk available.\n" -msgid_plural "Sorry, only %d hunks available.\n" -msgstr[0] "Има Ñамо %d парче.\n" -msgstr[1] "Има Ñамо %d парчета.\n" - -msgid "No other hunks to search\n" -msgstr "ÐÑма други парчета за Ñ‚ÑŠÑ€Ñене\n" - -#, perl-format -msgid "Malformed search regexp %s: %s\n" -msgstr "Сгрешен регулÑрен израз „%s“: %s\n" - -msgid "No hunk matches the given pattern\n" -msgstr "Ðикое парче не напаÑва на регулÑÑ€Ð½Ð¸Ñ Ð¸Ð·Ñ€Ð°Ð·\n" - -msgid "No previous hunk\n" -msgstr "ÐÑма друго парче преди това\n" - -msgid "No next hunk\n" -msgstr "ÐÑма друго парче Ñлед това\n" - -msgid "Sorry, cannot split this hunk\n" -msgstr "Това парче не може да бъде разделено\n" - -#, perl-format -msgid "Split into %d hunk.\n" -msgid_plural "Split into %d hunks.\n" -msgstr[0] "РазделÑне на %d парче.\n" -msgstr[1] "РазделÑне на %d парчета.\n" - -msgid "Sorry, cannot edit this hunk\n" -msgstr "Това парче не може да бъде редактирано\n" - -#. TRANSLATORS: please do not translate the command names -#. 'status', 'update', 'revert', etc. -msgid "" -"status - show paths with changes\n" -"update - add working tree state to the staged set of changes\n" -"revert - revert staged set of changes back to the HEAD version\n" -"patch - pick hunks and update selectively\n" -"diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of " -"changes\n" -msgstr "" -"status — извеждане на пътищата Ñ Ð¿Ñ€Ð¾Ð¼ÐµÌ€Ð½Ð¸Ñ‚Ðµ\n" -"update — добавÑне на ÑÑŠÑтоÑнието на работното дърво към промѐните в\n" -" индекÑа\n" -"revert — отмÑна на промѐните в индекÑа към ÑÑŠÑтоÑнието Ñочено от " -"„HEAD“\n" -"patch — избиране на парчета код и обновÑване поединично\n" -"diff — извеждане на разликата между ÑÑŠÑтоÑнието на Ñоченото от " -"„HEAD“\n" -" и индекÑа\n" -"add untracked — добавÑне на неÑледените файлове към промѐните в индекÑа\n" - -msgid "missing --" -msgstr "„--“ липÑва" - -#, perl-format -msgid "unknown --patch mode: %s" -msgstr "неизвеÑтна ÑÑ‚Ñ€Ð°Ñ‚ÐµÐ³Ð¸Ñ Ð·Ð° прилагане на кръпка към „--patch“: „%s“" - -#, perl-format -msgid "invalid argument %s, expecting --" -msgstr "указан е неправилен аргумент „%s“, а Ñе очаква „--“." - msgid "local zone differs from GMT by a non-minute interval\n" msgstr "" "разликата между меÑÑ‚Ð½Ð¸Ñ Ñ‡Ð°Ñови поÑÑ Ð¸ GMT Ñъдържа дробна чаÑÑ‚ от минута\n" @@ -1,7 +1,7 @@ # Catalan translations for Git. # This file is distributed under the same license as the Git package. # Alex Henrie <alexhenrie24@gmail.com>, 2014-2016. -# Jordi Mas i Hernà ndez <jmas@softcatala.org>, 2016-2022 +# Jordi Mas i Hernà ndez <jmas@softcatala.org>, 2016-2023 # # Terminologia i criteris utilitzats # @@ -68,8 +68,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-12-07 07:33+0100\n" -"PO-Revision-Date: 2022-12-07 19:00-0600\n" +"POT-Creation-Date: 2023-03-01 01:20+0000\n" +"PO-Revision-Date: 2023-03-01 19:00-0600\n" "Last-Translator: Jordi Mas i Hernà ndez <jmas@softcatala.org>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -105,13 +105,13 @@ msgstr "no s'ha pogut fer «stage» «%s»" msgid "could not write index" msgstr "no s'ha pogut escriure l'Ãndex" -#, c-format, perl-format +#, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "actualitzat %d camÃ\n" msgstr[1] "actualitzats %d camins\n" -#, c-format, perl-format +#, c-format msgid "note: %s is untracked now.\n" msgstr "nota: %s està ara sense seguiment.\n" @@ -125,7 +125,7 @@ msgstr "Reverteix" msgid "Could not parse HEAD^{tree}" msgstr "No s'ha pogut analitzar HEAD^{tree}" -#, c-format, perl-format +#, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "revertit %d camÃ\n" @@ -138,7 +138,7 @@ msgstr "Sense fitxers no seguits.\n" msgid "Add untracked" msgstr "Afegeix sense seguiment" -#, c-format, perl-format +#, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "afegit %d camÃ\n" @@ -232,19 +232,19 @@ msgstr "no s'ha pogut actualitzar l'Ãndex" msgid "Bye.\n" msgstr "Adeu.\n" -#, c-format, perl-format +#, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "Afegeix a «stage» [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d%s,?]? " @@ -268,19 +268,19 @@ msgstr "" "a - fes «stage» d'aquest tros i de tota la resta de trossos del fitxer\n" "d - no facis «stage» d'aquest tros ni de cap altre restant del fitxer\n" -#, c-format, perl-format +#, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Afegeix a «stash» [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d%s,?]? " @@ -304,19 +304,19 @@ msgstr "" "a - fes «stash» d'aquest tros i de tota la resta de trossos del fitxer\n" "d - no facis «stash» d'aquest tros ni de cap altre restant del fitxer\n" -#, c-format, perl-format +#, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Afegeix a «unstage» [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d%s,?]? " @@ -340,19 +340,19 @@ msgstr "" "a - fes «unstage» d'aquest tros i de tota la resta de trossos del fitxer\n" "d - no facis «unstage» d'aquest tros ni de cap altre restant del fitxer\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Aplica el canvi de mode a l'Ãndex [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Aplica la supressió a l'Ãndex [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Aplica l'addició a l'Ãndex [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Aplica aquest tros a l'Ãndex [y,n,q,a,d%s,?]? " @@ -376,19 +376,19 @@ msgstr "" "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta el canvi de mode de l'arbre de treball [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta suprimir de l'arbre de treball [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta l'addició de l'arbre de treball [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta aquest tros de l'arbre de treball [y,n,q,a,d%s,?]? " @@ -412,22 +412,22 @@ msgstr "" "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Descarta el canvi de mode de l'Ãndex i de l'arbre de treball [y,n,q,a," "d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Descarta suprimir de l'Ãndex i de l'arbre de treball [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Descarta l'addició de l'Ãndex i de l'arbre de treball [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Descarta aquest tros de l'Ãndex i de l'arbre de treball [y,n,q,a,d%s,?]? " @@ -445,20 +445,20 @@ msgstr "" "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Aplica el canvi de mode a l'Ãndex i a l'arbre de treball [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Aplica la supressió a l'Ãndex i a l'arbre de treball [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "Aplica l'addició a l'Ãndex i a l'arbre de treball [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Aplica aquest tros a l'Ãndex i a l'arbre de treball [y,n,q,a,d%s,?]? " @@ -475,19 +475,19 @@ msgstr "" "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Aplica el canvi de mode a l'arbre de treball [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Aplica la supressió a l'arbre de treball [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "Aplica l'addició a l'arbre de treball [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Aplica aquest tros a l'arbre de treball [y,n,q,a,d%s,?]? " @@ -564,8 +564,6 @@ msgstr "" "Per a eliminar les lÃnies «%c», suprimiu-les.\n" "Les lÃnies que comencin per %c s'eliminaran.\n" -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -581,20 +579,12 @@ msgstr "no s'ha pogut analitzar la capçalera del tros" msgid "'git apply --cached' failed" msgstr "«git apply --cached» ha fallat" -#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -1443,6 +1433,12 @@ msgstr "llegeix .gitattributes en el directori de treball" msgid "report archived files on stderr" msgstr "informa de fitxers arxivats en stderr" +msgid "time" +msgstr "data" + +msgid "set modification time of archive entries" +msgstr "estableix l'hora de modificació de les entrades de l'arxiu" + msgid "set compression level" msgstr "estableix el nivell de compressió" @@ -1483,6 +1479,13 @@ msgstr "Argument no admès per al format «%s»: -%d" msgid "%.*s is not a valid attribute name" msgstr "%.*s no és un nom d'atribut và lid" +msgid "unable to add additional attribute" +msgstr "no s'ha pogut afegir l'atribut addicional" + +#, c-format +msgid "ignoring overly long attributes line %d" +msgstr "s'ignorarà la lÃnia d'atributs massa llarga %d" + #, c-format msgid "%s not allowed: %s:%d" msgstr "%s no està permès: %s:%d" @@ -1495,6 +1498,18 @@ msgstr "" "Useu «\\!» per exclamació capdavantera literal." #, c-format +msgid "cannot fstat gitattributes file '%s'" +msgstr "no es pot fer fstat gitattributes al fitxer «%s»" + +#, c-format +msgid "ignoring overly large gitattributes file '%s'" +msgstr "s'ignorarà el fitxer «%s» gitattributes per massa gran" + +#, c-format +msgid "ignoring overly large gitattributes blob '%s'" +msgstr "s'ignorarà la blob «%s» gitattributes per massa gran" + +#, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s" @@ -1773,11 +1788,11 @@ msgstr "submòdul «%s»: no es pot trobar el submòdul" #, c-format msgid "" -"You may try updating the submodules using 'git checkout %s && git submodule " -"update --init'" +"You may try updating the submodules using 'git checkout --no-recurse-" +"submodules %s && git submodule update --init'" msgstr "" -"Podeu provar d'actualitzar els submòduls utilitzant «git checkout %s && git " -"submodule update --init»" +"Podeu provar d'actualitzar els submòduls utilitzant «git checkout --no-" +"recurse-submodules %s && git submodule update --init»" #, c-format msgid "submodule '%s': cannot create branch '%s'" @@ -1812,6 +1827,13 @@ msgstr "elimina «%s»\n" msgid "Unstaged changes after refreshing the index:" msgstr "Canvis «unstaged» després d'actualitzar l'Ãndex:" +msgid "" +"the add.interactive.useBuiltin setting has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"s'ha eliminat la configuració add.interactive.useBuiltin\n" +"Per a més detalls, vegeu la seva entrada a «git help config»." + msgid "Could not read the index" msgstr "No s'ha pogut llegir l'Ãndex" @@ -2201,6 +2223,9 @@ msgstr "git am [<opcions>] (--continue | --skip | --abort)" msgid "run interactively" msgstr "executa interactivament" +msgid "bypass pre-applypatch and applypatch-msg hooks" +msgstr "evita els lligams pre-applypatch i applypatch-msg" + msgid "historical option -- no-op" msgstr "opció històrica -- no-op" @@ -2344,32 +2369,27 @@ msgstr "git archive: error de protocol" msgid "git archive: expected a flush" msgstr "git archive: s'esperava una neteja" -msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [<comissió>]" - msgid "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " -"[<paths>...]" +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " -"[<paths>...]" +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" -msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]" +msgid "git bisect (good|bad) [<rev>...]" +msgstr "git bisect (good|bad) [<rev>...]" -msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]" +msgid "git bisect skip [(<rev>|<range>)...]" +msgstr "git bisect skip [(<rev>|<range>)...]" -msgid "git bisect--helper --bisect-replay <filename>" -msgstr "git bisect--helper --bisect-replay <filename>" +msgid "git bisect reset [<commit>]" +msgstr "git bisect reset [<comissió>]" -msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" -msgstr "git bisect--helper --bisect-skip [(<rev>|<range>)...]" +msgid "git bisect replay <logfile>" +msgstr "git bisect replay <logfile>" -msgid "git bisect--helper --bisect-run <cmd>..." -msgstr "git bisect--helper --bisect-run <ordre>..." +msgid "git bisect run <cmd>..." +msgstr "git bisect run <ordre>..." #, c-format msgid "cannot open file '%s' in mode '%s'" @@ -2519,9 +2539,6 @@ msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "l'agafament de «%s» ha fallat. Proveu «git bisect start <branca-và lida>»." -msgid "won't bisect on cg-seek'ed tree" -msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek" - msgid "bad HEAD - strange symbolic ref" msgstr "HEAD incorrecte - referència simbòlica estranya" @@ -2573,7 +2590,7 @@ msgid "bisect run failed: no command provided." msgstr "ha fallat l'execució de bisect: no s'ha proporcionat cap ordre." #, c-format -msgid "unable to verify '%s' on good revision" +msgid "unable to verify %s on good revision" msgstr "no s'ha pogut verificar «%s» en una bona revisió" #, c-format @@ -2581,10 +2598,10 @@ msgid "bogus exit code %d for good revision" msgstr "codi d'error de sortida %d per a una bona revisió" #, c-format -msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" msgstr "" -"l'execució de la de bisecció ha fallat: codi de sortida %d de «%s» és < 0 o " -">= 128" +"l'execució de la de bisecció ha fallat: codi de sortida %d de %s és < 0 o >= " +"128" #, c-format msgid "cannot open file '%s' for writing" @@ -2593,37 +2610,44 @@ msgstr "no es pot obrir «%s» per a escriptura" msgid "bisect run cannot continue any more" msgstr "l'execució de la bisecció no pot continuar més" -#, c-format msgid "bisect run success" msgstr "execució de bisecció amb èxit" -#, c-format msgid "bisect found first bad commit" msgstr "la bisecció ha trobat una primera comissió errònia" #, c-format -msgid "" -"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " -"code %d" +msgid "bisect run failed: 'git bisect %s' exited with error code %d" msgstr "" -"l'execució de la bisecció ha fallat: «git bisect--helper --bisect-state %s» " -"ha sortit amb el codi d'error %d" +"ha fallat l'execució del bisect: «git bisect %s» ha sortit amb el codi " +"d'error %d" -msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset no requereix cap argument ni comissió" - -msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--bisect-terms requereix 0 o 1 argument" +#, c-format +msgid "'%s' requires either no argument or a commit" +msgstr "«%s» no requereix cap argument ni comissió" -msgid "--bisect-next requires 0 arguments" -msgstr "--bisect-next no requereix cap argument" +#, c-format +msgid "'%s' requires 0 or 1 argument" +msgstr "%s requereix 0 o 1 arguments" -msgid "--bisect-log requires 0 arguments" -msgstr "--bisect-log no requereix cap argument" +#, c-format +msgid "'%s' requires 0 arguments" +msgstr "«%s» requereix 0 arguments" msgid "no logfile given" msgstr "no s'ha donat cap fitxer de registre" +#, c-format +msgid "'%s' failed: no command provided." +msgstr "«%s» ha fallat: no s'ha proporcionat cap ordre." + +msgid "need a command" +msgstr "cal una subordre" + +#, c-format +msgid "unknown command: '%s'" +msgstr "ordre desconeguda: «%s»" + msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer" @@ -3203,6 +3227,9 @@ msgstr "git bundle list-heads <fitxer> [<refname>...]" msgid "git bundle unbundle [--progress] <file> [<refname>...]" msgstr "git bundle unbundle [--progress] <fitxer> [<refname>...]" +msgid "need a <file> argument" +msgstr "necessita un argument <fitxer>" + msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" @@ -3256,10 +3283,6 @@ msgstr "%s requereix arguments" msgid "%s takes no arguments" msgstr "%s no accepta cap valor" -#, c-format -msgid "unknown command: '%s'" -msgstr "ordre desconeguda: «%s»" - msgid "only one batch option may be specified" msgstr "només es pot especificar una opció per lots" @@ -3395,11 +3418,17 @@ msgstr "<objecte> requerit amb «-%c»" msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "només es permeten dos arguments en el mode <tipus> <objecte>, no %d" -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." -msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camÃ>..." +msgid "" +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " +"<pathname>..." +msgstr "" +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " +"<pathname>..." -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" -msgstr "git check-attr --stdin [-z] [-a | --all | <atribut>...]" +msgid "" +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" +msgstr "" +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" msgid "report all attributes set on file" msgstr "informa de tots els atributs establerts en el fitxer" @@ -3413,6 +3442,12 @@ msgstr "llegeix els noms de fitxer de stdin" msgid "terminate input and output records by a NUL character" msgstr "acaba els registres d'entrada i de sortida amb un carà cter NUL" +msgid "<tree-ish>" +msgstr "<tree-ish>" + +msgid "which tree-ish to check attributes at" +msgstr "a quin tree-ish s'han de comprovar els atributs" + msgid "suppress progress reporting" msgstr "omet els informes de progrés" @@ -3993,7 +4028,7 @@ msgstr "" "* - tria tots els Ãtems\n" " - (buit) finalitza la selecció\n" -#, c-format, perl-format +#, c-format msgid "Huh (%s)?\n" msgstr "Perdó (%s)?\n" @@ -4142,9 +4177,6 @@ msgstr "profunditat" msgid "create a shallow clone of that depth" msgstr "crea un clon superficial d'aquesta profunditat" -msgid "time" -msgstr "data" - msgid "create a shallow clone since a specific time" msgstr "crea un clon superficial des d'una data especÃfica" @@ -4377,6 +4409,9 @@ msgstr "no s'ha pogut inicialitzar el repositori, s'omet l'URI del paquet" msgid "failed to fetch objects from bundle URI '%s'" msgstr "no s'han pogut obtenir els objectes de l'URI del paquet «%s»" +msgid "failed to fetch advertised bundles" +msgstr "no s'han pogut obtenir els paquets anunciats" + msgid "remote transport reported error" msgstr "el transport remot ha informat d'un error" @@ -5625,27 +5660,6 @@ msgstr "no s'ha proporcionat l'<eina> per a --tool=<eina>" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no s'ha proporcionat l'<ordre> per a --extcmd=<ordre>" -msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -msgstr "git env--helper --type=[bool|ulong] <opcions> <env-var>" - -msgid "default for git_env_*(...) to fall back on" -msgstr "valor per defecte per a git_env_*(...) en cas d'absència" - -msgid "be quiet only use git_env_*() value as exit code" -msgstr "silenciós només utilitza el valor git_env_*() com a codi de sortida" - -#, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "l'opció «--default» espera un valor booleà amb «--type=bool», no «%s»" - -#, c-format -msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not " -"`%s`" -msgstr "" -"l'opció «--default» espera un valor llarg sense signe amb «--type=ulong», no " -"«%s»" - msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<rev-list-opts>]" @@ -6055,6 +6069,10 @@ msgstr "no s'admet una profunditat negativa en --deepen" msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un repositori complet no té sentit" +#, c-format +msgid "failed to fetch bundles from '%s'" +msgstr "no s'han pogut obtenir els paquets de «%s»" + msgid "fetch --all does not take a repository argument" msgstr "fetch --all no accepta un argument de repositori" @@ -7087,12 +7105,19 @@ msgstr "ús: %s%s" msgid "'git help config' for more information" msgstr "«git help config» per a més informació" -msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" -msgstr "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" +msgid "" +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" +"args>]" +msgstr "" +"git hook run [--ignore-missing] [--to-stdin=<camÃ>] <hook-name> [-- <hook-" +"args>]" msgid "silently ignore missing requested <hook-name>" msgstr "ignora silenciosament la sol·licitud <hook-name> perduda" +msgid "file to read into hooks' stdin" +msgstr "fitxer per a llegir a l'entrada està ndard dels lligams" + #, c-format msgid "object type mismatch at %s" msgstr "hi ha una discordança de tipus d'objecte a %s" @@ -7929,11 +7954,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" -" [--symref] [<repository> [<refs>...]]" +" [--symref] [<repository> [<patterns>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" -" [--symref] [<repository> [<refs>...]]" +" [--symref] [<repository> [<patterns>...]]" msgid "do not print remote URL" msgstr "no imprimeixis l'URL remot" @@ -8179,9 +8204,15 @@ msgstr "permet fusionar històries no relacionades" msgid "perform multiple merges, one per line of input" msgstr "realitza múltiples fusions, una per lÃnia d'entrada" +msgid "specify a merge-base for the merge" +msgstr "cal especificar una referència base per a la fusió" + msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge és incompatible amb totes les altres opcions" +msgid "--merge-base is incompatible with --stdin" +msgstr "--merge-base és incompatible amb --stdin" + #, c-format msgid "malformed input line: '%s'." msgstr "lÃnia d'entrada mal formada: «%s»." @@ -10102,6 +10133,9 @@ msgstr "" msgid "could not switch to %s" msgstr "no s'ha pogut commutar a %s" +msgid "apply options and merge options cannot be used together" +msgstr "les opcions apply i merge no es poden usar juntes" + #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " @@ -10312,7 +10346,7 @@ msgid "" "and run me again. I am stopping in case you still have something\n" "valuable there.\n" msgstr "" -"Sembla que ja exigeix un directori %s, i em pregunto\n" +"Sembla que ja existeix un directori %s, i em pregunto\n" "si esteu enmig d'un altre «rebase». Si aquest és el cas, proveu\n" "\t%s\n" "Si no és cas, feu:\n" @@ -10330,8 +10364,19 @@ msgstr "Mode desconegut: %s" msgid "--strategy requires --merge or --interactive" msgstr "--strategy requereix --merge o --interactive" -msgid "apply options and merge options cannot be used together" -msgstr "les opcions apply i merge no es poden usar juntes" +msgid "" +"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"autosquash" +msgstr "" +"les opcions «apply» són incompatibles amb rebase.autosquash. Considereu " +"afegir-hi --no-autosquash" + +msgid "" +"apply options are incompatible with rebase.updateRefs. Consider adding --no-" +"update-refs" +msgstr "" +"les opcions «apply» són incompatibles amb rebase.updateRefs. Considereu " +"afegir-hi --no-update-refs" #, c-format msgid "Unknown rebase backend: %s" @@ -12846,10 +12891,6 @@ msgstr "«%s» no és un nom de submòdul và lid" msgid "git submodule--helper <command>" msgstr "git submodule--helper <command>" -#, c-format -msgid "%s doesn't support --super-prefix" -msgstr "%s no admet --super-prefix" - msgid "git symbolic-ref [-m <reason>] <name> <ref>" msgstr "git symbolic-ref [-m <reason>] <name> <ref>" @@ -13597,6 +13638,11 @@ msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch no és compatible amb aquesta plataforma" #, c-format +msgid "could not parse bundle list key %s with value '%s'" +msgstr "" +"no s'ha pogut analitzar la clau de llista de paquets %s amb el valor «%s»" + +#, c-format msgid "bundle list at '%s' has no mode" msgstr "la llista de farcells a «%s» no té mode" @@ -13607,6 +13653,13 @@ msgid "insufficient capabilities" msgstr "capacitats insuficients" #, c-format +msgid "file downloaded from '%s' is not a bundle" +msgstr "el fitxer baixat de «%s» no és un paquet" + +msgid "failed to store maximum creation token" +msgstr "no s'ha pogut emmagatzemar el testimoni de creació mà xim" + +#, c-format msgid "unrecognized bundle mode from URI '%s'" msgstr "no s'ha reconegut el model del farcell de l'URI «%s»" @@ -13622,6 +13675,13 @@ msgstr "no s'ha pogut baixar el paquet de l'URI «%s»" msgid "file at URI '%s' is not a bundle or bundle list" msgstr "el fitxer a l'URI «%s» no és farcell o una llista de farcells" +#, c-format +msgid "bundle-uri: unexpected argument: '%s'" +msgstr "bundle-uri: argument inesperat: «%s»" + +msgid "bundle-uri: expected flush after arguments" +msgstr "bundle-uri: s'esperava una neteja després dels arguments" + msgid "bundle-uri: got an empty line" msgstr "bundle-uri: té una lÃnia buida" @@ -13653,6 +13713,13 @@ msgstr "Al repositori li manquen aquestes comissions prerequerides:" msgid "need a repository to verify a bundle" msgstr "cal un repositori per a verificar un farcell" +msgid "" +"some prerequisite commits exist in the object store, but are not connected " +"to the repository's history" +msgstr "" +"hi ha algunes comissions requerides al magatzem d'objectes, però no estan " +"connectades a l'historial del repositori" + #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %<PRIuMAX> refs:" @@ -15096,17 +15163,24 @@ msgid "unknown object format '%s' specified by server" msgstr "format d'objecte «%s» especificat pel servidor desconegut" #, c-format -msgid "invalid ls-refs response: %s" -msgstr "resposta de ls-refs no và lida: %s" +msgid "error on bundle-uri response line %d: %s" +msgstr "error a la lÃnia de resposta de bundle-uri %d: %s" -msgid "expected flush after ref listing" -msgstr "s'esperava una neteja després del llistat de referències" +msgid "expected flush after bundle-uri listing" +msgstr "s'esperava un buidatge després del llistat de bundle-uri" msgid "expected response end packet after ref listing" msgstr "" "s'esperava un paquet de final de resposta després del llistat de referències" #, c-format +msgid "invalid ls-refs response: %s" +msgstr "resposta de ls-refs no và lida: %s" + +msgid "expected flush after ref listing" +msgstr "s'esperava una neteja després del llistat de referències" + +#, c-format msgid "protocol '%s' is not supported" msgstr "el protocol «%s» no és compatible" @@ -15479,7 +15553,7 @@ msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" msgstr "" -"el mode «%s» de «color-moved-ws» és desconegut, els valor possibles són " +"el mode «%s» de «color-moved-ws» és desconegut, els valors possibles són " "«ignore-space-change», «ignore-space-at-eol», «ignore-all-space», «allow-" "indentation-change»" @@ -16284,16 +16358,14 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]" +" [--config-env=<name>=<envvar>] <command> [<args>]" msgstr "" -"git [-v | --version] [-h | --help] [-C <camÃ>] [-c <name>=<value>]\n" -" [--exec-path[=<camÃ>]] [--html-path] [--man-path] [--info-path]\n" +"git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" +" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" -" [--git-dir=<camÃ>] [--work-tree=<camÃ>] [--namespace=<name>]\n" -" [--super-prefix=<camÃ>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]" +" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" [--config-env=<name>=<envvar>] <command> [<args>]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -16319,10 +16391,6 @@ msgid "no namespace given for --namespace\n" msgstr "no s'ha especificat un nom d'espai per --namespace\n" #, c-format -msgid "no prefix given for --super-prefix\n" -msgstr "no s'ha especificat cap prefix per a --super-prefix\n" - -#, c-format msgid "-c expects a configuration string\n" msgstr "-c espera una cadena de configuració\n" @@ -16434,8 +16502,13 @@ msgstr "" msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand ha fallat: %s %s" -msgid "gpg failed to sign the data" -msgstr "gpg ha fallat en signar les dades" +#, c-format +msgid "" +"gpg failed to sign the data:\n" +"%s" +msgstr "" +"gpg ha fallat en signar les dades:\n" +"%s" msgid "user.signingKey needs to be set for ssh signing" msgstr "user.signingKey s'ha d'establir per a signar amb ssh" @@ -17605,6 +17678,10 @@ msgid "garbage at end of loose object '%s'" msgstr "brossa al final de l'objecte solt «%s»" #, c-format +msgid "unable to open loose object %s" +msgstr "no s'ha pogut obrir l'objecte solt %s" + +#, c-format msgid "unable to parse %s header" msgstr "no s'ha pogut analitzar la capçalera %s" @@ -17620,18 +17697,14 @@ msgid "header for %s too long, exceeds %d bytes" msgstr "la capçalera per a %s és massa llarga, supera els %d bytes" #, c-format -msgid "failed to read object %s" -msgstr "s'ha produït un error en llegir l'objecte %s" +msgid "loose object %s (stored in %s) is corrupt" +msgstr "l'objecte solt %s (emmagatzemat a %s) és corrupte" #, c-format msgid "replacement %s not found for %s" msgstr "no s'ha trobat el reemplaçament %s per a %s" #, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "l'objecte solt %s (emmagatzemat a %s) és corrupte" - -#, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objecte empaquetat %s (emmagatzemat a %s) és corrupte" @@ -17643,9 +17716,6 @@ msgstr "no s'ha pogut escriure al fitxer %s" msgid "unable to set permission to '%s'" msgstr "no s'ha pogut establir el permÃs a «%s»" -msgid "file write error" -msgstr "s'ha produït un error en escriure al fitxer" - msgid "error when closing loose object file" msgstr "error en tancar el fitxer d'objecte solt" @@ -17693,11 +17763,12 @@ msgstr "s'ha produït un error en crear el directori %s" msgid "cannot read object for %s" msgstr "no es pot llegir l'objecte per a %s" -msgid "corrupt commit" -msgstr "comissió corrupta" +#, c-format +msgid "object fails fsck: %s" +msgstr "l'objecte ha fallat fsck: %s" -msgid "corrupt tag" -msgstr "etiqueta corrupta" +msgid "refusing to create malformed object" +msgstr "es nega a crear un objecte mal format" #, c-format msgid "read error while indexing %s" @@ -17966,10 +18037,6 @@ msgstr "el desplaçament XOR a l'Ãndex de mapa de bits no és và lid" msgid "cannot fstat bitmap file" msgstr "no es pot fer fstat en el fitxer de mapa de bits" -#, c-format -msgid "ignoring extra bitmap file: '%s'" -msgstr "s'ignorarà el fitxer extra de mapa de bits: «%s»" - msgid "checksum doesn't match in MIDX and bitmap" msgstr "la suma de verificació no coincideix amb el MIDX i el mapa de bits" @@ -18240,6 +18307,9 @@ msgstr "sigues més discret" msgid "use <n> digits to display object names" msgstr "usa <n> xifres per a mostrar els noms d'objecte" +msgid "prefixed path to initial superproject" +msgstr "camà prefixat al superprojecte inicial" + msgid "how to strip spaces and #comments from message" msgstr "com suprimir els espais i #comentaris del missatge" @@ -18749,6 +18819,14 @@ msgid "ahead %d, behind %d" msgstr "davant per %d, darrere per %d" #, c-format +msgid "%%(%.*s) does not take arguments" +msgstr "%%(%.*s) no accepta arguments" + +#, c-format +msgid "unrecognized %%(%.*s) argument: %s" +msgstr "argument %%(%.*s) desconegut: %s" + +#, c-format msgid "expected format: %%(color:<color>)" msgstr "format esperat: %%(color:<color>)" @@ -18765,22 +18843,6 @@ msgid "Integer value expected refname:rstrip=%s" msgstr "Valor enter esperat pel nom de referència:rstrip=%s" #, c-format -msgid "unrecognized %%(%s) argument: %s" -msgstr "argument %%(%s) desconegut: %s" - -#, c-format -msgid "%%(objecttype) does not take arguments" -msgstr "%%(objecttype) no accepta arguments" - -#, c-format -msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) no accepta arguments" - -#, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) no accepta arguments" - -#, c-format msgid "expected %%(trailers:key=<value>)" msgstr "s'esperava %%(trailers:key=<value>)" @@ -18797,10 +18859,6 @@ msgid "positive value expected '%s' in %%(%s)" msgstr "valor positiu esperat «%s» a %%(%s)" #, c-format -msgid "unrecognized email option: %s" -msgstr "opció del correu electrònic no reconeguda: «%s»" - -#, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format esperat: %%(align:<amplada>,<posició>)" @@ -18813,12 +18871,12 @@ msgid "unrecognized width:%s" msgstr "amplada no reconeguda:%s" #, c-format -msgid "positive width expected with the %%(align) atom" -msgstr "amplada positiva esperada amb l'à tom %%(align)" +msgid "unrecognized %%(%s) argument: %s" +msgstr "argument %%(%s) desconegut: %s" #, c-format -msgid "%%(rest) does not take arguments" -msgstr "%%(rest) no accepta arguments" +msgid "positive width expected with the %%(align) atom" +msgstr "amplada positiva esperada amb l'à tom %%(align)" #, c-format msgid "malformed field name: %.*s" @@ -20077,6 +20135,23 @@ msgid "git %s: failed to refresh the index" msgstr "git %s: s'ha produït un error en actualitzar l'Ãndex" #, c-format +msgid "'%s' is not a valid label" +msgstr "«%s» no és una etiqueta và lida" + +#, c-format +msgid "'%s' is not a valid refname" +msgstr "«%s» no és un nom de referència và lid" + +#, c-format +msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" +msgstr "" +"«update-ref» requereix un refname plenament qualificat, p. ex. refs/heads/%s" + +#, c-format +msgid "invalid command '%.*s'" +msgstr "ordre no và lida «%.*s»" + +#, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no accepta arguments: «%s»" @@ -20882,6 +20957,16 @@ msgstr "ls-tree ha retornat un codi de retorn %d no esperat" msgid "failed to lstat '%s'" msgstr "s'ha produït un error en fer lstat a «%s»" +msgid "no remote configured to get bundle URIs from" +msgstr "no hi ha cap remot configurat per a obtenir els URI del paquet" + +#, c-format +msgid "remote '%s' has no configured URL" +msgstr "el remot «%s» no té cap URL configurat" + +msgid "could not get the bundle-uri list" +msgstr "no s'ha pogut obtenir la llista bundle-uri" + msgid "test-tool cache-tree <options> (control|prime|update)" msgstr "test-tool cache-tree <opcions> (control|prime|update)" @@ -21234,6 +21319,13 @@ msgstr "S'està avortant." msgid "failed to push all needed submodules" msgstr "no s'han pogut pujar tots els submòduls necessaris" +msgid "bundle-uri operation not supported by protocol" +msgstr "L'operació bundle-uri no és compatible amb el protocol" + +msgid "could not retrieve server-advertised bundle-uri list" +msgstr "" +"no s'ha pogut recuperar la llista de paquets d'URI anunciats pel servidor" + msgid "too-short tree object" msgstr "objecte d'arbre massa curt" @@ -21981,14 +22073,20 @@ msgstr "Fitxers ignorats" #, c-format msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." +"It took %.2f seconds to enumerate untracked files,\n" +"but the results were cached, and subsequent runs may be faster." +msgstr "" +"S'han trigat %.2f segons a enumerar els fitxers sense seguiment,\n" +"però els resultats es van emmagatzemar a la memòria cau, i les\n" +"execucions posteriors podrien ser més rà pides." + +#, c-format +msgid "It took %.2f seconds to enumerate untracked files." +msgstr "S'han trigat %.2f segons a enumerar els fitxers sense seguiment." + +msgid "See 'git help status' for information on how to improve this." msgstr "" -"S'ha trigat %.2f segons enumerar els fitxers no seguits.\n" -"«status -uno» pot accelerar-ho, però heu d'anar amb compte de no\n" -"oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n" -"«git help status»)." +"Vegeu «git help status» per a obtenir informació sobre com millorar-ho." #, c-format msgid "Untracked files not listed%s" @@ -22134,276 +22232,6 @@ msgstr "" msgid "Unable to determine absolute path of git directory" msgstr "No s'ha pogut determinar el camà absolut del directori de git" -#. TRANSLATORS: you can adjust this to align "git add -i" status menu -#, perl-format -msgid "%12s %12s %s" -msgstr "%12s %12s %s" - -#, perl-format -msgid "touched %d path\n" -msgid_plural "touched %d paths\n" -msgstr[0] "modificat %d camÃ\n" -msgstr[1] "modificat %d camins\n" - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging." -msgstr "" -"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" -"per «staging»." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for stashing." -msgstr "" -"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" -"per «stashing»." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for unstaging." -msgstr "" -"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" -"per «unstaging»." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for applying." -msgstr "" -"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" -"per a aplicar-se." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding." -msgstr "" -"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" -"per a descartar-se." - -#, perl-format -msgid "failed to open hunk edit file for writing: %s" -msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s" - -#, perl-format -msgid "" -"---\n" -"To remove '%s' lines, make them ' ' lines (context).\n" -"To remove '%s' lines, delete them.\n" -"Lines starting with %s will be removed.\n" -msgstr "" -"---\n" -"Per a eliminar les lÃnies «%s», convertiu-les en lÃnies ' ' (context).\n" -"Per a eliminar les lÃnies «%s», suprimiu-les.\n" -"Les lÃnies que comencin per %s s'eliminaran.\n" - -#, perl-format -msgid "failed to open hunk edit file for reading: %s" -msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s" - -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this hunk and all later hunks in the file\n" -"d - do not stage this hunk or any of the later hunks in the file" -msgstr "" -"y - fes «stage» d'aquest tros\n" -"n - no facis «stage» d'aquest tros\n" -"q - surt; no facis «stage» d'aquest tros o de cap altre restant\n" -"a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n" -"d - no facis «stage» d'aquest tros o de cap altre restant del fitxer" - -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file" -msgstr "" -"y - fes «stash» d'aquest tros\n" -"n - no facis «stash» d'aquest tros\n" -"q - surt; no facis «stash» d'aquest tros o de cap altre restant\n" -"a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n" -"d - no facis «stash» d'aquest tros o de cap altre restant del fitxer" - -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"a - unstage this hunk and all later hunks in the file\n" -"d - do not unstage this hunk or any of the later hunks in the file" -msgstr "" -"y - fes «unstage» d'aquest tros\n" -"n - no facis «unstage» d'aquest tros\n" -"q - surt; no facis «unstage» d'aquest tros o de cap altre restant\n" -"a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n" -"d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer" - -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - aplica aquest tros a l'Ãndex\n" -"n - no apliquis aquest tros a l'Ãndex\n" -"q - surt; no apliquis aquest tros ni cap dels pendents\n" -"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" -"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" - -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - descarta aquest tros de l'arbre de treball\n" -"n - no descartis aquest tros des de l'arbre de treball\n" -"q - surt; no descartis aquest tros ni cap dels pendents\n" -"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" -"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer" - -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - descarta aquest tros de l'Ãndex i de l'arbre de treball\n" -"n - no descartis aquest tros des de l'Ãndex i de l'arbre de treball\n" -"q - surt; no descartis aquest tros ni cap dels pendents\n" -"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" -"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer" - -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - aplica aquest tros a l'Ãndex i l'arbre de treball\n" -"n - no apliquis aquest tros des de l'Ãndex i de l'arbre de treball\n" -"q - surt; no apliquis aquest tros ni cap dels pendents\n" -"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" -"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" - -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - aplica aquest tros a l'arbre de treball\n" -"n - no apliquis aquest tros a l'arbre de treball\n" -"q - surt; no apliquis aquest tros ni cap dels pendents\n" -"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" -"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" - -msgid "" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"g - selecciona el tros on voleu anar\n" -"/ - cerca un tros que coincideixi amb l'expressió regular donada\n" -"j - deixa aquest tros sense decidir, veure el tros sense decidir següent\n" -"J - deixa aquest tros sense decidir, veure el tros següent\n" -"k - deixa aquest tros sense decidir, veure el tros sense decidir anterior\n" -"K - deixa aquest tros sense decidir, veure el tros anterior\n" -"s - divideix el tros actual en trossos més petits\n" -"e - edita manualment el tros actual\n" -"? - mostra l'ajuda\n" - -msgid "The selected hunks do not apply to the index!\n" -msgstr "Els trossos seleccionats no apliquen a l'Ãndex\n" - -#, perl-format -msgid "ignoring unmerged: %s\n" -msgstr "s'està ignorant %s no fusionat\n" - -msgid "No other hunks to goto\n" -msgstr "No hi ha altres trossos on anar-hi\n" - -#, perl-format -msgid "Invalid number: '%s'\n" -msgstr "Número no và lid: «%s»\n" - -#, perl-format -msgid "Sorry, only %d hunk available.\n" -msgid_plural "Sorry, only %d hunks available.\n" -msgstr[0] "Només %d tros disponible.\n" -msgstr[1] "Només %d trossos disponibles.\n" - -msgid "No other hunks to search\n" -msgstr "No hi ha cap altre tros a cercar\n" - -#, perl-format -msgid "Malformed search regexp %s: %s\n" -msgstr "Expressió regular de cerca mal formada %s: %s\n" - -msgid "No hunk matches the given pattern\n" -msgstr "No hi ha trossos que coincideixin amb el patró donat\n" - -msgid "No previous hunk\n" -msgstr "Sense tros previ\n" - -msgid "No next hunk\n" -msgstr "No hi ha tros següent\n" - -msgid "Sorry, cannot split this hunk\n" -msgstr "No es pot dividir aquest tros\n" - -#, perl-format -msgid "Split into %d hunk.\n" -msgid_plural "Split into %d hunks.\n" -msgstr[0] "Divideix en %d tros.\n" -msgstr[1] "Divideix en %d trossos.\n" - -msgid "Sorry, cannot edit this hunk\n" -msgstr "No es pot editar aquest tros\n" - -#. TRANSLATORS: please do not translate the command names -#. 'status', 'update', 'revert', etc. -msgid "" -"status - show paths with changes\n" -"update - add working tree state to the staged set of changes\n" -"revert - revert staged set of changes back to the HEAD version\n" -"patch - pick hunks and update selectively\n" -"diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of " -"changes\n" -msgstr "" -"status - mostra els camins amb canvis\n" -"update - afegeix l'estat de l'arbre de treball al conjunt de canvis " -"«staged»\n" -"revert - reverteix el conjunt de canvis de «staged» a la versió HEAD\n" -"patch - selecciona trossos i actualitza'ls selectivament\n" -"diff - mostra la diferència entre HEAD i l'Ãndex\n" -"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de " -"canvis «staged»\n" - -msgid "missing --" -msgstr "manca --" - -#, perl-format -msgid "unknown --patch mode: %s" -msgstr "desconegut --patch mode: %s" - -#, perl-format -msgid "invalid argument %s, expecting --" -msgstr "argument %s no và lid, s'esperava --" - msgid "local zone differs from GMT by a non-minute interval\n" msgstr "la zona local difereix de GMT per un interval que no és de minuts\n" @@ -22728,6 +22556,366 @@ msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Esteu segur que voleu enviar %s? [y|N]: " +#~ msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" +#~ msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]" + +#~ msgid "won't bisect on cg-seek'ed tree" +#~ msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek" + +#~ msgid "--bisect-terms requires 0 or 1 argument" +#~ msgstr "--bisect-terms requereix 0 o 1 argument" + +#~ msgid "--bisect-next requires 0 arguments" +#~ msgstr "--bisect-next no requereix cap argument" + +#~ msgid "--bisect-log requires 0 arguments" +#~ msgstr "--bisect-log no requereix cap argument" + +#~ msgid "git env--helper --type=[bool|ulong] <options> <env-var>" +#~ msgstr "git env--helper --type=[bool|ulong] <opcions> <env-var>" + +#~ msgid "default for git_env_*(...) to fall back on" +#~ msgstr "valor per defecte per a git_env_*(...) en cas d'absència" + +#~ msgid "be quiet only use git_env_*() value as exit code" +#~ msgstr "silenciós només utilitza el valor git_env_*() com a codi de sortida" + +#, c-format +#~ msgid "" +#~ "option `--default' expects a boolean value with `--type=bool`, not `%s`" +#~ msgstr "" +#~ "l'opció «--default» espera un valor booleà amb «--type=bool», no «%s»" + +#, c-format +#~ msgid "" +#~ "option `--default' expects an unsigned long value with `--type=ulong`, " +#~ "not `%s`" +#~ msgstr "" +#~ "l'opció «--default» espera un valor llarg sense signe amb «--type=ulong», " +#~ "no «%s»" + +#, c-format +#~ msgid "%s doesn't support --super-prefix" +#~ msgstr "%s no admet --super-prefix" + +#, c-format +#~ msgid "no prefix given for --super-prefix\n" +#~ msgstr "no s'ha especificat cap prefix per a --super-prefix\n" + +#, c-format +#~ msgid "failed to read object %s" +#~ msgstr "s'ha produït un error en llegir l'objecte %s" + +#~ msgid "file write error" +#~ msgstr "s'ha produït un error en escriure al fitxer" + +#~ msgid "corrupt commit" +#~ msgstr "comissió corrupta" + +#~ msgid "corrupt tag" +#~ msgstr "etiqueta corrupta" + +#, c-format +#~ msgid "%%(objecttype) does not take arguments" +#~ msgstr "%%(objecttype) no accepta arguments" + +#, c-format +#~ msgid "%%(deltabase) does not take arguments" +#~ msgstr "%%(deltabase) no accepta arguments" + +#, c-format +#~ msgid "%%(body) does not take arguments" +#~ msgstr "%%(body) no accepta arguments" + +#, c-format +#~ msgid "unrecognized email option: %s" +#~ msgstr "opció del correu electrònic no reconeguda: «%s»" + +#, c-format +#~ msgid "" +#~ "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" +#~ "may speed it up, but you have to be careful not to forget to add\n" +#~ "new files yourself (see 'git help status')." +#~ msgstr "" +#~ "S'ha trigat %.2f segons enumerar els fitxers no seguits.\n" +#~ "«status -uno» pot accelerar-ho, però heu d'anar amb compte de no\n" +#~ "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n" +#~ "«git help status»)." + +#, perl-format +#~ msgid "%12s %12s %s" +#~ msgstr "%12s %12s %s" + +#, perl-format +#~ msgid "touched %d path\n" +#~ msgid_plural "touched %d paths\n" +#~ msgstr[0] "modificat %d camÃ\n" +#~ msgstr[1] "modificat %d camins\n" + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for staging." +#~ msgstr "" +#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà " +#~ "immediatament\n" +#~ "per «staging»." + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for stashing." +#~ msgstr "" +#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà " +#~ "immediatament\n" +#~ "per «stashing»." + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for unstaging." +#~ msgstr "" +#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà " +#~ "immediatament\n" +#~ "per «unstaging»." + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for applying." +#~ msgstr "" +#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà " +#~ "immediatament\n" +#~ "per a aplicar-se." + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for discarding." +#~ msgstr "" +#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà " +#~ "immediatament\n" +#~ "per a descartar-se." + +#, perl-format +#~ msgid "failed to open hunk edit file for writing: %s" +#~ msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s" + +#, perl-format +#~ msgid "" +#~ "---\n" +#~ "To remove '%s' lines, make them ' ' lines (context).\n" +#~ "To remove '%s' lines, delete them.\n" +#~ "Lines starting with %s will be removed.\n" +#~ msgstr "" +#~ "---\n" +#~ "Per a eliminar les lÃnies «%s», convertiu-les en lÃnies ' ' (context).\n" +#~ "Per a eliminar les lÃnies «%s», suprimiu-les.\n" +#~ "Les lÃnies que comencin per %s s'eliminaran.\n" + +#, perl-format +#~ msgid "failed to open hunk edit file for reading: %s" +#~ msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s" + +#~ msgid "" +#~ "y - stage this hunk\n" +#~ "n - do not stage this hunk\n" +#~ "q - quit; do not stage this hunk or any of the remaining ones\n" +#~ "a - stage this hunk and all later hunks in the file\n" +#~ "d - do not stage this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - fes «stage» d'aquest tros\n" +#~ "n - no facis «stage» d'aquest tros\n" +#~ "q - surt; no facis «stage» d'aquest tros o de cap altre restant\n" +#~ "a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n" +#~ "d - no facis «stage» d'aquest tros o de cap altre restant del fitxer" + +#~ msgid "" +#~ "y - stash this hunk\n" +#~ "n - do not stash this hunk\n" +#~ "q - quit; do not stash this hunk or any of the remaining ones\n" +#~ "a - stash this hunk and all later hunks in the file\n" +#~ "d - do not stash this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - fes «stash» d'aquest tros\n" +#~ "n - no facis «stash» d'aquest tros\n" +#~ "q - surt; no facis «stash» d'aquest tros o de cap altre restant\n" +#~ "a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n" +#~ "d - no facis «stash» d'aquest tros o de cap altre restant del fitxer" + +#~ msgid "" +#~ "y - unstage this hunk\n" +#~ "n - do not unstage this hunk\n" +#~ "q - quit; do not unstage this hunk or any of the remaining ones\n" +#~ "a - unstage this hunk and all later hunks in the file\n" +#~ "d - do not unstage this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - fes «unstage» d'aquest tros\n" +#~ "n - no facis «unstage» d'aquest tros\n" +#~ "q - surt; no facis «unstage» d'aquest tros o de cap altre restant\n" +#~ "a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n" +#~ "d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer" + +#~ msgid "" +#~ "y - apply this hunk to index\n" +#~ "n - do not apply this hunk to index\n" +#~ "q - quit; do not apply this hunk or any of the remaining ones\n" +#~ "a - apply this hunk and all later hunks in the file\n" +#~ "d - do not apply this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - aplica aquest tros a l'Ãndex\n" +#~ "n - no apliquis aquest tros a l'Ãndex\n" +#~ "q - surt; no apliquis aquest tros ni cap dels pendents\n" +#~ "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" +#~ "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" + +#~ msgid "" +#~ "y - discard this hunk from worktree\n" +#~ "n - do not discard this hunk from worktree\n" +#~ "q - quit; do not discard this hunk or any of the remaining ones\n" +#~ "a - discard this hunk and all later hunks in the file\n" +#~ "d - do not discard this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - descarta aquest tros de l'arbre de treball\n" +#~ "n - no descartis aquest tros des de l'arbre de treball\n" +#~ "q - surt; no descartis aquest tros ni cap dels pendents\n" +#~ "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" +#~ "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer" + +#~ msgid "" +#~ "y - discard this hunk from index and worktree\n" +#~ "n - do not discard this hunk from index and worktree\n" +#~ "q - quit; do not discard this hunk or any of the remaining ones\n" +#~ "a - discard this hunk and all later hunks in the file\n" +#~ "d - do not discard this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - descarta aquest tros de l'Ãndex i de l'arbre de treball\n" +#~ "n - no descartis aquest tros des de l'Ãndex i de l'arbre de treball\n" +#~ "q - surt; no descartis aquest tros ni cap dels pendents\n" +#~ "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" +#~ "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer" + +#~ msgid "" +#~ "y - apply this hunk to index and worktree\n" +#~ "n - do not apply this hunk to index and worktree\n" +#~ "q - quit; do not apply this hunk or any of the remaining ones\n" +#~ "a - apply this hunk and all later hunks in the file\n" +#~ "d - do not apply this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - aplica aquest tros a l'Ãndex i l'arbre de treball\n" +#~ "n - no apliquis aquest tros des de l'Ãndex i de l'arbre de treball\n" +#~ "q - surt; no apliquis aquest tros ni cap dels pendents\n" +#~ "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" +#~ "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" + +#~ msgid "" +#~ "y - apply this hunk to worktree\n" +#~ "n - do not apply this hunk to worktree\n" +#~ "q - quit; do not apply this hunk or any of the remaining ones\n" +#~ "a - apply this hunk and all later hunks in the file\n" +#~ "d - do not apply this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - aplica aquest tros a l'arbre de treball\n" +#~ "n - no apliquis aquest tros a l'arbre de treball\n" +#~ "q - surt; no apliquis aquest tros ni cap dels pendents\n" +#~ "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" +#~ "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" + +#~ msgid "" +#~ "g - select a hunk to go to\n" +#~ "/ - search for a hunk matching the given regex\n" +#~ "j - leave this hunk undecided, see next undecided hunk\n" +#~ "J - leave this hunk undecided, see next hunk\n" +#~ "k - leave this hunk undecided, see previous undecided hunk\n" +#~ "K - leave this hunk undecided, see previous hunk\n" +#~ "s - split the current hunk into smaller hunks\n" +#~ "e - manually edit the current hunk\n" +#~ "? - print help\n" +#~ msgstr "" +#~ "g - selecciona el tros on voleu anar\n" +#~ "/ - cerca un tros que coincideixi amb l'expressió regular donada\n" +#~ "j - deixa aquest tros sense decidir, veure el tros sense decidir següent\n" +#~ "J - deixa aquest tros sense decidir, veure el tros següent\n" +#~ "k - deixa aquest tros sense decidir, veure el tros sense decidir " +#~ "anterior\n" +#~ "K - deixa aquest tros sense decidir, veure el tros anterior\n" +#~ "s - divideix el tros actual en trossos més petits\n" +#~ "e - edita manualment el tros actual\n" +#~ "? - mostra l'ajuda\n" + +#~ msgid "The selected hunks do not apply to the index!\n" +#~ msgstr "Els trossos seleccionats no apliquen a l'Ãndex\n" + +#, perl-format +#~ msgid "ignoring unmerged: %s\n" +#~ msgstr "s'està ignorant %s no fusionat\n" + +#~ msgid "No other hunks to goto\n" +#~ msgstr "No hi ha altres trossos on anar-hi\n" + +#, perl-format +#~ msgid "Invalid number: '%s'\n" +#~ msgstr "Número no và lid: «%s»\n" + +#, perl-format +#~ msgid "Sorry, only %d hunk available.\n" +#~ msgid_plural "Sorry, only %d hunks available.\n" +#~ msgstr[0] "Només %d tros disponible.\n" +#~ msgstr[1] "Només %d trossos disponibles.\n" + +#~ msgid "No other hunks to search\n" +#~ msgstr "No hi ha cap altre tros a cercar\n" + +#, perl-format +#~ msgid "Malformed search regexp %s: %s\n" +#~ msgstr "Expressió regular de cerca mal formada %s: %s\n" + +#~ msgid "No hunk matches the given pattern\n" +#~ msgstr "No hi ha trossos que coincideixin amb el patró donat\n" + +#~ msgid "No previous hunk\n" +#~ msgstr "Sense tros previ\n" + +#~ msgid "No next hunk\n" +#~ msgstr "No hi ha tros següent\n" + +#~ msgid "Sorry, cannot split this hunk\n" +#~ msgstr "No es pot dividir aquest tros\n" + +#, perl-format +#~ msgid "Split into %d hunk.\n" +#~ msgid_plural "Split into %d hunks.\n" +#~ msgstr[0] "Divideix en %d tros.\n" +#~ msgstr[1] "Divideix en %d trossos.\n" + +#~ msgid "Sorry, cannot edit this hunk\n" +#~ msgstr "No es pot editar aquest tros\n" + +#~ msgid "" +#~ "status - show paths with changes\n" +#~ "update - add working tree state to the staged set of changes\n" +#~ "revert - revert staged set of changes back to the HEAD version\n" +#~ "patch - pick hunks and update selectively\n" +#~ "diff - view diff between HEAD and index\n" +#~ "add untracked - add contents of untracked files to the staged set of " +#~ "changes\n" +#~ msgstr "" +#~ "status - mostra els camins amb canvis\n" +#~ "update - afegeix l'estat de l'arbre de treball al conjunt de " +#~ "canvis «staged»\n" +#~ "revert - reverteix el conjunt de canvis de «staged» a la versió " +#~ "HEAD\n" +#~ "patch - selecciona trossos i actualitza'ls selectivament\n" +#~ "diff - mostra la diferència entre HEAD i l'Ãndex\n" +#~ "add untracked - afegeix el contingut dels fitxers no seguits al conjunt " +#~ "de canvis «staged»\n" + +#~ msgid "missing --" +#~ msgstr "manca --" + +#, perl-format +#~ msgid "unknown --patch mode: %s" +#~ msgstr "desconegut --patch mode: %s" + +#, perl-format +#~ msgid "invalid argument %s, expecting --" +#~ msgstr "argument %s no và lid, s'esperava --" + #, c-format #~ msgid "unable to normalize object directory: %s" #~ msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s" @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-12-02 17:16+0100\n" -"PO-Revision-Date: 2022-12-02 17:19+0100\n" +"POT-Creation-Date: 2023-03-03 17:13+0100\n" +"PO-Revision-Date: 2023-03-03 13:46+0100\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German\n" "Language: de\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 3.2\n" +"X-Generator: Poedit 3.2.2\n" #, c-format msgid "Huh (%s)?" @@ -45,13 +45,13 @@ msgstr "Konnte '%s' nicht zum Commit vormerken." msgid "could not write index" msgstr "konnte Index nicht schreiben" -#, c-format, perl-format +#, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "%d Pfad aktualisiert\n" msgstr[1] "%d Pfade aktualisiert\n" -#, c-format, perl-format +#, c-format msgid "note: %s is untracked now.\n" msgstr "Hinweis: %s ist nun unversioniert.\n" @@ -65,7 +65,7 @@ msgstr "Revert" msgid "Could not parse HEAD^{tree}" msgstr "Konnte HEAD^{tree} nicht parsen." -#, c-format, perl-format +#, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "%d Pfad wiederhergestellt\n" @@ -78,7 +78,7 @@ msgstr "Keine unversionierten Dateien.\n" msgid "Add untracked" msgstr "Unversionierte Dateien hinzufügen" -#, c-format, perl-format +#, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "%d Pfad hinzugefügt\n" @@ -172,19 +172,19 @@ msgstr "Index konnte nicht aktualisiert werden" msgid "Bye.\n" msgstr "Tschüss.\n" -#, c-format, perl-format +#, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "Ergänzung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d%s,?]? " @@ -210,19 +210,19 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit " "vormerken\n" -#, c-format, perl-format +#, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Modusänderung stashen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Löschung stashen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Ergänzung stashen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Diesen Patch-Block stashen [y,n,q,a,d%s,?]? " @@ -246,19 +246,19 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen\n" -#, c-format, perl-format +#, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Ergänzung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " @@ -285,19 +285,19 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht aus Staging-" "Area entfernen\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Modusänderung auf Index anwenden [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Löschung auf Index anwenden [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Ergänzung auf Index anwenden [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d%s,?]? " @@ -324,19 +324,19 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index " "anwenden\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Ergänzung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " @@ -363,20 +363,20 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im " "Arbeitsverzeichnis verwerfen\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "Ergänzung im Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a," @@ -395,20 +395,20 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n" "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "Ergänzung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a," @@ -428,19 +428,19 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Modusänderung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Löschung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "Ergänzung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "" "Diesen Patch-Block auf das Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " @@ -519,7 +519,6 @@ msgstr "" "Um '%c' Zeilen zu entfernen, löschen Sie diese.\n" "Zeilen, die mit %c beginnen, werden entfernt.\n" -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -542,12 +541,6 @@ msgstr "'git apply --cached' schlug fehl" #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -1416,6 +1409,12 @@ msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen" msgid "report archived files on stderr" msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben" +msgid "time" +msgstr "Zeit" + +msgid "set modification time of archive entries" +msgstr "Änderungszeitpunkt von Archiveinträgen festlegen" + msgid "set compression level" msgstr "Komprimierungsgrad setzen" @@ -1456,6 +1455,13 @@ msgstr "Argument für Format '%s' nicht unterstützt: -%d" msgid "%.*s is not a valid attribute name" msgstr "%.*s ist kein gültiger Attributname" +msgid "unable to add additional attribute" +msgstr "konnte kein zusätzliches Attribut hinzufügen" + +#, c-format +msgid "ignoring overly long attributes line %d" +msgstr "ignoriere übermäßig lange Attribut-Zeile %d" + #, c-format msgid "%s not allowed: %s:%d" msgstr "%s nicht erlaubt: %s:%d" @@ -1468,6 +1474,18 @@ msgstr "" "Benutzen Sie '\\!' für führende Ausrufezeichen." #, c-format +msgid "cannot fstat gitattributes file '%s'" +msgstr "Kann gitattributes-Datei '%s' nicht lesen" + +#, c-format +msgid "ignoring overly large gitattributes file '%s'" +msgstr "ignoriere übermäßig große gitattributes-Datei '%s'" + +#, c-format +msgid "ignoring overly large gitattributes blob '%s'" +msgstr "ignoriere übermäßig großen gitattribute-Blob '%s'" + +#, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Ungültiger Inhalt bzgl. Anführungszeichen in Datei '%s': %s" @@ -1651,10 +1669,12 @@ msgstr "" msgid "not tracking: ambiguous information for ref '%s'" msgstr "kein Tracking: mehrdeutige Informationen für Referenz '%s'" +#. #-#-#-#-# branch.c.po #-#-#-#-# #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. #. +#. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space @@ -1748,11 +1768,11 @@ msgstr "Submodul '%s': Submodul konnte nicht gefunden werden" #, c-format msgid "" -"You may try updating the submodules using 'git checkout %s && git submodule " -"update --init'" +"You may try updating the submodules using 'git checkout --no-recurse-" +"submodules %s && git submodule update --init'" msgstr "" -"Sie können versuchen die Submodule mit 'git checkout %s && git submodule " -"update --init' zu aktualisieren" +"Sie können versuchen, die Submodule mit \"git checkout --no-recurse-" +"submodules %s && git submodule update --init\" zu aktualisieren." #, c-format msgid "submodule '%s': cannot create branch '%s'" @@ -1788,6 +1808,13 @@ msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:" +msgid "" +"the add.interactive.useBuiltin setting has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"Die Einstellung add.interactive.useBuiltin wurde entfernt!\n" +"Siehe den Eintrag in 'git help config' für Details." + msgid "Could not read the index" msgstr "Konnte den Index nicht lesen" @@ -2194,6 +2221,9 @@ msgstr "git am [<Optionen>] (--continue | --skip | --abort)" msgid "run interactively" msgstr "interaktiv ausführen" +msgid "bypass pre-applypatch and applypatch-msg hooks" +msgstr "Hooks pre-applypatch und applypatch-msg umgehen" + msgid "historical option -- no-op" msgstr "historische Option -- kein Effekt" @@ -2335,32 +2365,28 @@ msgstr "git archive: Protokollfehler" msgid "git archive: expected a flush" msgstr "git archive: erwartete eine Spülung (flush)" -msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [<Commit>]" - msgid "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " -"[<paths>...]" +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{new,bad}=<Begriff> --term-{old," -"good}=<Begriff>] [--no-checkout] [--first-parent] [<schlecht> [<gut>...]] " -"[--] [<Pfade>...]" +"git bisect start [--term-{new,bad}=<Begriff> --term-{old,good}=<Begriff>] [--" +"no-checkout] [--first-parent] [<schlecht> [<gut>...]] [--] " +"[<Pfadspezifikation>...]" -msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "git bisect--helper --bisect-state (bad|new) [<Commit>]" +msgid "git bisect (good|bad) [<rev>...]" +msgstr "git bisect (good|bad) [<Commit>...]" -msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "git bisect--helper --bisect-state (good|old) [<Commit>...]" +msgid "git bisect skip [(<rev>|<range>)...]" +msgstr "git bisect skip [(<Commit>|<Bereich>)...]" -msgid "git bisect--helper --bisect-replay <filename>" -msgstr "git bisect--helper --bisect-replay <Dateiname>" +msgid "git bisect reset [<commit>]" +msgstr "git bisect reset [<Commit>]" -msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" -msgstr "git bisect--helper --bisect-skip [(<Commit>|<Bereich>)...]" +msgid "git bisect replay <logfile>" +msgstr "git bisect replay <Logdatei>" -msgid "git bisect--helper --bisect-run <cmd>..." -msgstr "git bisect--helper --bisect-run <Programm>..." +msgid "git bisect run <cmd>..." +msgstr "git bisect run <Programm>..." #, c-format msgid "cannot open file '%s' in mode '%s'" @@ -2507,10 +2533,6 @@ msgstr "" "Auschecken von '%s' fehlgeschlagen. Versuchen Sie 'git bisect start " "<gültiger-Branch>'." -msgid "won't bisect on cg-seek'ed tree" -msgstr "" -"binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht möglich" - msgid "bad HEAD - strange symbolic ref" msgstr "ungültiger HEAD - merkwürdige symbolische Referenz" @@ -2562,16 +2584,16 @@ msgid "bisect run failed: no command provided." msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben." #, c-format -msgid "unable to verify '%s' on good revision" -msgstr "konnte '%s' nicht für guten Commit überprüfen" +msgid "unable to verify %s on good revision" +msgstr "kann %s bei gutem Commit nicht verifizieren" #, c-format msgid "bogus exit code %d for good revision" msgstr "fehlerhafter Exit-Code %d für guten Commit" #, c-format -msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" -msgstr "'bisect run' fehlgeschlagen: Exit-Code %d von '%s' ist < 0 oder >= 128" +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" +msgstr "bisect-Lauf fehlgeschlagen: Exit-Code %d von %s ist < 0 oder >= 128" #, c-format msgid "cannot open file '%s' for writing" @@ -2580,37 +2602,43 @@ msgstr "Datei '%s' kann nicht zum Schreiben geöffnet werden" msgid "bisect run cannot continue any more" msgstr "'bisect run' kann nicht mehr fortgesetzt werden" -#, c-format msgid "bisect run success" msgstr "'bisect run' erfolgreich ausgeführt" -#, c-format msgid "bisect found first bad commit" msgstr "binäre Suche fand ersten schlechten Commit" #, c-format -msgid "" -"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " -"code %d" +msgid "bisect run failed: 'git bisect %s' exited with error code %d" msgstr "" -"'bisect run' fehlgeschlagen: 'git bisect--helper --bisect-state %s' mit " -"Fehlercode %d beendet" - -msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset benötigt entweder kein Argument oder ein Commit" +"bisect-Lauf fehlgeschlagen: 'git bisect %s' wurde mit Fehlercode %d beendet" -msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--bisect-terms benötigt 0 oder 1 Argument" +#, c-format +msgid "'%s' requires either no argument or a commit" +msgstr "'%s' erfordert entweder kein Argument oder einen Commit" -msgid "--bisect-next requires 0 arguments" -msgstr "--bisect-next benötigt 0 Argumente" +#, c-format +msgid "'%s' requires 0 or 1 argument" +msgstr "'%s' erfordert 0 oder 1 Argument" -msgid "--bisect-log requires 0 arguments" -msgstr "--bisect-log benötigt 0 Argumente" +#, c-format +msgid "'%s' requires 0 arguments" +msgstr "'%s' erfordert 0 Argumente" msgid "no logfile given" msgstr "keine Log-Datei angegeben" +#, c-format +msgid "'%s' failed: no command provided." +msgstr "'%s' ist fehlgeschlagen: kein Befehl angegeben." + +msgid "need a command" +msgstr "Befehl benötigt" + +#, c-format +msgid "unknown command: '%s'" +msgstr "unbekannter Befehl: '%s'" + msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>" @@ -3201,6 +3229,9 @@ msgstr "git bundle list-heads <Datei> [<Referenzname>...]" msgid "git bundle unbundle [--progress] <file> [<refname>...]" msgstr "git bundle unbundle [--progress] <Datei> [<Referenzname>...]" +msgid "need a <file> argument" +msgstr "<Datei> Argument benötigt" + msgid "do not show progress meter" msgstr "keine Fortschrittsanzeige anzeigen" @@ -3254,10 +3285,6 @@ msgstr "%s benötigt Argumente" msgid "%s takes no arguments" msgstr "%s braucht kein Argument" -#, c-format -msgid "unknown command: '%s'" -msgstr "unbekannter Befehl: '%s'" - msgid "only one batch option may be specified" msgstr "Nur eine Batch-Option erlaubt." @@ -3396,11 +3423,18 @@ msgstr "<Objekt> benötigt mit '-%c'" msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "nur zwei Argumente im <Typ> <Objekt> Modus erlaubt, nicht %d" -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." -msgstr "git check-attr [-a | --all | <Attribut>...] [--] <Pfadname>..." +msgid "" +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " +"<pathname>..." +msgstr "" +"git check-attr [--source <Commit-Referenz>] [-a | --all | <Attribut>...] " +"[--] <Pfadname>..." -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" -msgstr "git check-attr --stdin [-z] [-a | --all | <Attribut>...]" +msgid "" +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" +msgstr "" +"git check-attr --stdin [-z] [--source <Commit-Referenz>] [-a | --all | " +"<Attribut>...]" msgid "report all attributes set on file" msgstr "alle Attribute einer Datei ausgeben" @@ -3414,6 +3448,12 @@ msgstr "Dateinamen von der Standard-Eingabe lesen" msgid "terminate input and output records by a NUL character" msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen" +msgid "<tree-ish>" +msgstr "<Commit-Referenz>" + +msgid "which tree-ish to check attributes at" +msgstr "in welchem Commit die Attribute zu prüfen sind" + msgid "suppress progress reporting" msgstr "Fortschrittsanzeige unterdrücken" @@ -4006,7 +4046,7 @@ msgstr "" "* - alle Elemente auswählen\n" " - (leer) Auswahl beenden\n" -#, c-format, perl-format +#, c-format msgid "Huh (%s)?\n" msgstr "Wie bitte (%s)?\n" @@ -4156,9 +4196,6 @@ msgid "create a shallow clone of that depth" msgstr "" "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen" -msgid "time" -msgstr "Zeit" - msgid "create a shallow clone since a specific time" msgstr "" "einen Klon mit unvollständiger Historie (shallow) seit einer bestimmten " @@ -4410,6 +4447,9 @@ msgstr "konnte das Repository nicht initialisieren, überspringe Bundle-URI" msgid "failed to fetch objects from bundle URI '%s'" msgstr "Objekte aus Bundle-URI '%s' konnten nicht abgerufen werden" +msgid "failed to fetch advertised bundles" +msgstr "angekündigte Bundles konnten nicht abgerufen werden" + msgid "remote transport reported error" msgstr "Remoteübertragung meldete Fehler" @@ -5675,29 +5715,6 @@ msgstr "kein <Tool> für --tool=<Tool> angegeben" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "kein <Programm> für --extcmd=<Programm> angegeben" -msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -msgstr "git env--helper --type=[bool|ulong] <Optionen> <Umgebungsvariable>" - -msgid "default for git_env_*(...) to fall back on" -msgstr "Standard für git_env_*(...), um darauf zurückzugreifen" - -msgid "be quiet only use git_env_*() value as exit code" -msgstr "Ausgaben unterdrücken; nur git_env_*() Werte als Exit-Code verwenden" - -#, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "" -"Option `--default' erwartet einen booleschen Wert bei `--type=bool`, nicht " -"`%s`" - -#, c-format -msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not " -"`%s`" -msgstr "" -"Option `--default' erwartet einen vorzeichenlosen Long-Wert bei `--" -"type=ulong`, nicht `%s`" - msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<rev-list-opts>]" @@ -6111,6 +6128,10 @@ msgstr "" "--unshallow kann nicht in einem Repository mit vollständiger Historie " "verwendet werden" +#, c-format +msgid "failed to fetch bundles from '%s'" +msgstr "Bundles aus '%s' konnten nicht abgerufen werden" + msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" @@ -6812,6 +6833,7 @@ msgstr "grep: Fehler beim Erzeugen eines Thread: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "ungültige Anzahl von Threads (%d) für %s angegeben" +#. #-#-#-#-# grep.c.po #-#-#-#-# #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads @@ -7156,12 +7178,19 @@ msgstr "Verwendung: %s%s" msgid "'git help config' for more information" msgstr "'git help config' für weitere Informationen" -msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" -msgstr "git hook run [--ignore-missing] <Hook-Name> [-- <Hook-Argumente>]" +msgid "" +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" +"args>]" +msgstr "" +"git hook run [--ignore-missing] [--to-stdin=<Pfad>] <Hook-Name> [-- <Hook-" +"Argumente>]" msgid "silently ignore missing requested <hook-name>" msgstr "fehlende Anforderung <Hook-Name> stillschweigend ignorieren" +msgid "file to read into hooks' stdin" +msgstr "Datei zum Einlesen in das Hook-stdin" + #, c-format msgid "object type mismatch at %s" msgstr "Objekt-Typen passen bei %s nicht zusammen" @@ -7999,11 +8028,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" -" [--symref] [<repository> [<refs>...]]" +" [--symref] [<repository> [<patterns>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<Programm>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<Schlüssel>]\n" -" [--symref] [<Repository> [<Referenzen>...]]" +" [--symref] [<Repository> [<Muster>...]]" msgid "do not print remote URL" msgstr "URL des Remote-Repositories nicht ausgeben" @@ -8253,9 +8282,15 @@ msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien" msgid "perform multiple merges, one per line of input" msgstr "mehrere Merges durchführen, eine pro Eingabezeile" +msgid "specify a merge-base for the merge" +msgstr "Merge-Basis für den Merge angeben" + msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge ist mit allen anderen Optionen inkompatibel" +msgid "--merge-base is incompatible with --stdin" +msgstr "--merge-base ist inkompatibel mit --stdin" + #, c-format msgid "malformed input line: '%s'." msgstr "Fehlerhafte Eingabezeile: '%s'." @@ -10210,6 +10245,11 @@ msgstr "" msgid "could not switch to %s" msgstr "Konnte nicht zu %s wechseln." +msgid "apply options and merge options cannot be used together" +msgstr "" +"Optionen für \"am\" und Optionen für \"merge\" können nicht gemeinsam " +"verwendet werden" + #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " @@ -10450,10 +10490,19 @@ msgstr "Unbekannter Modus: %s" msgid "--strategy requires --merge or --interactive" msgstr "--strategy erfordert --merge oder --interactive" -msgid "apply options and merge options cannot be used together" +msgid "" +"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"autosquash" msgstr "" -"Optionen für \"am\" und Optionen für \"merge\" können nicht gemeinsam " -"verwendet werden" +"apply-Optionen sind mit rebase.autosquash nicht kompatibel. Erwägen Sie das " +"Hinzufügen von --no-autosquash" + +msgid "" +"apply options are incompatible with rebase.updateRefs. Consider adding --no-" +"update-refs" +msgstr "" +"apply-Optionen sind nicht kompatibel mit rebase.updateRefs. Erwägen Sie das " +"Hinzufügen von --no-update-refs" #, c-format msgid "Unknown rebase backend: %s" @@ -13004,10 +13053,6 @@ msgstr "'%s' ist kein gültiger Submodul-Name" msgid "git submodule--helper <command>" msgstr "git submodule--helper <Befehl>" -#, c-format -msgid "%s doesn't support --super-prefix" -msgstr "%s unterstützt kein --super-prefix" - msgid "git symbolic-ref [-m <reason>] <name> <ref>" msgstr "git symbolic-ref [-m <Grund>] <Name> <Referenz>" @@ -13779,6 +13824,10 @@ msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch wird auf dieser Plattform nicht unterstützt" #, c-format +msgid "could not parse bundle list key %s with value '%s'" +msgstr "Konnte Bundle-Listenschlüssel %s mit Wert '%s' nicht parsen." + +#, c-format msgid "bundle list at '%s' has no mode" msgstr "Paketliste bei '%s' hat keinen Modus" @@ -13789,6 +13838,13 @@ msgid "insufficient capabilities" msgstr "unzureichende Fähigkeiten" #, c-format +msgid "file downloaded from '%s' is not a bundle" +msgstr "die von '%s' heruntergeladene Datei ist kein Bundle" + +msgid "failed to store maximum creation token" +msgstr "das maximale Erstellungs-Token konnte nicht gespeichert werden" + +#, c-format msgid "unrecognized bundle mode from URI '%s'" msgstr "nicht erkannter Bundle-Modus von URI '%s'" @@ -13804,6 +13860,13 @@ msgstr "Download des Bundles von URI '%s' fehlgeschlagen" msgid "file at URI '%s' is not a bundle or bundle list" msgstr "Datei unter URI '%s' ist kein Paket oder keine Paketliste" +#, c-format +msgid "bundle-uri: unexpected argument: '%s'" +msgstr "bundle-uri: unerwartetes Argument: '%s'" + +msgid "bundle-uri: expected flush after arguments" +msgstr "bundle-uri: erwarteter Flush nach Argumenten" + msgid "bundle-uri: got an empty line" msgstr "bundle-uri: erhielt eine leere Zeile" @@ -13835,6 +13898,13 @@ msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:" msgid "need a repository to verify a bundle" msgstr "um ein Paket zu überprüfen wird ein Repository benötigt" +msgid "" +"some prerequisite commits exist in the object store, but are not connected " +"to the repository's history" +msgstr "" +"einige vorausgesetzte Commits sind im Objektspeicher vorhanden, aber sind " +"nicht mit der Repository-Historie verbunden" + #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %<PRIuMAX> refs:" @@ -15287,15 +15357,22 @@ msgid "unknown object format '%s' specified by server" msgstr "unbekanntes Objekt-Format '%s' vom Server angegeben" #, c-format +msgid "error on bundle-uri response line %d: %s" +msgstr "Fehler in der bundle-uri-Antwortzeile %d: %s" + +msgid "expected flush after bundle-uri listing" +msgstr "erwartete Flush nach Bundle-uri-Auflistung" + +msgid "expected response end packet after ref listing" +msgstr "Antwort-Endpaket nach Auflistung der Referenzen erwartet" + +#, c-format msgid "invalid ls-refs response: %s" msgstr "ungültige ls-refs Antwort: %s" msgid "expected flush after ref listing" msgstr "Flush nach Auflistung der Referenzen erwartet" -msgid "expected response end packet after ref listing" -msgstr "Antwort-Endpaket nach Auflistung der Referenzen erwartet" - #, c-format msgid "protocol '%s' is not supported" msgstr "Protokoll '%s' wird nicht unterstützt" @@ -16472,16 +16549,14 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]" +" [--config-env=<name>=<envvar>] <command> [<args>]" msgstr "" "git [-v | --version] [-h | --help] [-C <Pfad>] [-c <Name>=<Wert>]\n" " [--exec-path[=<Pfad>]] [--html-path] [--man-path] [--info-path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<Pfad>] [--work-tree=<Pfad>] [--namespace=<Name>]\n" -" [--super-prefix=<Pfad>] [--config-env=<Name>=<Variable>]\n" -" <Befehl> [<Argumente>]" +" [--config-env=<Name>=<Umgebungsvariable>] <Befehl> [<Argumente>]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -16508,10 +16583,6 @@ msgid "no namespace given for --namespace\n" msgstr "Kein Namespace für --namespace angegeben.\n" #, c-format -msgid "no prefix given for --super-prefix\n" -msgstr "Kein Präfix für --super-prefix angegeben.\n" - -#, c-format msgid "-c expects a configuration string\n" msgstr "-c erwartet einen Konfigurationsstring.\n" @@ -16625,8 +16696,13 @@ msgstr "" msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand fehlgeschlagen: %s %s" -msgid "gpg failed to sign the data" -msgstr "gpg beim Signieren der Daten fehlgeschlagen" +#, c-format +msgid "" +"gpg failed to sign the data:\n" +"%s" +msgstr "" +"gpg konnte die Daten nicht signieren:\n" +"%s" msgid "user.signingKey needs to be set for ssh signing" msgstr "user.signingKey muss für die SSH-Signatur gesetzt sein" @@ -17206,7 +17282,7 @@ msgstr "" #. conflict in a submodule. The first argument is the submodule #. name, and the second argument is the abbreviated id of the #. commit that needs to be merged. For example: -#. - go to submodule (mysubmodule), and either merge commit abc1234" +#. - go to submodule (mysubmodule), and either merge commit abc1234" #. #, c-format msgid "" @@ -17800,6 +17876,10 @@ msgid "garbage at end of loose object '%s'" msgstr "Nutzlose Daten am Ende von losem Objekt '%s'." #, c-format +msgid "unable to open loose object %s" +msgstr "loses Objekt %s kann nicht geöffnet werden" + +#, c-format msgid "unable to parse %s header" msgstr "Konnte %s Kopfbereich nicht parsen." @@ -17815,18 +17895,14 @@ msgid "header for %s too long, exceeds %d bytes" msgstr "Header für %s zu lang, überschreitet %d Bytes" #, c-format -msgid "failed to read object %s" -msgstr "Konnte Objekt %s nicht lesen." +msgid "loose object %s (stored in %s) is corrupt" +msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt." #, c-format msgid "replacement %s not found for %s" msgstr "Ersetzung %s für %s nicht gefunden." #, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt." - -#, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt." @@ -17838,9 +17914,6 @@ msgstr "Konnte Datei %s nicht schreiben." msgid "unable to set permission to '%s'" msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." -msgid "file write error" -msgstr "Fehler beim Schreiben einer Datei." - msgid "error when closing loose object file" msgstr "Fehler beim Schließen der Datei für lose Objekte." @@ -17888,11 +17961,12 @@ msgstr "Verzeichnis %s kann nicht erstellt werden" msgid "cannot read object for %s" msgstr "Kann Objekt für %s nicht lesen." -msgid "corrupt commit" -msgstr "fehlerhafter Commit" +#, c-format +msgid "object fails fsck: %s" +msgstr "fsck schlägt bei Objekt fehl: %s" -msgid "corrupt tag" -msgstr "fehlerhaftes Tag" +msgid "refusing to create malformed object" +msgstr "verweigere Erstellung eines ungültigen Objekts" #, c-format msgid "read error while indexing %s" @@ -17949,7 +18023,7 @@ msgstr "%s [ungültiges Objekt]" #. TRANSLATORS: This is a line of ambiguous commit #. object output. E.g.: #. * -#. "deadbeef commit 2021-01-01 - Some Commit Message" +#. "deadbeef commit 2021-01-01 - Some Commit Message" #. #, c-format msgid "%s commit %s - %s" @@ -17958,7 +18032,7 @@ msgstr "%s Commit %s - %s" #. TRANSLATORS: This is a line of ambiguous #. tag object output. E.g.: #. * -#. "deadbeef tag 2022-01-01 - Some Tag Message" +#. "deadbeef tag 2022-01-01 - Some Tag Message" #. * #. The second argument is the YYYY-MM-DD found #. in the tag. @@ -17974,7 +18048,7 @@ msgstr "%s Tag %s - %s" #. tag object output where we couldn't parse #. the tag itself. E.g.: #. * -#. "deadbeef [bad tag, could not parse it]" +#. "deadbeef [bad tag, could not parse it]" #. #, c-format msgid "%s [bad tag, could not parse it]" @@ -18160,10 +18234,6 @@ msgstr "ungültiger XOR-Offset im Bitmap-Pack-Index" msgid "cannot fstat bitmap file" msgstr "kann Bitmap-Datei nicht lesen" -#, c-format -msgid "ignoring extra bitmap file: '%s'" -msgstr "ignoriere zusätzliche Bitmap-Datei: '%s'" - msgid "checksum doesn't match in MIDX and bitmap" msgstr "Prüfsumme stimmt in MIDX und Bitmap nicht überein" @@ -18432,6 +18502,9 @@ msgstr "weniger Ausgaben" msgid "use <n> digits to display object names" msgstr "benutze <Anzahl> Ziffern zur Anzeige von Objektnamen" +msgid "prefixed path to initial superproject" +msgstr "vorangestellter Pfad zum ursprünglichen Superprojekt" + msgid "how to strip spaces and #comments from message" msgstr "" "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" @@ -18939,6 +19012,14 @@ msgid "ahead %d, behind %d" msgstr "%d voraus, %d hinterher" #, c-format +msgid "%%(%.*s) does not take arguments" +msgstr "%%(%.*s) nimmt keine Argumente entgegen" + +#, c-format +msgid "unrecognized %%(%.*s) argument: %s" +msgstr "nicht erkanntes %%(%.*s) Argument: %s" + +#, c-format msgid "expected format: %%(color:<color>)" msgstr "Erwartetes Format: %%(color:<Farbe>)" @@ -18955,22 +19036,6 @@ msgid "Integer value expected refname:rstrip=%s" msgstr "Positiver Wert erwartet refname:rstrip=%s" #, c-format -msgid "unrecognized %%(%s) argument: %s" -msgstr "nicht erkanntes %%(%s) Argument: %s" - -#, c-format -msgid "%%(objecttype) does not take arguments" -msgstr "%%(objecttype) akzeptiert keine Argumente" - -#, c-format -msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) akzeptiert keine Argumente" - -#, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) akzeptiert keine Argumente" - -#, c-format msgid "expected %%(trailers:key=<value>)" msgstr "%%(trailers:key=<Wert>) erwartet" @@ -18987,10 +19052,6 @@ msgid "positive value expected '%s' in %%(%s)" msgstr "positiver Wert erwartet '%s' in %%(%s)" #, c-format -msgid "unrecognized email option: %s" -msgstr "nicht erkannte E-Mail Option: %s" - -#, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "erwartetes Format: %%(align:<Breite>,<Position>)" @@ -19003,12 +19064,12 @@ msgid "unrecognized width:%s" msgstr "nicht erkannte Breite:%s" #, c-format -msgid "positive width expected with the %%(align) atom" -msgstr "Positive Breitenangabe für %%(align) erwartet" +msgid "unrecognized %%(%s) argument: %s" +msgstr "nicht erkanntes %%(%s) Argument: %s" #, c-format -msgid "%%(rest) does not take arguments" -msgstr "%%(rest) akzeptiert keine Argumente" +msgid "positive width expected with the %%(align) atom" +msgstr "Positive Breitenangabe für %%(align) erwartet" #, c-format msgid "malformed field name: %.*s" @@ -20275,6 +20336,24 @@ msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren des Index" #, c-format +msgid "'%s' is not a valid label" +msgstr "'%s' ist keine gültige Beschriftung" + +#, c-format +msgid "'%s' is not a valid refname" +msgstr "'%s' ist kein gültiger Referenzname" + +#, c-format +msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" +msgstr "" +"update-ref erfordert einen vollständig qualifizierten Referenznamen, z. B. " +"refs/heads/%s" + +#, c-format +msgid "invalid command '%.*s'" +msgstr "ungültiger Befehl '%.*s'" + +#, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s akzeptiert keine Argumente: '%s'" @@ -21087,6 +21166,16 @@ msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet" msgid "failed to lstat '%s'" msgstr "'lstat' für '%s' fehlgeschlagen" +msgid "no remote configured to get bundle URIs from" +msgstr "kein Remote-Repository zum Erhalten von Bundle-URIs konfiguriert" + +#, c-format +msgid "remote '%s' has no configured URL" +msgstr "Remote-Repository '%s' hat keine konfigurierte URL" + +msgid "could not get the bundle-uri list" +msgstr "konnte die Bundle-uri-Liste nicht erhalten" + msgid "test-tool cache-tree <options> (control|prime|update)" msgstr "test-tool cache-tree <Optionen> (control|prime|update)" @@ -21442,6 +21531,12 @@ msgstr "Abbruch." msgid "failed to push all needed submodules" msgstr "Fehler beim Versand aller erforderlichen Submodule." +msgid "bundle-uri operation not supported by protocol" +msgstr "bundle-uri Operation wird vom Protokoll nicht unterstützt" + +msgid "could not retrieve server-advertised bundle-uri list" +msgstr "konnte die vom Server angekündigte bundle-uri-Liste nicht abrufen" + msgid "too-short tree object" msgstr "zu kurzes Tree-Objekt" @@ -22229,13 +22324,22 @@ msgstr "Ignorierte Dateien" #, c-format msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." +"It took %.2f seconds to enumerate untracked files,\n" +"but the results were cached, and subsequent runs may be faster." msgstr "" -"Es dauerte %.2f Sekunden die unversionierten Dateien zu bestimmen.\n" -"'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n" -"neue Dateien selbstständig hinzuzufügen (siehe 'git help status')." +"Es dauerte %.2f Sekunden, um die unversionierten Dateien aufzuzählen,\n" +"aber die Ergebnisse wurden zwischengespeichert, sodass spätere Durchläufe " +"schneller sein können." + +#, c-format +msgid "It took %.2f seconds to enumerate untracked files." +msgstr "" +"Es hat %.2f Sekunden gedauert, um die unversionierten Dateien aufzuzählen." + +msgid "See 'git help status' for information on how to improve this." +msgstr "" +"Siehe 'git help status' für Informationen darüber, wie man dies verbessern " +"kann." #, c-format msgid "Untracked files not listed%s" @@ -22395,289 +22499,6 @@ msgstr "" msgid "Unable to determine absolute path of git directory" msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen" -#. TRANSLATORS: you can adjust this to align "git add -i" status menu -#, perl-format -msgid "%12s %12s %s" -msgstr "%28s %25s %s" - -#, perl-format -msgid "touched %d path\n" -msgid_plural "touched %d paths\n" -msgstr[0] "%d Pfad angefasst\n" -msgstr[1] "%d Pfade angefasst\n" - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging." -msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -"Patch-Block direkt zum Hinzufügen zur Staging-Area markiert." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for stashing." -msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -"Patch-Block direkt zum Hinzufügen zum Stash markiert." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for unstaging." -msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -"Patch-Block direkt zum Entfernen aus der Staging-Area markiert." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for applying." -msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -"Patch-Block direkt zum Anwenden markiert." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding." -msgstr "" -"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" -"Patch-Block direkt zum Verwerfen markiert." - -#, perl-format -msgid "failed to open hunk edit file for writing: %s" -msgstr "" -"Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s" - -#, perl-format -msgid "" -"---\n" -"To remove '%s' lines, make them ' ' lines (context).\n" -"To remove '%s' lines, delete them.\n" -"Lines starting with %s will be removed.\n" -msgstr "" -"---\n" -"Um '%s' Zeilen zu entfernen, machen Sie aus diesen ' ' Zeilen (Kontext).\n" -"Um '%s' Zeilen zu entfernen, löschen Sie diese.\n" -"Zeilen, die mit %s beginnen, werden entfernt.\n" - -#, perl-format -msgid "failed to open hunk edit file for reading: %s" -msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s" - -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this hunk and all later hunks in the file\n" -"d - do not stage this hunk or any of the later hunks in the file" -msgstr "" -"y - diesen Patch-Block zum Commit vormerken\n" -"n - diesen Patch-Block nicht zum Commit vormerken\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht zum Commit " -"vormerken\n" -"a - diesen und alle weiteren Patch-Blöcke dieser Datei zum Commit vormerken\n" -"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit " -"vormerken" - -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file" -msgstr "" -"y - diesen Patch-Block stashen\n" -"n - diesen Patch-Block nicht stashen\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht stashen\n" -"a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n" -"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen" - -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"a - unstage this hunk and all later hunks in the file\n" -"d - do not unstage this hunk or any of the later hunks in the file" -msgstr "" -"y - diesen Patch-Block unstashen\n" -"n - diesen Patch-Block nicht unstashen\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht unstashen\n" -"a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n" -"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen" - -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - diesen Patch-Block auf den Index anwenden\n" -"n - diesen Patch-Block nicht auf den Index anwenden\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht auf den Index " -"anwenden\n" -"a - diesen und alle weiteren Patch-Blöcke dieser Datei auf den Index " -"anwenden\n" -"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index " -"anwenden" - -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - diesen Patch-Block im Arbeitsverzeichnis verwerfen\n" -"n - diesen Patch-Block im Arbeitsverzeichnis nicht verwerfen\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im " -"Arbeitsverzeichnis verwerfen\n" -"a - diesen und alle weiteren Patch-Blöcke dieser Datei im Arbeitsverzeichnis " -"verwerfen\n" -"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im " -"Arbeitsverzeichnis verwerfen" - -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - diesen Patch-Block im Index und Arbeitsverzeichnis verwerfen\n" -"n - diesen Patch-Block nicht im Index und Arbeitsverzeichnis verwerfen\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im Index und " -"Arbeitsverzeichnis verwerfen\n" -"a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n" -"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen" - -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - diesen Patch-Block im Index und auf Arbeitsverzeichnis anwenden\n" -"n - diesen Patch-Block nicht im Index und auf Arbeitsverzeichnis anwenden\n" -"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht anwenden\n" -"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" -"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden" - -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - diesen Patch-Block auf das Arbeitsverzeichnis anwenden\n" -"n - diesen Patch-Block nicht auf das Arbeitsverzeichnis anwenden\n" -"q - Beenden; diesen und alle verbleibenden Patch-Blöcke nicht anwenden\n" -"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" -"d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden" - -msgid "" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"g - Patch-Block zum Hinspringen auswählen\n" -"/ - nach Patch-Block suchen, der gegebenem regulärem Ausdruck entspricht\n" -"j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-Block " -"anzeigen\n" -"J - diesen Patch-Block unbestimmt lassen, nächsten Patch-Block anzeigen\n" -"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-" -"Block anzeigen\n" -"K - diesen Patch-Block unbestimmt lassen, vorherigen Patch-Block anzeigen\n" -"s - aktuellen Patch-Block in kleinere Patch-Blöcke aufteilen\n" -"e - aktuellen Patch-Block manuell editieren\n" -"? - Hilfe anzeigen\n" - -msgid "The selected hunks do not apply to the index!\n" -msgstr "" -"Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n" - -#, perl-format -msgid "ignoring unmerged: %s\n" -msgstr "ignoriere nicht zusammengeführte Datei: %s\n" - -msgid "No other hunks to goto\n" -msgstr "Keine anderen Patch-Blöcke verbleibend\n" - -#, perl-format -msgid "Invalid number: '%s'\n" -msgstr "Ungültige Nummer: '%s'\n" - -#, perl-format -msgid "Sorry, only %d hunk available.\n" -msgid_plural "Sorry, only %d hunks available.\n" -msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n" -msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n" - -msgid "No other hunks to search\n" -msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n" - -#, perl-format -msgid "Malformed search regexp %s: %s\n" -msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n" - -msgid "No hunk matches the given pattern\n" -msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n" - -msgid "No previous hunk\n" -msgstr "Kein vorheriger Patch-Block\n" - -msgid "No next hunk\n" -msgstr "Kein folgender Patch-Block\n" - -msgid "Sorry, cannot split this hunk\n" -msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n" - -#, perl-format -msgid "Split into %d hunk.\n" -msgid_plural "Split into %d hunks.\n" -msgstr[0] "In %d Patch-Block aufgeteilt.\n" -msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n" - -msgid "Sorry, cannot edit this hunk\n" -msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n" - -#. TRANSLATORS: please do not translate the command names -#. 'status', 'update', 'revert', etc. -msgid "" -"status - show paths with changes\n" -"update - add working tree state to the staged set of changes\n" -"revert - revert staged set of changes back to the HEAD version\n" -"patch - pick hunks and update selectively\n" -"diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of " -"changes\n" -msgstr "" -"status - Pfade mit Änderungen anzeigen\n" -"update - Zustand des Arbeitsverzeichnisses den zum Commit " -"vorgemerkten Änderungen hinzufügen\n" -"revert - zum Commit vorgemerkte Änderungen auf HEAD Version " -"zurücksetzen\n" -"patch - Patch-Blöcke auswählen und selektiv aktualisieren\n" -"diff - Unterschiede zwischen HEAD und Index anzeigen\n" -"add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n" - -msgid "missing --" -msgstr "-- fehlt" - -#, perl-format -msgid "unknown --patch mode: %s" -msgstr "Unbekannter --patch Modus: %s" - -#, perl-format -msgid "invalid argument %s, expecting --" -msgstr "ungültiges Argument %s, erwarte --" - msgid "local zone differs from GMT by a non-minute interval\n" msgstr "" "lokale Zeitzone unterscheidet sich von GMT nicht um ein Minutenintervall\n" @@ -23016,3 +22837,377 @@ msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Wollen Sie %s wirklich versenden? [y|N]: " + +#~ msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" +#~ msgstr "git bisect--helper --bisect-state (bad|new) [<Commit>]" + +#~ msgid "won't bisect on cg-seek'ed tree" +#~ msgstr "" +#~ "binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht " +#~ "möglich" + +#~ msgid "--bisect-terms requires 0 or 1 argument" +#~ msgstr "--bisect-terms benötigt 0 oder 1 Argument" + +#~ msgid "--bisect-next requires 0 arguments" +#~ msgstr "--bisect-next benötigt 0 Argumente" + +#~ msgid "--bisect-log requires 0 arguments" +#~ msgstr "--bisect-log benötigt 0 Argumente" + +#~ msgid "git env--helper --type=[bool|ulong] <options> <env-var>" +#~ msgstr "git env--helper --type=[bool|ulong] <Optionen> <Umgebungsvariable>" + +#~ msgid "default for git_env_*(...) to fall back on" +#~ msgstr "Standard für git_env_*(...), um darauf zurückzugreifen" + +#~ msgid "be quiet only use git_env_*() value as exit code" +#~ msgstr "" +#~ "Ausgaben unterdrücken; nur git_env_*() Werte als Exit-Code verwenden" + +#, c-format +#~ msgid "" +#~ "option `--default' expects a boolean value with `--type=bool`, not `%s`" +#~ msgstr "" +#~ "Option `--default' erwartet einen booleschen Wert bei `--type=bool`, " +#~ "nicht `%s`" + +#, c-format +#~ msgid "" +#~ "option `--default' expects an unsigned long value with `--type=ulong`, " +#~ "not `%s`" +#~ msgstr "" +#~ "Option `--default' erwartet einen vorzeichenlosen Long-Wert bei `--" +#~ "type=ulong`, nicht `%s`" + +#, c-format +#~ msgid "%s doesn't support --super-prefix" +#~ msgstr "%s unterstützt kein --super-prefix" + +#, c-format +#~ msgid "no prefix given for --super-prefix\n" +#~ msgstr "Kein Präfix für --super-prefix angegeben.\n" + +#, c-format +#~ msgid "failed to read object %s" +#~ msgstr "Konnte Objekt %s nicht lesen." + +#~ msgid "file write error" +#~ msgstr "Fehler beim Schreiben einer Datei." + +#~ msgid "corrupt commit" +#~ msgstr "fehlerhafter Commit" + +#~ msgid "corrupt tag" +#~ msgstr "fehlerhaftes Tag" + +#, c-format +#~ msgid "%%(objecttype) does not take arguments" +#~ msgstr "%%(objecttype) akzeptiert keine Argumente" + +#, c-format +#~ msgid "%%(deltabase) does not take arguments" +#~ msgstr "%%(deltabase) akzeptiert keine Argumente" + +#, c-format +#~ msgid "%%(body) does not take arguments" +#~ msgstr "%%(body) akzeptiert keine Argumente" + +#, c-format +#~ msgid "unrecognized email option: %s" +#~ msgstr "nicht erkannte E-Mail Option: %s" + +#, c-format +#~ msgid "" +#~ "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" +#~ "may speed it up, but you have to be careful not to forget to add\n" +#~ "new files yourself (see 'git help status')." +#~ msgstr "" +#~ "Es dauerte %.2f Sekunden die unversionierten Dateien zu bestimmen.\n" +#~ "'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n" +#~ "neue Dateien selbstständig hinzuzufügen (siehe 'git help status')." + +#, perl-format +#~ msgid "%12s %12s %s" +#~ msgstr "%28s %25s %s" + +#, perl-format +#~ msgid "touched %d path\n" +#~ msgid_plural "touched %d paths\n" +#~ msgstr[0] "%d Pfad angefasst\n" +#~ msgstr[1] "%d Pfade angefasst\n" + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for staging." +#~ msgstr "" +#~ "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" +#~ "Patch-Block direkt zum Hinzufügen zur Staging-Area markiert." + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for stashing." +#~ msgstr "" +#~ "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" +#~ "Patch-Block direkt zum Hinzufügen zum Stash markiert." + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for unstaging." +#~ msgstr "" +#~ "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" +#~ "Patch-Block direkt zum Entfernen aus der Staging-Area markiert." + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for applying." +#~ msgstr "" +#~ "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" +#~ "Patch-Block direkt zum Anwenden markiert." + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for discarding." +#~ msgstr "" +#~ "Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n" +#~ "Patch-Block direkt zum Verwerfen markiert." + +#, perl-format +#~ msgid "failed to open hunk edit file for writing: %s" +#~ msgstr "" +#~ "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s" + +#, perl-format +#~ msgid "" +#~ "---\n" +#~ "To remove '%s' lines, make them ' ' lines (context).\n" +#~ "To remove '%s' lines, delete them.\n" +#~ "Lines starting with %s will be removed.\n" +#~ msgstr "" +#~ "---\n" +#~ "Um '%s' Zeilen zu entfernen, machen Sie aus diesen ' ' Zeilen (Kontext).\n" +#~ "Um '%s' Zeilen zu entfernen, löschen Sie diese.\n" +#~ "Zeilen, die mit %s beginnen, werden entfernt.\n" + +#, perl-format +#~ msgid "failed to open hunk edit file for reading: %s" +#~ msgstr "" +#~ "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s" + +#~ msgid "" +#~ "y - stage this hunk\n" +#~ "n - do not stage this hunk\n" +#~ "q - quit; do not stage this hunk or any of the remaining ones\n" +#~ "a - stage this hunk and all later hunks in the file\n" +#~ "d - do not stage this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - diesen Patch-Block zum Commit vormerken\n" +#~ "n - diesen Patch-Block nicht zum Commit vormerken\n" +#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht zum Commit " +#~ "vormerken\n" +#~ "a - diesen und alle weiteren Patch-Blöcke dieser Datei zum Commit " +#~ "vormerken\n" +#~ "d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum " +#~ "Commit vormerken" + +#~ msgid "" +#~ "y - stash this hunk\n" +#~ "n - do not stash this hunk\n" +#~ "q - quit; do not stash this hunk or any of the remaining ones\n" +#~ "a - stash this hunk and all later hunks in the file\n" +#~ "d - do not stash this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - diesen Patch-Block stashen\n" +#~ "n - diesen Patch-Block nicht stashen\n" +#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht stashen\n" +#~ "a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n" +#~ "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen" + +#~ msgid "" +#~ "y - unstage this hunk\n" +#~ "n - do not unstage this hunk\n" +#~ "q - quit; do not unstage this hunk or any of the remaining ones\n" +#~ "a - unstage this hunk and all later hunks in the file\n" +#~ "d - do not unstage this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - diesen Patch-Block unstashen\n" +#~ "n - diesen Patch-Block nicht unstashen\n" +#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht unstashen\n" +#~ "a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n" +#~ "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen" + +#~ msgid "" +#~ "y - apply this hunk to index\n" +#~ "n - do not apply this hunk to index\n" +#~ "q - quit; do not apply this hunk or any of the remaining ones\n" +#~ "a - apply this hunk and all later hunks in the file\n" +#~ "d - do not apply this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - diesen Patch-Block auf den Index anwenden\n" +#~ "n - diesen Patch-Block nicht auf den Index anwenden\n" +#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht auf den " +#~ "Index anwenden\n" +#~ "a - diesen und alle weiteren Patch-Blöcke dieser Datei auf den Index " +#~ "anwenden\n" +#~ "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den " +#~ "Index anwenden" + +#~ msgid "" +#~ "y - discard this hunk from worktree\n" +#~ "n - do not discard this hunk from worktree\n" +#~ "q - quit; do not discard this hunk or any of the remaining ones\n" +#~ "a - discard this hunk and all later hunks in the file\n" +#~ "d - do not discard this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - diesen Patch-Block im Arbeitsverzeichnis verwerfen\n" +#~ "n - diesen Patch-Block im Arbeitsverzeichnis nicht verwerfen\n" +#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im " +#~ "Arbeitsverzeichnis verwerfen\n" +#~ "a - diesen und alle weiteren Patch-Blöcke dieser Datei im " +#~ "Arbeitsverzeichnis verwerfen\n" +#~ "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im " +#~ "Arbeitsverzeichnis verwerfen" + +#~ msgid "" +#~ "y - discard this hunk from index and worktree\n" +#~ "n - do not discard this hunk from index and worktree\n" +#~ "q - quit; do not discard this hunk or any of the remaining ones\n" +#~ "a - discard this hunk and all later hunks in the file\n" +#~ "d - do not discard this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - diesen Patch-Block im Index und Arbeitsverzeichnis verwerfen\n" +#~ "n - diesen Patch-Block nicht im Index und Arbeitsverzeichnis verwerfen\n" +#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im Index " +#~ "und Arbeitsverzeichnis verwerfen\n" +#~ "a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n" +#~ "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen" + +#~ msgid "" +#~ "y - apply this hunk to index and worktree\n" +#~ "n - do not apply this hunk to index and worktree\n" +#~ "q - quit; do not apply this hunk or any of the remaining ones\n" +#~ "a - apply this hunk and all later hunks in the file\n" +#~ "d - do not apply this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - diesen Patch-Block im Index und auf Arbeitsverzeichnis anwenden\n" +#~ "n - diesen Patch-Block nicht im Index und auf Arbeitsverzeichnis " +#~ "anwenden\n" +#~ "q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht anwenden\n" +#~ "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" +#~ "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden" + +#~ msgid "" +#~ "y - apply this hunk to worktree\n" +#~ "n - do not apply this hunk to worktree\n" +#~ "q - quit; do not apply this hunk or any of the remaining ones\n" +#~ "a - apply this hunk and all later hunks in the file\n" +#~ "d - do not apply this hunk or any of the later hunks in the file" +#~ msgstr "" +#~ "y - diesen Patch-Block auf das Arbeitsverzeichnis anwenden\n" +#~ "n - diesen Patch-Block nicht auf das Arbeitsverzeichnis anwenden\n" +#~ "q - Beenden; diesen und alle verbleibenden Patch-Blöcke nicht anwenden\n" +#~ "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" +#~ "d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden" + +#~ msgid "" +#~ "g - select a hunk to go to\n" +#~ "/ - search for a hunk matching the given regex\n" +#~ "j - leave this hunk undecided, see next undecided hunk\n" +#~ "J - leave this hunk undecided, see next hunk\n" +#~ "k - leave this hunk undecided, see previous undecided hunk\n" +#~ "K - leave this hunk undecided, see previous hunk\n" +#~ "s - split the current hunk into smaller hunks\n" +#~ "e - manually edit the current hunk\n" +#~ "? - print help\n" +#~ msgstr "" +#~ "g - Patch-Block zum Hinspringen auswählen\n" +#~ "/ - nach Patch-Block suchen, der gegebenem regulärem Ausdruck entspricht\n" +#~ "j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-" +#~ "Block anzeigen\n" +#~ "J - diesen Patch-Block unbestimmt lassen, nächsten Patch-Block anzeigen\n" +#~ "k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-" +#~ "Block anzeigen\n" +#~ "K - diesen Patch-Block unbestimmt lassen, vorherigen Patch-Block " +#~ "anzeigen\n" +#~ "s - aktuellen Patch-Block in kleinere Patch-Blöcke aufteilen\n" +#~ "e - aktuellen Patch-Block manuell editieren\n" +#~ "? - Hilfe anzeigen\n" + +#~ msgid "The selected hunks do not apply to the index!\n" +#~ msgstr "" +#~ "Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet " +#~ "werden!\n" + +#, perl-format +#~ msgid "ignoring unmerged: %s\n" +#~ msgstr "ignoriere nicht zusammengeführte Datei: %s\n" + +#~ msgid "No other hunks to goto\n" +#~ msgstr "Keine anderen Patch-Blöcke verbleibend\n" + +#, perl-format +#~ msgid "Invalid number: '%s'\n" +#~ msgstr "Ungültige Nummer: '%s'\n" + +#, perl-format +#~ msgid "Sorry, only %d hunk available.\n" +#~ msgid_plural "Sorry, only %d hunks available.\n" +#~ msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n" +#~ msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n" + +#~ msgid "No other hunks to search\n" +#~ msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n" + +#, perl-format +#~ msgid "Malformed search regexp %s: %s\n" +#~ msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n" + +#~ msgid "No hunk matches the given pattern\n" +#~ msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n" + +#~ msgid "No previous hunk\n" +#~ msgstr "Kein vorheriger Patch-Block\n" + +#~ msgid "No next hunk\n" +#~ msgstr "Kein folgender Patch-Block\n" + +#~ msgid "Sorry, cannot split this hunk\n" +#~ msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n" + +#, perl-format +#~ msgid "Split into %d hunk.\n" +#~ msgid_plural "Split into %d hunks.\n" +#~ msgstr[0] "In %d Patch-Block aufgeteilt.\n" +#~ msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n" + +#~ msgid "Sorry, cannot edit this hunk\n" +#~ msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n" + +#~ msgid "" +#~ "status - show paths with changes\n" +#~ "update - add working tree state to the staged set of changes\n" +#~ "revert - revert staged set of changes back to the HEAD version\n" +#~ "patch - pick hunks and update selectively\n" +#~ "diff - view diff between HEAD and index\n" +#~ "add untracked - add contents of untracked files to the staged set of " +#~ "changes\n" +#~ msgstr "" +#~ "status - Pfade mit Änderungen anzeigen\n" +#~ "update - Zustand des Arbeitsverzeichnisses den zum Commit " +#~ "vorgemerkten Änderungen hinzufügen\n" +#~ "revert - zum Commit vorgemerkte Änderungen auf HEAD Version " +#~ "zurücksetzen\n" +#~ "patch - Patch-Blöcke auswählen und selektiv aktualisieren\n" +#~ "diff - Unterschiede zwischen HEAD und Index anzeigen\n" +#~ "add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n" + +#~ msgid "missing --" +#~ msgstr "-- fehlt" + +#, perl-format +#~ msgid "unknown --patch mode: %s" +#~ msgstr "Unbekannter --patch Modus: %s" + +#, perl-format +#~ msgid "invalid argument %s, expecting --" +#~ msgstr "ungültiges Argument %s, erwarte --" @@ -1,5 +1,5 @@ # French translations for Git. -# Copyright (C) 2019 Jean-Noël Avila <jn.avila@free.fr> +# Copyright (C) 2023 Jean-Noël Avila <jn.avila@free.fr> # This file is distributed under the same license as the Git package. # Jean-Noël Avila <jn.avila@free.fr>, 2013-2019. # Sébastien Helleu <flashcode@flashtux.org>, 2013. @@ -78,8 +78,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-11-30 19:40+0100\n" -"PO-Revision-Date: 2022-11-30 19:42+0100\n" +"POT-Creation-Date: 2023-03-01 01:20+0000\n" +"PO-Revision-Date: 2023-03-02 18:44+0100\n" "Last-Translator: Cédric Malard <c.malard-git@valdun.net>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -115,13 +115,13 @@ msgstr "impossible d'indexer '%s'" msgid "could not write index" msgstr "impossible d'écrire l'index" -#, c-format, perl-format +#, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "%d chemin mis à jour\n" msgstr[1] "%d chemins mis à jour\n" -#, c-format, perl-format +#, c-format msgid "note: %s is untracked now.\n" msgstr "note : %s n'est plus suivi à présent.\n" @@ -135,7 +135,7 @@ msgstr "Inverser" msgid "Could not parse HEAD^{tree}" msgstr "Impossible d'analyser HEAD^{tree}" -#, c-format, perl-format +#, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "%d chemin inversé\n" @@ -148,7 +148,7 @@ msgstr "Aucun Fichier non suivi.\n" msgid "Add untracked" msgstr "Ajouter un fichier non-suivi" -#, c-format, perl-format +#, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "%d chemin ajouté\n" @@ -245,19 +245,19 @@ msgstr "impossible de rafraîchir l'index" msgid "Bye.\n" msgstr "Au revoir.\n" -#, c-format, perl-format +#, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "Indexer l'ajout [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Indexer cette section [y,n,q,a,d%s,?] ? " @@ -281,19 +281,19 @@ msgstr "" "a - indexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas indexer cette section ni les suivantes de ce fichier\n" -#, c-format, perl-format +#, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Remiser l'ajout [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Remiser cette section [y,n,q,a,d%s,?] ? " @@ -317,19 +317,19 @@ msgstr "" "a - remiser cette section et toutes les suivantes de ce fichier\n" "d - ne pas remiser cette section ni les suivantes de ce fichier\n" -#, c-format, perl-format +#, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Désindexer l'ajout [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? " @@ -353,19 +353,19 @@ msgstr "" "a - désindexer cette section et toutes les suivantes de ce fichier\n" "d - ne pas désindexer cette section ni les suivantes de ce fichier\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Appliquer l'ajout à l'index [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? " @@ -389,19 +389,19 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner l'ajout dans l'arbre [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? " @@ -425,20 +425,20 @@ msgstr "" "a - supprimer cette section et toutes les suivantes de ce fichier\n" "d - ne pas supprimer cette section ni les suivantes de ce fichier\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "Abandonner l'ajout de l'index et de l'arbre [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " @@ -456,24 +456,24 @@ msgstr "" "a - éliminer cette section et toutes les suivantes de ce fichier\n" "d - ne pas éliminer cette section ni les suivantes de ce fichier\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a," "d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a," "d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer l'ajout dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? " @@ -491,20 +491,20 @@ msgstr "" "a - appliquer cette section et toutes les suivantes de ce fichier\n" "d - ne pas appliquer cette section ni les suivantes de ce fichier\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" "Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "Appliquer l'ajout dans l'arbre de travail [y,n,q,a,d%s,?] ? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? " @@ -581,8 +581,6 @@ msgstr "" "Pour éliminer les lignes '%c', effacez-les.\n" "Les lignes commençant par %c seront éliminées.\n" -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -598,24 +596,16 @@ msgstr "impossible d'analyser l'entête de section" msgid "'git apply --cached' failed" msgstr "'git apply --cached' a échoué" -#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" -"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" " +"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"n\" " "l'élimine !) [y|n] ? " msgid "The selected hunks do not apply to the index!" @@ -1469,6 +1459,12 @@ msgstr "lire .gitattributes dans le répertoire de travail" msgid "report archived files on stderr" msgstr "afficher les fichiers archivés sur stderr" +msgid "time" +msgstr "heure" + +msgid "set modification time of archive entries" +msgstr "régler la date de modification des entrées de l'archive" + msgid "set compression level" msgstr "régler le niveau de compression" @@ -1509,6 +1505,13 @@ msgstr "Argument non supporté pour le format '%s' : -%d" msgid "%.*s is not a valid attribute name" msgstr "%.*s n'est pas un nom valide d'attribut" +msgid "unable to add additional attribute" +msgstr "Impossible d'ajouter l'attribut additionnel" + +#, c-format +msgid "ignoring overly long attributes line %d" +msgstr "ligne d'attribute trop longue ignorée %d" + #, c-format msgid "%s not allowed: %s:%d" msgstr "%s non permis : %s : %d" @@ -1521,6 +1524,18 @@ msgstr "" "Utilisez '\\!' pour un point d'exclamation littéral." #, c-format +msgid "cannot fstat gitattributes file '%s'" +msgstr "impossible de fstat le fichier gitattributes '%s'" + +#, c-format +msgid "ignoring overly large gitattributes file '%s'" +msgstr "fichier gitattributes trop gros ignoré '%s'" + +#, c-format +msgid "ignoring overly large gitattributes blob '%s'" +msgstr "blob gitattributes trop gros ignoré '%s'" + +#, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Contenu mal cité dans le fichier '%s' : %s" @@ -1798,11 +1813,11 @@ msgstr "sous-module '%s' : impossible de trouver le sous-module" #, c-format msgid "" -"You may try updating the submodules using 'git checkout %s && git submodule " -"update --init'" +"You may try updating the submodules using 'git checkout --no-recurse-" +"submodules %s && git submodule update --init'" msgstr "" "Vous pouvez essayer de mettre à jour les sous-modules en utilisant 'git " -"checkout %s && git submodule update --init'" +"checkout --no-recurse-submodules %s && git submodule update --init'" #, c-format msgid "submodule '%s': cannot create branch '%s'" @@ -1837,6 +1852,13 @@ msgstr "suppression de '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" +msgid "" +"the add.interactive.useBuiltin setting has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"le réglage add.interactive.useBuiltin a été supprimé !\n" +"Référez-vous à cette entrée dans 'git help config' pour plus de détails." + msgid "Could not read the index" msgstr "Impossible de lire l'index" @@ -2232,6 +2254,9 @@ msgstr "git am [<options>] (--continue | --skip | --abort)" msgid "run interactively" msgstr "exécution interactive" +msgid "bypass pre-applypatch and applypatch-msg hooks" +msgstr "court-circuiter les crochets pre-applypatch and applypatch-msg" + msgid "historical option -- no-op" msgstr "option historique -- no-op" @@ -2376,32 +2401,28 @@ msgstr "git archive : erreur de protocole" msgid "git archive: expected a flush" msgstr "git archive : vidage attendu" -msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [<commit>]" - msgid "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " -"[<paths>...]" +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{new,bad}=<terme> --term-{old,good}" -"=<terme>][--no-checkout] [--first-parent] [<mauvais> [<bon>...]] [--] " -"[<chemins>...]" +"git bisect start [--term-{new,bad}=<terme> --term-{old,good}=<terme>] [--" +"no-checkout] [--first-parent] [<mauvais> [<bon>...]] [--] [<spéc-de-" +"chemin>...]" -msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "git bisect--helper --bisect-state (bad|new) [<rév>]" +msgid "git bisect (good|bad) [<rev>...]" +msgstr "git bisect (good|bad) [<rév>...]" -msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "git bisect--helper --bisect-state (good|old) [<rév>...]" +msgid "git bisect skip [(<rev>|<range>)...]" +msgstr "git bisect skip [(<rév>|<plage>)...]" -msgid "git bisect--helper --bisect-replay <filename>" -msgstr "git bisect--helper --bisect-replay <nom-de-fichier>" +msgid "git bisect reset [<commit>]" +msgstr "git bisect reset [<commit>]" -msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" -msgstr "git bisect--helper --bisect-skip [(<rév>|<plage>)...]" +msgid "git bisect replay <logfile>" +msgstr "git bisect replay <fichier-journal>" -msgid "git bisect--helper --bisect-run <cmd>..." -msgstr "git bisect--helper --bisect-run <cmd>..." +msgid "git bisect run <cmd>..." +msgstr "git bisect run <cmd>..." #, c-format msgid "cannot open file '%s' in mode '%s'" @@ -2548,9 +2569,6 @@ msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "l'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'." -msgid "won't bisect on cg-seek'ed tree" -msgstr "refus de bissecter sur un arbre 'cg-seeked'" - msgid "bad HEAD - strange symbolic ref" msgstr "mauvaise HEAD - référence symbolique douteuse" @@ -2602,16 +2620,16 @@ msgid "bisect run failed: no command provided." msgstr "la bissection a échoué : aucune commande fournie." #, c-format -msgid "unable to verify '%s' on good revision" -msgstr "impossible de vérifier '%s' sur une bonne révision" +msgid "unable to verify %s on good revision" +msgstr "impossible de vérifier %s sur une bonne révision" #, c-format msgid "bogus exit code %d for good revision" msgstr "code de sortie %d erroné pour une bonne révision" #, c-format -msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" -msgstr "la bissection a échoué : le code retour %d de '%s' est < 0 ou >= 128" +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" +msgstr "la bissection a échoué : le code retour %d de %s est < 0 ou >= 128" #, c-format msgid "cannot open file '%s' for writing" @@ -2620,37 +2638,42 @@ msgstr "impossible d'ouvrir '%s' en écriture" msgid "bisect run cannot continue any more" msgstr "la bissection ne peut plus continuer" -#, c-format msgid "bisect run success" msgstr "succès de la bissection" -#, c-format msgid "bisect found first bad commit" msgstr "la bissection a trouvé le premier mauvais commit" #, c-format -msgid "" -"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " -"code %d" -msgstr "" -"la bissection a échoué : 'git bisect--helper --bisect-state %s' a retourné " -"le code erreur %d" +msgid "bisect run failed: 'git bisect %s' exited with error code %d" +msgstr "la bissection a échoué : 'git bisect %s' a retourné le code erreur %d" -msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset supporte soit aucun argument, soit un commit" - -msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--bisect-terms exige 0 ou 1 argument" +#, c-format +msgid "'%s' requires either no argument or a commit" +msgstr "%s supporte soit aucun argument, soit un commit" -msgid "--bisect-next requires 0 arguments" -msgstr "--bisect-next exige 0 argument" +#, c-format +msgid "'%s' requires 0 or 1 argument" +msgstr "'%s' nécessite 0 ou 1 argument" -msgid "--bisect-log requires 0 arguments" -msgstr "--bisect-log exige 0 argument" +#, c-format +msgid "'%s' requires 0 arguments" +msgstr "'%s' n'accepte aucun argument" msgid "no logfile given" msgstr "pas de fichier de log donné" +#, c-format +msgid "'%s' failed: no command provided." +msgstr "'%s' a échoué : aucune commande fournie." + +msgid "need a command" +msgstr "commande requise" + +#, c-format +msgid "unknown command: '%s'" +msgstr "commande inconnue : '%s'" + msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>" @@ -3241,6 +3264,9 @@ msgstr "git bundle list-heads <fichier> [<nom-de-ref>...]" msgid "git bundle unbundle [--progress] <file> [<refname>...]" msgstr "git bundle unbundle [--progress] <fichier> [<nom-de-ref>...]" +msgid "need a <file> argument" +msgstr "requiert un argument <fichier>" + msgid "do not show progress meter" msgstr "ne pas afficher la barre de progression" @@ -3294,10 +3320,6 @@ msgstr "%s nécessite des arguments" msgid "%s takes no arguments" msgstr "%s n'accepte aucune argument" -#, c-format -msgid "unknown command: '%s'" -msgstr "commande inconnue : %s" - msgid "only one batch option may be specified" msgstr "une seule option de traitement ne peut être spécifiée à la fois" @@ -3434,11 +3456,17 @@ msgstr "<objet> nécessaire avec '-%c'" msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "deux arguments seulement permis dans le mode <type> <objet>, pas %d" -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." -msgstr "git check-attr [-a | --all | <attr>...] [--] <chemin>..." +msgid "" +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " +"<pathname>..." +msgstr "" +"git check-attr [--source <arbre-esque>] [-a | --all | <attr>...] [--] " +"<chemin>..." -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" -msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]" +msgid "" +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" +msgstr "" +"git check-attr --stdin [-z] [--source <arbre-esque>] [-a | --all | <attr>...]" msgid "report all attributes set on file" msgstr "afficher tous les attributs associés au fichier" @@ -3453,6 +3481,12 @@ msgid "terminate input and output records by a NUL character" msgstr "" "terminer les enregistrements en entrée et en sortie par un caractère NUL" +msgid "<tree-ish>" +msgstr "<arbre-esque>" + +msgid "which tree-ish to check attributes at" +msgstr "à quel <arbre-esque> vérifier les attributs" + msgid "suppress progress reporting" msgstr "supprimer l'état d'avancement" @@ -4040,7 +4074,7 @@ msgstr "" "* - choisir tous les éléments\n" " - (vide) terminer la sélection\n" -#, c-format, perl-format +#, c-format msgid "Huh (%s)?\n" msgstr "Hein (%s) ?\n" @@ -4189,9 +4223,6 @@ msgstr "profondeur" msgid "create a shallow clone of that depth" msgstr "créer un clone superficiel de cette profondeur" -msgid "time" -msgstr "heure" - msgid "create a shallow clone since a specific time" msgstr "créer un clone superficiel depuis une date spécifique" @@ -4434,6 +4465,9 @@ msgstr "échec lors de l'initialisation du dépôt, URI du paquet ignoré" msgid "failed to fetch objects from bundle URI '%s'" msgstr "impossible de récupérer les objets depuis l'URI de paquet '%s'" +msgid "failed to fetch advertised bundles" +msgstr "échec de récupération des colis annoncés" + msgid "remote transport reported error" msgstr "le transport distant a retourné une erreur" @@ -5689,30 +5723,6 @@ msgstr "pas d'<outil> spécifié pour --tool=<outil>" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "pas de <commande> spécifié pour --extcmd=<commande>" -msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -msgstr "git env--helper --type=[bool|ulong] <options> <var d'env>" - -msgid "default for git_env_*(...) to fall back on" -msgstr "valeur par défaut pour git_env_*(...) en cas d'absence" - -msgid "be quiet only use git_env_*() value as exit code" -msgstr "" -"mode silencieux n'utilisant la valeur de git_env_*() que pour le code de " -"sortie" - -#, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "" -"l'option `--default` attend une valeur booléenne avec `--type=bool`, pas `%s`" - -#, c-format -msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not " -"`%s`" -msgstr "" -"l'option `--default` attend une valeur entier long non signé avec `--" -"type=ulong`, pas `%s`" - msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<options-de-liste-de-révisions>]" @@ -6122,6 +6132,10 @@ msgstr "une profondeur négative dans --deepen n'est pas supportée" msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow sur un dépôt complet n'a pas de sens" +#, c-format +msgid "failed to fetch bundles from '%s'" +msgstr "échec de récupération des colis depuis '%s'" + msgid "fetch --all does not take a repository argument" msgstr "fetch --all n'accepte pas d'argument de dépôt" @@ -7160,13 +7174,19 @@ msgstr "usage : %s%s" msgid "'git help config' for more information" msgstr "'git help config' pour plus d'information" -msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" +msgid "" +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" +"args>]" msgstr "" -"git hook run [--ignore-missing] <nom-de-crochet> [-- <arguments-de-crochet>]" +"git hook run [--ignore-missing] [--to-stdin=<chemin>] <nom-de-crochet> [-- " +"<arguments-de-crochet>]" msgid "silently ignore missing requested <hook-name>" msgstr "ignorer silencieusement le <nom-de-crochet> requis manquant" +msgid "file to read into hooks' stdin" +msgstr "fichier à la lire dans l'entrée standard du crochet" + #, c-format msgid "object type mismatch at %s" msgstr "type d'objet non correspondant à %s" @@ -7985,7 +8005,7 @@ msgid "if any <file> is not in the index, treat this as an error" msgstr "si un <fichier> n'est pas dans l'index, traiter cela comme une erreur" msgid "tree-ish" -msgstr "arbre ou apparenté" +msgstr "arbre-esque" msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" @@ -8011,11 +8031,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" -" [--symref] [<repository> [<refs>...]]" +" [--symref] [<repository> [<patterns>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<clé>]\n" -" [--symref] [<dépôt> [<réf>...]]" +" [--symref] [<dépôt> [<motif>...]]" msgid "do not print remote URL" msgstr "ne pas afficher les URL distantes" @@ -8265,9 +8285,15 @@ msgstr "permettre la fusion d'historiques sans rapport" msgid "perform multiple merges, one per line of input" msgstr "réaliser des fusions multiples, une par ligne d'entrée" +msgid "specify a merge-base for the merge" +msgstr "spécifier une base de fusion pour la fusion" + msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge est incompatible avec d'autres options" +msgid "--merge-base is incompatible with --stdin" +msgstr "--merge-base est incompatible avec --stdin" + #, c-format msgid "malformed input line: '%s'." msgstr "ligne en entrée malformée : '%s'." @@ -10202,6 +10228,10 @@ msgstr "" msgid "could not switch to %s" msgstr "impossible de basculer vers %s" +msgid "apply options and merge options cannot be used together" +msgstr "" +"Les options d'apply et celles de merge ne peuvent pas être utilisées ensemble" + #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " @@ -10437,9 +10467,19 @@ msgstr "Mode inconnu : %s" msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiert --merge ou --interactive" -msgid "apply options and merge options cannot be used together" +msgid "" +"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"autosquash" msgstr "" -"Les options d'apply et celles de merge ne peuvent pas être utilisées ensemble" +"les options d'application sont incompatibles avec rebase.autosquash. " +"Considérez l'ajout de --no-autosquash" + +msgid "" +"apply options are incompatible with rebase.updateRefs. Consider adding --no-" +"update-refs" +msgstr "" +"les options d'application sont incompatibles avec rebase.updateRefs. " +"Considérez l'ajout de --no-update-refs" #, c-format msgid "Unknown rebase backend: %s" @@ -12980,10 +13020,6 @@ msgstr "'%s' n'est pas un nom valide de sous-module" msgid "git submodule--helper <command>" msgstr "git submodule--helper <commande>" -#, c-format -msgid "%s doesn't support --super-prefix" -msgstr "%s ne gère pas --super-prefix" - msgid "git symbolic-ref [-m <reason>] <name> <ref>" msgstr "git symbolic-ref [-m <raison>] <nom> <réf>" @@ -13744,6 +13780,10 @@ msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch non géré sur cette plateforme" #, c-format +msgid "could not parse bundle list key %s with value '%s'" +msgstr "impossible d'analyser la clé de liste de colis %s avec la valeur '%s'" + +#, c-format msgid "bundle list at '%s' has no mode" msgstr "la liste de colis n'a pas de mode à '%s'" @@ -13754,6 +13794,13 @@ msgid "insufficient capabilities" msgstr "capacités insuffisantes" #, c-format +msgid "file downloaded from '%s' is not a bundle" +msgstr "le fichier téléchargé depuis '%s' n'est pas un colis" + +msgid "failed to store maximum creation token" +msgstr "échec de stockage du jeton de création maximum" + +#, c-format msgid "unrecognized bundle mode from URI '%s'" msgstr "mode de colisage non reconnu depuis l'URI '%s'" @@ -13769,6 +13816,13 @@ msgstr "impossible de télécharger le colis depuis l'URI '%s'" msgid "file at URI '%s' is not a bundle or bundle list" msgstr "le fichier à l'URI '%s' n'est pas un colis ou une liste de colis" +#, c-format +msgid "bundle-uri: unexpected argument: '%s'" +msgstr "bundle-uri :argument inattendu : '%s'" + +msgid "bundle-uri: expected flush after arguments" +msgstr "bundle-uri : vidage attendu après les arguments" + msgid "bundle-uri: got an empty line" msgstr "bundle-uri : ligne vide rencontrée" @@ -13800,6 +13854,13 @@ msgstr "Le dépôt ne dispose pas des commits prérequis suivants :" msgid "need a repository to verify a bundle" msgstr "la vérification d'un colis requiert un dépôt" +msgid "" +"some prerequisite commits exist in the object store, but are not connected " +"to the repository's history" +msgstr "" +"des commits prérequis existent dans le stock d'objets, mais ne sont pas " +"connectés à l'historique du dépôt" + #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %<PRIuMAX> refs:" @@ -15255,15 +15316,22 @@ msgid "unknown object format '%s' specified by server" msgstr "format d'objet spécifié par le serveur inconnu '%s'" #, c-format +msgid "error on bundle-uri response line %d: %s" +msgstr "erreur sur la ligne %d de réponse bundle-uri : %s" + +msgid "expected flush after bundle-uri listing" +msgstr "vidage attendu après le listage des bundle-uri" + +msgid "expected response end packet after ref listing" +msgstr "paquet de fin de réponse attendu après le listage de références" + +#, c-format msgid "invalid ls-refs response: %s" msgstr "réponse à ls-ref invalide : %s" msgid "expected flush after ref listing" msgstr "vidage attendu après le listage de références" -msgid "expected response end packet after ref listing" -msgstr "paquet de fin de réponse attendu après le listage de références" - #, c-format msgid "protocol '%s' is not supported" msgstr "le protocole '%s' n'est pas supporté" @@ -16427,11 +16495,11 @@ msgstr "fsmonitor--daemon n'est pas en cours d'exécution" #, c-format msgid "could not send '%s' command to fsmonitor--daemon" -msgstr "impossible de lancer la commmand '%s' à fsmonitor--daemon" +msgstr "impossible de lancer la commande '%s' à fsmonitor--daemon" #, c-format msgid "bare repository '%s' is incompatible with fsmonitor" -msgstr "le dépôit nu '%s' est incompatible avec fsmonitor" +msgstr "le dépôt nu '%s' est incompatible avec fsmonitor" #, c-format msgid "repository '%s' is incompatible with fsmonitor due to errors" @@ -16459,18 +16527,16 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]" +" [--config-env=<name>=<envvar>] <command> [<args>]" msgstr "" -"git [--version] [-h | --help] [-C <chemin>] [-c <nom>=<valeur>]\n" +"git [-v | --version] [-h | --help] [-C <chemin>] [-c <nom>=<valeur>]\n" " [--exec-path[=<chemin>]] [--html-path] [--man-path] [--info-" "path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n" -" [--super-prefix=<chemin>] [--config-env=<nom>=<variable-d-" -"environnement>]\n" -" <commande> [<args>]" +" [--config-env=<nom>=<variable-d-environnement>] <commande> " +"[<args>]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -16496,10 +16562,6 @@ msgid "no namespace given for --namespace\n" msgstr "aucun espace de nom fournit pour --namespace\n" #, c-format -msgid "no prefix given for --super-prefix\n" -msgstr "aucun préfixe fourni pour --super-prefix\n" - -#, c-format msgid "-c expects a configuration string\n" msgstr "-c requiert une chaîne de configuration\n" @@ -16611,8 +16673,13 @@ msgstr "" msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand a échoué : %s %s" -msgid "gpg failed to sign the data" -msgstr "gpg n'a pas pu signer les données" +#, c-format +msgid "" +"gpg failed to sign the data:\n" +"%s" +msgstr "" +"gpg n'a pas pu signer les données :\n" +"%s" msgid "user.signingKey needs to be set for ssh signing" msgstr "user.signingKey doit être configuré pour signer avec ssh" @@ -17771,6 +17838,10 @@ msgid "garbage at end of loose object '%s'" msgstr "données incorrectes à la fin de l'objet libre '%s'" #, c-format +msgid "unable to open loose object %s" +msgstr "impossible d'ouvrir l'objet libre %s" + +#, c-format msgid "unable to parse %s header" msgstr "impossible d'analyser l'entête %s" @@ -17786,18 +17857,14 @@ msgid "header for %s too long, exceeds %d bytes" msgstr "entête de %s trop long, attendu %d octets" #, c-format -msgid "failed to read object %s" -msgstr "impossible de lire l'objet %s" +msgid "loose object %s (stored in %s) is corrupt" +msgstr "l'objet libre %s (stocké dans %s) est corrompu" #, c-format msgid "replacement %s not found for %s" msgstr "remplacement %s non trouvé pour %s" #, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "l'objet libre %s (stocké dans %s) est corrompu" - -#, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu" @@ -17809,9 +17876,6 @@ msgstr "impossible d'écrire le fichier %s" msgid "unable to set permission to '%s'" msgstr "impossible de régler les droits de '%s'" -msgid "file write error" -msgstr "erreur d'écriture d'un fichier" - msgid "error when closing loose object file" msgstr "erreur en fermeture du fichier d'objet esseulé" @@ -17858,11 +17922,12 @@ msgstr "échec de la création du répertoire %s" msgid "cannot read object for %s" msgstr "impossible de lire l'objet pour %s" -msgid "corrupt commit" -msgstr "commit corrompu" +#, c-format +msgid "object fails fsck: %s" +msgstr "l'objet est en échec de fsck : %s" -msgid "corrupt tag" -msgstr "étiquette corrompue" +msgid "refusing to create malformed object" +msgstr "Refus de créer un objet malformé" #, c-format msgid "read error while indexing %s" @@ -18131,10 +18196,6 @@ msgstr "décalage XOR invalide dans l'index de paquet en bitmap" msgid "cannot fstat bitmap file" msgstr "impossible d'obtenir le statut (fstat) du fichier de bitmap" -#, c-format -msgid "ignoring extra bitmap file: '%s'" -msgstr "fichier bitmap extra ignoré : '%s'" - msgid "checksum doesn't match in MIDX and bitmap" msgstr "la somme de contrôle ne correspond pas entre MIDX et bitmap" @@ -18400,6 +18461,9 @@ msgstr "être plus silencieux" msgid "use <n> digits to display object names" msgstr "utiliser <n> chiffres pour afficher les noms des objets" +msgid "prefixed path to initial superproject" +msgstr "chemin préfixé vers le superprojet initial" + msgid "how to strip spaces and #comments from message" msgstr "comment éliminer les espaces et les commentaires # du message" @@ -18914,6 +18978,14 @@ msgid "ahead %d, behind %d" msgstr "en avance de %d, en retard de %d" #, c-format +msgid "%%(%.*s) does not take arguments" +msgstr "%%(%.*s) n'accepte pas d'argument" + +#, c-format +msgid "unrecognized %%(%.*s) argument: %s" +msgstr "argument %%(%.*s) non reconnu : %s" + +#, c-format msgid "expected format: %%(color:<color>)" msgstr "format attendu : %%(color:<couleur>)" @@ -18930,22 +19002,6 @@ msgid "Integer value expected refname:rstrip=%s" msgstr "Valeur entière attendue refname:rstrip=%s" #, c-format -msgid "unrecognized %%(%s) argument: %s" -msgstr "argument %%(%s) non reconnu : %s" - -#, c-format -msgid "%%(objecttype) does not take arguments" -msgstr "%%(objecttype) n'accepte pas d'argument" - -#, c-format -msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) n'accepte pas d'argument" - -#, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) n'accepte pas d'argument" - -#, c-format msgid "expected %%(trailers:key=<value>)" msgstr "%%(trailers:key=<value>) attendu" @@ -18962,10 +19018,6 @@ msgid "positive value expected '%s' in %%(%s)" msgstr "valeur positive attendue '%s' dans %%(%s)" #, c-format -msgid "unrecognized email option: %s" -msgstr "option de courriel non reconnue : %s" - -#, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format attendu : %%(align:<largeur>,<position>)" @@ -18978,12 +19030,12 @@ msgid "unrecognized width:%s" msgstr "largeur non reconnue : %s" #, c-format -msgid "positive width expected with the %%(align) atom" -msgstr "valeur positive attendue avec l'atome %%(align)" +msgid "unrecognized %%(%s) argument: %s" +msgstr "argument %%(%s) non reconnu : %s" #, c-format -msgid "%%(rest) does not take arguments" -msgstr "%%(rest) n'accepte pas d'argument" +msgid "positive width expected with the %%(align) atom" +msgstr "valeur positive attendue avec l'atome %%(align)" #, c-format msgid "malformed field name: %.*s" @@ -20243,6 +20295,24 @@ msgid "git %s: failed to refresh the index" msgstr "git %s : échec du rafraîchissement de l'index" #, c-format +msgid "'%s' is not a valid label" +msgstr "'%s' n'est pas un label valide" + +#, c-format +msgid "'%s' is not a valid refname" +msgstr "'%s' n'est pas un nom valide de référence" + +#, c-format +msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" +msgstr "" +"update-ref requiert un nom de référence totalement qualifié par ex. refs/" +"heads/%s" + +#, c-format +msgid "invalid command '%.*s'" +msgstr "commande '%.*s' invalide" + +#, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s n'accepte pas d'argument : '%s'" @@ -21053,6 +21123,16 @@ msgstr "ls-tree a renvoyé un code de retour inattendu %d" msgid "failed to lstat '%s'" msgstr "échec du lstat de '%s'" +msgid "no remote configured to get bundle URIs from" +msgstr "aucun distant configuré depuis lequel récupérer des URIs de colis" + +#, c-format +msgid "remote '%s' has no configured URL" +msgstr "le distant '%s' n'a pas d'URL configuré" + +msgid "could not get the bundle-uri list" +msgstr "impossible d'avoir la liste de bundle-uris" + msgid "test-tool cache-tree <options> (control|prime|update)" msgstr "test-tool cache-tree <options> (control|prime|update)" @@ -21412,6 +21492,13 @@ msgstr "Abandon." msgid "failed to push all needed submodules" msgstr "échec de la poussée de tous les sous-modules nécessaires" +msgid "bundle-uri operation not supported by protocol" +msgstr "opération bundle-uri non supportée par le protocole" + +msgid "could not retrieve server-advertised bundle-uri list" +msgstr "" +"impossible de récupérer la liste de bundle-uris annoncée par le serveur" + msgid "too-short tree object" msgstr "objet arbre trop court" @@ -22165,14 +22252,19 @@ msgstr "Fichiers ignorés" #, c-format msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." +"It took %.2f seconds to enumerate untracked files,\n" +"but the results were cached, and subsequent runs may be faster." msgstr "" -"L'énumération des fichiers non suivis a duré %.2f secondes. 'status -uno'\n" -"peut l'accélérer, mais vous devez alors faire attention à ne pas\n" -"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help " -"status')." +"L'énumération des fichiers non-suivis a pris %.2f secondes,\n" +"mais les resultats ont été mis en cache, et les lancements suivants seront " +"plus rapides." + +#, c-format +msgid "It took %.2f seconds to enumerate untracked files." +msgstr "L'énumération des fichiers non-suivis a pris %.2f secondes." + +msgid "See 'git help status' for information on how to improve this." +msgstr "Voir 'git help status' pour tout information pour améliorer ceci." #, c-format msgid "Untracked files not listed%s" @@ -22323,275 +22415,6 @@ msgstr "" msgid "Unable to determine absolute path of git directory" msgstr "Impossible de déterminer le chemin absolu du répertoire git" -#. TRANSLATORS: you can adjust this to align "git add -i" status menu -#, perl-format -msgid "%12s %12s %s" -msgstr "%12s %s12s %s" - -#, perl-format -msgid "touched %d path\n" -msgid_plural "touched %d paths\n" -msgstr[0] "%d chemin touché\n" -msgstr[1] "%d chemins touchés\n" - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging." -msgstr "" -"Si le patch s'applique proprement, la section éditée sera\n" -"immédiatement marquée comme indexée." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for stashing." -msgstr "" -"Si le patch s'applique proprement, la section éditée sera\n" -"immédiatement marquée comme remisée." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for unstaging." -msgstr "" -"Si le patch s'applique proprement, la section éditée sera\n" -"immédiatement marquée comme desindexée." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for applying." -msgstr "" -"Si le patch s'applique proprement, la section éditée sera\n" -"immédiatement marquée comme appliquée." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding." -msgstr "" -"Si le patch s'applique proprement, la section éditée sera\n" -"immédiatement marquée comme éliminée." - -#, perl-format -msgid "failed to open hunk edit file for writing: %s" -msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s" - -#, perl-format -msgid "" -"---\n" -"To remove '%s' lines, make them ' ' lines (context).\n" -"To remove '%s' lines, delete them.\n" -"Lines starting with %s will be removed.\n" -msgstr "" -"---\n" -"Pour éliminer les lignes '%s', rendez-les ' ' (contexte).\n" -"Pour éliminer les lignes '%s', effacez-les.\n" -"Les lignes commençant par %s seront éliminées.\n" - -#, perl-format -msgid "failed to open hunk edit file for reading: %s" -msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s" - -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this hunk and all later hunks in the file\n" -"d - do not stage this hunk or any of the later hunks in the file" -msgstr "" -"y - indexer cette section\n" -"n - ne pas indexer cette section\n" -"q - quitter ; ne pas indexer cette section ni les autres restantes\n" -"a - indexer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas indexer cette section ni les suivantes de ce fichier" - -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file" -msgstr "" -"y - remiser cette section\n" -"n - ne pas remiser cette section\n" -"q - quitter ; ne pas remiser cette section ni les autres restantes\n" -"a - remiser cette section et toutes les suivantes de ce fichier\n" -"d - ne pas remiser cette section ni les suivantes de ce fichier" - -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"a - unstage this hunk and all later hunks in the file\n" -"d - do not unstage this hunk or any of the later hunks in the file" -msgstr "" -"y - désindexer cette section\n" -"n - ne pas désindexer cette section\n" -"q - quitter ; ne pas désindexer cette section ni les autres restantes\n" -"a - désindexer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas désindexer cette section ni les suivantes de ce fichier" - -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - appliquer cette section\n" -"n - ne pas appliquer cette section\n" -"q - quitter ; ne pas appliquer cette section ni les autres restantes\n" -"a - appliquer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas appliquer cette section ni les suivantes de ce fichier" - -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - supprimer cette section\n" -"n - ne pas supprimer cette section\n" -"q - quitter ; ne pas supprimer cette section ni les autres restantes\n" -"a - supprimer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas supprimer cette section ni les suivantes de ce fichier" - -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - éliminer cette section de l'index et de l'arbre de travail\n" -"n - ne pas éliminer cette section\n" -"q - quitter ; ne pas éliminer cette section ni les autres restantes\n" -"a - éliminer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas éliminer cette section ni les suivantes de ce fichier" - -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - appliquer cette section à l'index et à l'arbre de travail\n" -"n - ne pas appliquer cette section\n" -"q - quitter ; ne pas appliquer cette section ni les autres restantes\n" -"a - appliquer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas appliquer cette section ni les suivantes de ce fichier" - -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - appliquer cette section à l'arbre de travail\n" -"n - ne pas appliquer cette section\n" -"q - quitter ; ne pas appliquer cette section ni les autres restantes\n" -"a - appliquer cette section et toutes les suivantes de ce fichier\n" -"d - ne pas appliquer cette section ni les suivantes de ce fichier" - -msgid "" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"g - selectionner une section et s'y rendre\n" -"/ - rechercher une section correspondant à une regex donnée\n" -"j - laisser cette section non décidée et aller à la suivante non-décidée\n" -"J - laisser cette section non décidée et aller à la suivante\n" -"k - laisser cette section non décidée et aller à la précédente non-décidée\n" -"K - laisser cette section non décidée et aller à la précédente\n" -"s - découper la section en sections plus petites\n" -"e - éditer manuellement la section actuelle\n" -"? - afficher l'aide\n" - -msgid "The selected hunks do not apply to the index!\n" -msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n" - -#, perl-format -msgid "ignoring unmerged: %s\n" -msgstr "fichier non-fusionné ignoré : %s\n" - -msgid "No other hunks to goto\n" -msgstr "Aucune autre section à atteindre\n" - -#, perl-format -msgid "Invalid number: '%s'\n" -msgstr "Nombre invalide : '%s'\n" - -#, perl-format -msgid "Sorry, only %d hunk available.\n" -msgid_plural "Sorry, only %d hunks available.\n" -msgstr[0] "Désolé, %d seule section disponible.\n" -msgstr[1] "Désolé, Seulement %d sections disponibles.\n" - -msgid "No other hunks to search\n" -msgstr "Aucune autre section à rechercher\n" - -#, perl-format -msgid "Malformed search regexp %s: %s\n" -msgstr "Regex de recherche malformée %s : %s\n" - -msgid "No hunk matches the given pattern\n" -msgstr "Aucune section ne correspond au motif donné\n" - -msgid "No previous hunk\n" -msgstr "Pas de section précédente\n" - -msgid "No next hunk\n" -msgstr "Pas de section suivante\n" - -msgid "Sorry, cannot split this hunk\n" -msgstr "Désolé, impossible de découper cette section\n" - -#, perl-format -msgid "Split into %d hunk.\n" -msgid_plural "Split into %d hunks.\n" -msgstr[0] "Découpée en %d section.\n" -msgstr[1] "Découpée en %d sections.\n" - -msgid "Sorry, cannot edit this hunk\n" -msgstr "Désolé, impossible d'éditer cette section\n" - -#. TRANSLATORS: please do not translate the command names -#. 'status', 'update', 'revert', etc. -msgid "" -"status - show paths with changes\n" -"update - add working tree state to the staged set of changes\n" -"revert - revert staged set of changes back to the HEAD version\n" -"patch - pick hunks and update selectively\n" -"diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of " -"changes\n" -msgstr "" -"status - montrer les chemins modifiés\n" -"update - ajouter l'état de l'arbre de travail aux modifications à " -"indexer\n" -"revert - faire revenir les modifications à indexer à la version HEAD\n" -"patch - sélectionner les sections et mettre à jour sélectivement\n" -"diff - visualiser les diff entre HEAD et l'index\n" -"add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n" - -msgid "missing --" -msgstr "-- manquant" - -#, perl-format -msgid "unknown --patch mode: %s" -msgstr "mode de --patch inconnu : %s" - -#, perl-format -msgid "invalid argument %s, expecting --" -msgstr "argument invalide %s, -- attendu" - msgid "local zone differs from GMT by a non-minute interval\n" msgstr "" "la zone locale diffère du GMT par un intervalle supérieur à une minute\n" @@ -22918,232 +22741,3 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " - -#, c-format -#~ msgid "unable to normalize object directory: %s" -#~ msgstr "impossible de normaliser le répertoire d'objet : %s" - -#~ msgid "reset the bisection state" -#~ msgstr "réinitialiser l'état de la bissection" - -#~ msgid "check whether bad or good terms exist" -#~ msgstr "vérifier si les termes bons ou mauvais existent" - -#~ msgid "print out the bisect terms" -#~ msgstr "afficher les termes de bissection" - -#~ msgid "start the bisect session" -#~ msgstr "démarrer une session de bissection" - -#~ msgid "find the next bisection commit" -#~ msgstr "trouver le prochain commit de bissection" - -#~ msgid "mark the state of ref (or refs)" -#~ msgstr "marquer l'état d'une références (ou plusieurs)" - -#~ msgid "list the bisection steps so far" -#~ msgstr "lister les étapes de bissection jusqu'ici" - -#~ msgid "replay the bisection process from the given file" -#~ msgstr "rejouer le processus de bissection depuis le fichier fourni" - -#~ msgid "skip some commits for checkout" -#~ msgstr "sauter certains commits pour l'extraction" - -#~ msgid "visualize the bisection" -#~ msgstr "visualiser la bissection" - -#~ msgid "use <cmd>... to automatically bisect" -#~ msgstr "utiliser <cmd>... pour bissecter automatiquement" - -#~ msgid "no log for BISECT_WRITE" -#~ msgstr "pas de journal pour BISECT_WRITE" - -#~ msgid "Couldn't look up commit object for HEAD" -#~ msgstr "Impossible de rechercher l'objet commit pour HEAD" - -#~ msgid "git bundle create [<options>] <file> <git-rev-list args>" -#~ msgstr "git bundle create [<options>] <fichier> <args git-rev-list>" - -#, c-format -#~ msgid "options '%s' and '%s %s' cannot be used together" -#~ msgstr "les options '%s' et '%s %s' ne peuvent pas être utilisées ensemble" - -#~ msgid "git commit [<options>] [--] <pathspec>..." -#~ msgstr "git commit [<options>] [--] <spécification-de-chemin>..." - -#~ msgid "git fsck [<options>] [<object>...]" -#~ msgstr "git fsck [<options>] [<objet>...]" - -#~ msgid "git fsmonitor--daemon stop" -#~ msgstr "git fsmonitor--daemon stop" - -#~ msgid "git fsmonitor--daemon status" -#~ msgstr "git fsmonitor--daemon status" - -#~ msgid "failed to run 'git config'" -#~ msgstr "échec du lancement de 'git config'" - -#, c-format -#~ msgid "could not get 'onto': '%s'" -#~ msgstr "impossible d'accéder 'onto' : '%s'" - -#~ msgid "Could not resolve HEAD to a revision" -#~ msgstr "Impossible de résoudre le commit HEAD vers un révision" - -#, c-format -#~ msgid "missing required file: %s" -#~ msgstr "fichier nécessaire manquant : %s" - -#~ msgid "git revert [<options>] <commit-ish>..." -#~ msgstr "git revert [<options>] <commit ou apparenté>..." - -#~ msgid "git revert <subcommand>" -#~ msgstr "git revert <sous-commande>" - -#~ msgid "git cherry-pick [<options>] <commit-ish>..." -#~ msgstr "git cherry-pick [<options>] <commit ou apparenté>..." - -#~ msgid "git cherry-pick <subcommand>" -#~ msgstr "git cherry-pick <sous-commande>" - -#~ msgid "git rm [<options>] [--] <file>..." -#~ msgstr "git rm [<options>] [--] <fichier>..." - -#~ msgid "using --group=trailer with stdin is not supported" -#~ msgstr "l'utilisation de --group=trailer avec stdin n'est pas supportée" - -#~ msgid "git stash show [<options>] [<stash>]" -#~ msgstr "git stash show [<options>] [<remise>]" - -#~ msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#~ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<remise>]" - -#~ msgid "" -#~ "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -#~ " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -#~ " [--] [<pathspec>...]]" -#~ msgstr "" -#~ "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -#~ " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -#~ " [--] [<spécificateur-de-chemin>...]]" - -#~ msgid "" -#~ "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -#~ " [-u|--include-untracked] [-a|--all] [<message>]" -#~ msgstr "" -#~ "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -#~ " [-u|--include-untracked] [-a|--all] [<message>]" - -#~ msgid "path into the working tree" -#~ msgstr "chemin dans la copie de travail" - -#~ msgid "recurse into submodules" -#~ msgstr "parcourir récursivement les sous-modules" - -#~ msgid "check if it is safe to write to the .gitmodules file" -#~ msgstr "vérifier si écrire dans le fichier .gitmodules est sur" - -#~ msgid "unset the config in the .gitmodules file" -#~ msgstr "désactiver la configuration dans le fichier .gitmodules" - -#~ msgid "git submodule--helper config <name> [<value>]" -#~ msgstr "git submodule--helper config name [<valeur>]" - -#~ msgid "git submodule--helper config --unset <name>" -#~ msgstr "git submodule--helper config --unset <nom>" - -#, c-format -#~ msgid "'%s' is not a valid submodule--helper subcommand" -#~ msgstr "'%s' n'est pas une sous-commande valide de submodule--helper" - -#~ msgid "git upload-pack [<options>] <dir>" -#~ msgstr "git upload-pack [<options>] <répertoire>" - -#~ msgid "git worktree add [<options>] <path> [<commit-ish>]" -#~ msgstr "git worktree add [<options>] <chemin> [<commit>]" - -#~ msgid "git worktree lock [<options>] <path>" -#~ msgstr "git worktree lock [<options>] <chemin>" - -#~ msgid "(stats|all)" -#~ msgstr "(stats|all)" - -#~ msgid "git maintenance register" -#~ msgstr "git maintenance register" - -#~ msgid "git maintenance unregister" -#~ msgstr "git maintenance unregister" - -#~ msgid "git maintenance stop" -#~ msgstr "git maintenance stop" - -#, c-format -#~ msgid "could not parse colored hunk header '%.*s'" -#~ msgstr "impossible d'analyser l'entête coloré de section '%.*s'" - -#, c-format -#~ msgid "Unknown subcommand: %s" -#~ msgstr "Sous-commande inconnue : %s" - -#~ msgid "checked out in another worktree" -#~ msgstr "extrait dans un autre arbre de travail" - -#~ msgid "failed to open stdin of 'crontab'" -#~ msgstr "échec à l'ouverture de stdin de 'crontab'" - -#, c-format -#~ msgid "invalid subcommand: %s" -#~ msgstr "sous-commande invalide : %s" - -#~ msgid "single arg format must be symmetric range" -#~ msgstr "un format d'argument unique doit être une plage symétrique" - -#~ msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -#~ msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]" - -#, c-format -#~ msgid "failed to get the default remote for submodule '%s'" -#~ msgstr "" -#~ "échec d'obtention du dépôt distant par défaut pour le sous-module '%s'" - -#, c-format -#~ msgid "Invalid update mode '%s' for submodule path '%s'" -#~ msgstr "" -#~ "Mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'" - -#~ msgid "path into the working tree, across nested submodule boundaries" -#~ msgstr "" -#~ "chemin dans la copie de travail, traversant les frontières de sous-modules" - -#~ msgid "rebase, merge, checkout or none" -#~ msgstr "valeurs possibles : rebase, merge, checkout ou none" - -#~ msgid "bad value for update parameter" -#~ msgstr "valeur invalide pour la mise à jour du paramètre" - -#~ msgid "Show three-way merge without touching index" -#~ msgstr "Afficher la fusion à trois points sans modifier l'index" - -#, c-format -#~ msgid "could not create directory for '%s'" -#~ msgstr "impossible de créer le répertoire pour '%s'" - -#, c-format -#~ msgid "Couldn't start hook '%s'\n" -#~ msgstr "impossible de démarrer le crochet '%s'\n" - -#, c-format -#~ msgid "" -#~ "Note: %s not up to date and in way of checking out conflicted version; " -#~ "old copy renamed to %s" -#~ msgstr "" -#~ "Note :%s pas à jour et au milieu de l'extraction d'une version " -#~ "conflictuelle ; la vielle copie a été renommée en %s" - -#, c-format -#~ msgid "%s: fast-forward" -#~ msgstr "%s : avance rapide" - -#~ msgid "--preserve-merges was replaced by --rebase-merges" -#~ msgstr "--preserve-merges a été remplacé par --rebase-merges" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-11-30 11:05+0700\n" -"PO-Revision-Date: 2022-11-30 20:45+0700\n" +"POT-Creation-Date: 2023-03-02 15:18+0700\n" +"PO-Revision-Date: 2023-03-02 17:52+0700\n" "Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n" "Language-Team: Indonesian\n" "Language: id\n" @@ -26,19 +26,19 @@ msgstr "Huh (%s)?" msgid "could not read index" msgstr "tidak dapat membaca indeks" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "binary" msgstr "biner" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "nothing" msgstr "tidak ada" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "unchanged" msgstr "tak berubah" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Update" msgstr "Perbarui" @@ -51,15 +51,15 @@ msgstr "tidak dapat menggelar '%s'" msgid "could not write index" msgstr "tidak dapat menulis indeks" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "%d jalur diperbarui\n" msgstr[1] "%d jalur diperbarui\n" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "note: %s is untracked now.\n" msgstr "catatan: %s sekarang tak terlacak.\n" @@ -68,7 +68,7 @@ msgstr "catatan: %s sekarang tak terlacak.\n" msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry gagal untuk jalur '%s'" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Revert" msgstr "Kembalikan" @@ -76,24 +76,24 @@ msgstr "Kembalikan" msgid "Could not parse HEAD^{tree}" msgstr "Tidak dapat menguraikan HEAD^{tree}" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "%d jalur dikembalikan\n" msgstr[1] "%d jalur dikembalikan\n" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c #, c-format msgid "No untracked files.\n" msgstr "Tidak ada berkas tak terlacak.\n" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Add untracked" msgstr "Tambahkan tak terlacak" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "%d jalur ditambahkan\n" @@ -104,21 +104,21 @@ msgstr[1] "%d jalur ditambahkan\n" msgid "ignoring unmerged: %s" msgstr "mengabaikan tak tergabung: %s" -#: add-interactive.c add-patch.c git-add--interactive.perl +#: add-interactive.c add-patch.c #, c-format msgid "Only binary files changed.\n" msgstr "Hanya berkas biner yang berubah.\n" -#: add-interactive.c add-patch.c git-add--interactive.perl +#: add-interactive.c add-patch.c #, c-format msgid "No changes.\n" msgstr "Tidak ada perubahan.\n" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Patch update" msgstr "Pembaruan tambalan" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Review diff" msgstr "Tinjau diff" @@ -186,25 +186,25 @@ msgstr "pilih item bernomor" msgid "(empty) select nothing" msgstr "(empty) tidak pilih apapun" -#: add-interactive.c builtin/clean.c git-add--interactive.perl +#: add-interactive.c builtin/clean.c msgid "*** Commands ***" msgstr "*** Perintah ***" -#: add-interactive.c builtin/clean.c git-add--interactive.perl +#: add-interactive.c builtin/clean.c msgid "What now" msgstr "Apa sekarang" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "staged" msgstr "tergelar" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "unstaged" msgstr "tak tergelar" #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c -#: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c -#: builtin/submodule--helper.c git-add--interactive.perl +#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c +#: builtin/pull.c builtin/submodule--helper.c msgid "path" msgstr "jalur" @@ -212,28 +212,28 @@ msgstr "jalur" msgid "could not refresh index" msgstr "tidak dapat menyegarkan indeks" -#: add-interactive.c builtin/clean.c git-add--interactive.perl +#: add-interactive.c builtin/clean.c #, c-format msgid "Bye.\n" msgstr "Sampai jumpa.\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Gelar perubahan mode [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Gelar penghapusan [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "Gelar penambahan [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Gelar bingkah ini [y,n,q,a,d%s,?]? " @@ -259,23 +259,23 @@ msgstr "" "a - gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan gelar bingkah ini atau bingkah selanjutnya dalam berkas\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Stase perubahan mode [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Stase penghapusan [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Stase penambahan [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Stase bingkah ini [y,n,q,a,d%s,?]? " @@ -301,23 +301,23 @@ msgstr "" "a - stase bingkah ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan stase bingkah ini atau bingkah selanjutnya dalam berkas\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Batal gelar perubahan mode [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Batal gelar penghapusan [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Batal gelar penambahan [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Batal gelar bingkah ini [y,n,q,a,d%s,?]? " @@ -343,23 +343,23 @@ msgstr "" "a - batal gelar bingkah ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan batal gelar bingkah ini atau bingkah selanjutnya dalam berkas\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Terapkan perubahan mode ke indeks [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Terapkan penghapusan ke indeks [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Terapkan penambahan ke indeks [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Terapkan bingkah ini ke indeks [y,n,q,a,d%s,?]? " @@ -385,23 +385,23 @@ msgstr "" "a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Buang perubahan mode dari pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Buang penghapusan dari pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Buang penambahan dari pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Buang bingkah ini dari pohon kerja [y,n,q,a,d%s,?]? " @@ -427,23 +427,23 @@ msgstr "" "a - buang hunk ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan buang hunk ini atau bingkah selanjutnya dalam berkas\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "Buang perubahan mode dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Buang penghapusan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "Buang penambahan dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "Buang bingkah ini dari indeks dan pohon kerja [y,n,q,a,d%s,?]? " @@ -461,23 +461,23 @@ msgstr "" "a - buang bingkah ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan buang bingkah ini atau bingkah selanjutnya dalam berkas\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "Terapkan perubahan mode pada indeks dan pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Terapkan penghapusan pada indeks dan pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "Terapkan penambahan pada indeks dan pohon kerja [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Terapkan bingkah ini pada indeks dan pohon kerja [y,n,q,a,d%s,?]? " @@ -495,23 +495,23 @@ msgstr "" "a - terapkan bingkah ini dan semua bingkah selanjutnya dalam berkas\n" "d - jangan terapkan bingkah ini atau bingkah selanjutnya dalam berkas\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Terapkan perubahan mode pada pohon kerja [y,n,q,a,d%s,?]?" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Terapkan penghapusan pada pohon kerja [y,n,q,a,d%s,?]?" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "Terapkan penambahan pada pohon kerja [y,n,q,a,d%s,?]?" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Terapkan bingkah ini pada pohon kerja [y,n,q,a,d%s,?]?" @@ -581,7 +581,7 @@ msgstr "" "tidak berakhir dengan:\n" "%.*s" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Mode sunting bingkah manual -- lihat dibawah untuk panduan cepat.\n" @@ -598,9 +598,7 @@ msgstr "" "Untuk menghapus baris '%c', hapuslahnya.\n" "Baris yang diawali dengan %c akan dihapus.\n" -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -618,21 +616,13 @@ msgstr "tidak dapat menguraikan kepala bingkah" msgid "'git apply --cached' failed" msgstr "'git apply --cached' gagal" -#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -643,11 +633,11 @@ msgstr "" msgid "The selected hunks do not apply to the index!" msgstr "Bingkah yang dipilih tidak diterapkan pada indeks!" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "Apply them to the worktree anyway? " msgstr "Tetap terapkan pada pohon kerja? " -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "Nothing was applied.\n" msgstr "Tidak ada yang diterapkan.\n" @@ -685,11 +675,11 @@ msgstr "Tidak ada bingkah selanjutnya" msgid "No other hunks to goto" msgstr "Tidak ada bingkah lainnya untuk dikunjungi" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "go to which hunk (<ret> to see more)? " msgstr "pergi ke bingkah yang mana (<ret> untuk lihat lebih)? " -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "go to which hunk? " msgstr "pergi ke bingkah yang mana?" @@ -709,7 +699,7 @@ msgstr[1] "Maaf, hanya %d bingkah yang tersedia." msgid "No other hunks to search" msgstr "Tidak ada bingkah lainnya untuk dicari" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "search for regex? " msgstr "cari untuk regex? " @@ -1308,7 +1298,7 @@ msgstr "" msgid "unable to add cache entry for %s" msgstr "tidak dapat menambahkan entri tembolok untuk %s" -#: apply.c builtin/bisect--helper.c builtin/gc.c +#: apply.c builtin/bisect.c builtin/gc.c #, c-format msgid "failed to write to '%s'" msgstr "gagal menulis ke '%s'" @@ -1646,7 +1636,7 @@ msgstr "fmt" msgid "archive format" msgstr "format arsip" -#: archive.c builtin/log.c +#: archive.c builtin/log.c parse-options.h msgid "prefix" msgstr "prefiks" @@ -1680,6 +1670,15 @@ msgstr "baca .gitattributes dalam direktori kerja" msgid "report archived files on stderr" msgstr "laporkan berkas terarsip ke error standar" +#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pull.c +msgid "time" +msgstr "waktu" + +#: archive.c +msgid "set modification time of archive entries" +msgstr "setel waktu modifikasi entri arsip" + #: archive.c msgid "set compression level" msgstr "setel level kompresi" @@ -1736,6 +1735,15 @@ msgid "%.*s is not a valid attribute name" msgstr "%.*s bukan sebuah nama atribut valid" #: attr.c +msgid "unable to add additional attribute" +msgstr "Tidak dapat menambahkan atribut tambahan" + +#: attr.c +#, c-format +msgid "ignoring overly long attributes line %d" +msgstr "mengabaikan baris atribut ke-%d yang terlalu panjang" + +#: attr.c #, c-format msgid "%s not allowed: %s:%d" msgstr "%s tidak diperbolehkan: %s:%d" @@ -1748,6 +1756,21 @@ msgstr "" "Pola negatif diabaikan di atribut git\n" "Gunakan '\\!' untuk tanda seru awal literal." +#: attr.c +#, c-format +msgid "cannot fstat gitattributes file '%s'" +msgstr "tidak dapat menulis berkas gitattributes '%s'" + +#: attr.c +#, c-format +msgid "ignoring overly large gitattributes file '%s'" +msgstr "mengabaikan berkas gitattributes yang terlalu besar '%s'" + +#: attr.c +#, c-format +msgid "ignoring overly large gitattributes blob '%s'" +msgstr "mengabaikan blob gitattributes '%s' yang terlalu besar" + #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" @@ -1881,8 +1904,8 @@ msgstr "" "--reverse dan --first-parent bersama-sama butuh komit terbaru yang disebutkan" #: blame.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c -#: ref-filter.c remote.c sequencer.c submodule.c +#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c ref-filter.c +#: remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "persiapan jalan revisi gagal" @@ -2072,11 +2095,11 @@ msgstr "submodul '%s': tidak dapat menemukan submodul" #: branch.c #, c-format msgid "" -"You may try updating the submodules using 'git checkout %s && git submodule " -"update --init'" +"You may try updating the submodules using 'git checkout --no-recurse-" +"submodules %s && git submodule update --init'" msgstr "" -"Anda dapat mencoba memperbarui submodul dengan 'git checkout %s && git " -"submodule update --init'" +"Anda dapat mencoba memperbarui submodul dengan 'git checkout --no-recurse-" +"submodules %s && git submodule update --init'" #: branch.c #, c-format @@ -2120,6 +2143,14 @@ msgstr "hapus '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Perubahan tak tergelar setelah menyegarkan indeks:" +#: builtin/add.c +msgid "" +"the add.interactive.useBuiltin setting has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"setelan add.interactive.useBuiltin sudah dihapus!\n" +"Selengkapnya lihat entrinya di 'git help config'." + #: builtin/add.c builtin/rev-parse.c msgid "Could not read the index" msgstr "Tidak dapat membaca indeks" @@ -2590,7 +2621,7 @@ msgstr "" "Sepertinya Anda telah memindahkan HEAD sejak kegagalan 'am' terakhir.\n" "Tidak memutar ulang ke ORIG_HEAD" -#: builtin/am.c builtin/bisect--helper.c worktree.c +#: builtin/am.c builtin/bisect.c worktree.c #, c-format msgid "failed to read '%s'" msgstr "gagal membaca '%s'" @@ -2613,6 +2644,10 @@ msgid "run interactively" msgstr "jalankan secara interaktif" #: builtin/am.c +msgid "bypass pre-applypatch and applypatch-msg hooks" +msgstr "lewati kail pre-applypatch dan applypatch-msg" + +#: builtin/am.c msgid "historical option -- no-op" msgstr "opsi bersejarah -- no-op" @@ -2803,112 +2838,106 @@ msgstr "git archive: kesalahan protokol" msgid "git archive: expected a flush" msgstr "git archive: sebuah bilasan diharapkan" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [<komit>]" - -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " -"[<paths>...]" +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{new,bad}=<istilah> --term-{old," -"good}=<istilah>] [--no-checkout] [--first-parent] [<jelek> [<bagus>...]] " -"[--] [<jalur>...]" +"git bisect start [--term-{new,bad}=<istilah> --term-{old, good}=<istilah>] " +"[--no-checkout] [--first-parent] [<jelek> [<bagus>...]] [--] [<jalur>...]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "git bisect--helper --bisect-state (bad|new) [<revisi>]" +#: builtin/bisect.c +msgid "git bisect (good|bad) [<rev>...]" +msgstr "git bisect (good|bad) [<revisi>...]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "git bisect--helper --bisect-state (good|old) [<revisi>...]" +#: builtin/bisect.c +msgid "git bisect skip [(<rev>|<range>)...]" +msgstr "git bisect skip [(<revisi>|<rentang>)...]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-replay <filename>" -msgstr "git bisect--helper --bisect-replay <nama berkas>" +#: builtin/bisect.c +msgid "git bisect reset [<commit>]" +msgstr "git bisect reset [<komit>]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" -msgstr "git bisect--helper --bisect-skip [(<revisi>|<rentang>)...]" +#: builtin/bisect.c +msgid "git bisect replay <logfile>" +msgstr "git bisect replay <berkas log>" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-run <cmd>..." -msgstr "git bisect--helper --bisect-run <perintah>..." +#: builtin/bisect.c +msgid "git bisect run <cmd>..." +msgstr "git bisect run <perintah>..." -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "tidak dapat membuka berkas '%s' dalam mode '%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "could not write to file '%s'" msgstr "tidak dapat menulis ke berkas '%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' for reading" msgstr "tidak dapat membuka berkas '%s' untuk dibaca" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s' is not a valid term" msgstr "'%s' bukan istilah yang valid" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "tidak dapat menggunakan perintah bawaan '%s' sebagai istilah" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "can't change the meaning of the term '%s'" msgstr "tidak dapat mengubah makna istilah '%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "please use two different terms" msgstr "mohon gunakan dua istilah yang berbeda" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "We are not bisecting.\n" msgstr "Kami tidak sedang membagi dua.\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' bukan sebuah komit yang valid" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "" "tidak dapat men-checkout HEAD asli '%s'. Coba 'git bisect reset <komit>'." -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Bad bisect_write argument: %s" msgstr "argument bisect_write jelek: %s" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "tidak dapat mendapatkan oid revisi '%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "couldn't open the file '%s'" msgstr "tidak dapat membuka berkas '%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Perintah tidak valid: sekarang Anda berada dalam pembagian dua %s/%s" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -2917,7 +2946,7 @@ msgstr "" "Anda perlu berikan saya setidaknya satu revisi %s dan %s.\n" "Untuk itu Anda dapat menggunakan \"git bisect %s\" dan \"git bisect %s\"." -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -2928,7 +2957,7 @@ msgstr "" "Lalu Anda perlu berikan saya setidaknya satu revisi %s dan %s.\n" "Untuk itu Anda dapat menggunakan \"git bisect %s\" dan \"git bisect %s\"." -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "bisecting only with a %s commit" msgstr "membagi dua hanya dengan sebuah komit %s" @@ -2937,30 +2966,30 @@ msgstr "membagi dua hanya dengan sebuah komit %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "Are you sure [Y/n]? " msgstr "Anda yakin [Y/n]?" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "status: waiting for both good and bad commits\n" msgstr "status: menunggu komit bagus dan jelek\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "status: waiting for bad commit, %d good commit known\n" msgid_plural "status: waiting for bad commit, %d good commits known\n" msgstr[0] "status: menunggu komit jelek, %d komit bagus diketahui\n" msgstr[1] "status: menunggu komit jelek, %d komit bagus diketahui\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "status: waiting for good commit(s), bad commit known\n" msgstr "status: menunggu komit bagus, komit jelek diketahui\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "no terms defined" msgstr "tidak ada istilah yang didefinisikan" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -2969,7 +2998,7 @@ msgstr "" "Istilah Anda saat ini adalah %s untuk keadaan lama\n" "dan %s untuk keadaan baru.\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -2978,52 +3007,48 @@ msgstr "" "argumen %s tidak valid untuk 'git bisect terms'.\n" "Opsi yang didukung adalah: --term-good|--term-old dan --term-bad|--term-new." -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "revision walk setup failed\n" msgstr "setup jalan revisi gagal\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "could not open '%s' for appending" msgstr "tidak dapat membuka '%s' untuk menambahkan" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "'' is not a valid term" msgstr "'' bukan istilah yang valid" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "unrecognized option: '%s'" msgstr "opsi tidak dikenal: '%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' sepertinya bukan revisi valid" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bad HEAD - I need a HEAD" msgstr "HEAD jelek - saya butuh HEAD" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "gagal men-checkout '%s'. Coba 'git bisect start <cabang valid>'." -#: builtin/bisect--helper.c -msgid "won't bisect on cg-seek'ed tree" -msgstr "tidak akan membagi dua pada pohon yang di-cg-seek" - -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bad HEAD - strange symbolic ref" msgstr "HEAD jelek - referensi simbolik aneh" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "invalid ref: '%s'" msgstr "referensi tidak valid: '%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "You need to start by \"git bisect start\"\n" msgstr "Anda perlu memulai dengan \"git bisect start\"\n" @@ -3031,115 +3056,122 @@ msgstr "Anda perlu memulai dengan \"git bisect start\"\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "Do you want me to do it for you [Y/n]? " msgstr "Anda ingin saya melakukannya untuk Anda [Y/n]" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "Please call `--bisect-state` with at least one argument" msgstr "Mohon panggil `--bisect-state` dengan setidaknya satu argumen" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' hanya dapat mengambil satu argumen." -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Bad rev input: %s" msgstr "Masukan revisi jelek: %s" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Bad rev input (not a commit): %s" msgstr "Masukan revisi jelek (bukan sebuah komit): %s" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "We are not bisecting." msgstr "Kami tidak sedang membagi dua." -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s'?? Anda bilang tentang apa?" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot read file '%s' for replaying" msgstr "tidak dapat membuka berkas '%s' untuk memainkan ulang" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "running %s\n" msgstr "menjalankan %s\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bisect run failed: no command provided." msgstr "bisect run gagal: tidak ada perintah yang diberikan" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format -msgid "unable to verify '%s' on good revision" -msgstr "tidak dapat memverifikasi '%s' pada revisi bagus" +msgid "unable to verify %s on good revision" +msgstr "tidak dapat memverifikasi %s pada revisi bagus" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "bogus exit code %d for good revision" msgstr "kode keluar gadungan %d untuk revisi bagu" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format -msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" -msgstr "bisect run gagal: kode keluar %d dari '%s' < 0 atau >= 128" +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" +msgstr "bisect run gagal: kode keluar %d dari %s < 0 atau >= 128" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' for writing" msgstr "tidak dapat membuka berkas '%s' untuk ditulis" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bisect run cannot continue any more" msgstr "bisect run tidak dapat dilanjutkan lagi" -#: builtin/bisect--helper.c -#, c-format +#: builtin/bisect.c msgid "bisect run success" msgstr "bisect run sukses" -#: builtin/bisect--helper.c -#, c-format +#: builtin/bisect.c msgid "bisect found first bad commit" msgstr "pembagian dua menemukan komit jelek pertama" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format -msgid "" -"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " -"code %d" -msgstr "" -"bisect run gagal: 'git bisect--helper --bisect-state %s' keluar dengan kode " -"keluar %d" - -#: builtin/bisect--helper.c -msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset butuh baik tanpa argumen atau sebuah komit" +msgid "bisect run failed: 'git bisect %s' exited with error code %d" +msgstr "bisect run gagal: 'git bisect %s' keluar dengan kode keluar %d" -#: builtin/bisect--helper.c -msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--bisect-terms butuh 0 atau 1 argumen" +#: builtin/bisect.c +#, c-format +msgid "'%s' requires either no argument or a commit" +msgstr "'%s' perlu baik tanpa argumen atau sebuah komit" -#: builtin/bisect--helper.c -msgid "--bisect-next requires 0 arguments" -msgstr "--bisect-next butuh 0 argumen" +#: builtin/bisect.c +#, c-format +msgid "'%s' requires 0 or 1 argument" +msgstr "%s perlu sebuah argumen" -#: builtin/bisect--helper.c -msgid "--bisect-log requires 0 arguments" -msgstr "--bisect-log butuh 0 argumen" +#: builtin/bisect.c +#, c-format +msgid "'%s' requires 0 arguments" +msgstr "'%s' butuh tanpa argumen" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "no logfile given" msgstr "tidak ada berkas log yang diberikan" +#: builtin/bisect.c +#, c-format +msgid "'%s' failed: no command provided." +msgstr "'%s' gagal: tidak ada perintah yang diberikan." + +#: builtin/bisect.c +msgid "need a command" +msgstr "butuh sebuah perintah" + +#: builtin/bisect.c builtin/cat-file.c +#, c-format +msgid "unknown command: '%s'" +msgstr "perintah tidak dikenal: '%s'" + #: builtin/blame.c msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opsi>] [<opsi revisi>] [<revisi>] [--] <berkas>" @@ -3860,6 +3892,10 @@ msgstr "git bundle list-heads <berkas> [<nama referensi>...]" msgid "git bundle unbundle [--progress] <file> [<refname>...]" msgstr "git bundle unbundle [--progress] <berkas> [<nama referensi>...]" +#: builtin/bundle.c +msgid "need a <file> argument" +msgstr "butuh sebuah argumen <berkas>" + #: builtin/bundle.c builtin/pack-objects.c msgid "do not show progress meter" msgstr "jangan perlihatkan meteran perkembangan" @@ -3930,11 +3966,6 @@ msgid "%s takes no arguments" msgstr "%s tidak mengambil argumen" #: builtin/cat-file.c -#, c-format -msgid "unknown command: '%s'" -msgstr "perintah tidak dikenal: '%s'" - -#: builtin/cat-file.c msgid "only one batch option may be specified" msgstr "hanya satu opsi setumpuk yang mungkin disebutkan" @@ -4109,12 +4140,19 @@ msgstr "" "hanya dua argumen yang diperbolehkan di dalam mode <tipe> <objek>, bukan %d" #: builtin/check-attr.c -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." -msgstr "git check-attr [-a | --all | <atribut>...] [--] <nama jalur>..." +msgid "" +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " +"<pathname>..." +msgstr "" +"git check-attr [source <mirip-pohon> [-a | --all | <atribut>...] [--] <nama " +"jalur>..." #: builtin/check-attr.c -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" -msgstr "git check-attr --stdin [-z] [-a | --all | <attribut>...]" +msgid "" +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" +msgstr "" +"git check-attr --stdin [-z] [--source <mirip-pohon>] [-a | --all | " +"<attribut>...]" #: builtin/check-attr.c msgid "report all attributes set on file" @@ -4132,6 +4170,14 @@ msgstr "baca nama berkas dari masukan standar" msgid "terminate input and output records by a NUL character" msgstr "akhiri masukan dan keluarkan rekaman oleh sebuah karakter NUL" +#: builtin/check-attr.c +msgid "<tree-ish>" +msgstr "<mirip-pohon>" + +#: builtin/check-attr.c +msgid "which tree-ish to check attributes at" +msgstr "mirip-pohon mana yang diperiksa atributnya" + #: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c msgid "suppress progress reporting" msgstr "padamkan pelaporan kemajuan" @@ -4813,7 +4859,7 @@ msgstr "Menolak menghapus direktori kerja saat ini\n" msgid "Would refuse to remove current working directory\n" msgstr "Akan menolak menghapus direktori kerja saat ini\n" -#: builtin/clean.c git-add--interactive.perl +#: builtin/clean.c #, c-format msgid "" "Prompt help:\n" @@ -4826,7 +4872,7 @@ msgstr "" "foo - pilih item berdasarkan prefiks unik\n" " - (kosong) tidak pilih apa-apa\n" -#: builtin/clean.c git-add--interactive.perl +#: builtin/clean.c #, c-format msgid "" "Prompt help:\n" @@ -4847,8 +4893,8 @@ msgstr "" "* - pilih semua item\n" " - (kosong) selesai memilih\n" -#: builtin/clean.c git-add--interactive.perl -#, c-format, perl-format +#: builtin/clean.c +#, c-format msgid "Huh (%s)?\n" msgstr "Huh (%s)?\n" @@ -5039,10 +5085,6 @@ msgstr "kedalaman" msgid "create a shallow clone of that depth" msgstr "buat klon dangkal sedalam kedalaman tersebut" -#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c -msgid "time" -msgstr "waktu" - #: builtin/clone.c msgid "create a shallow clone since a specific time" msgstr "buat klon dangkal sejak waktu yang disebutkan" @@ -5338,6 +5380,10 @@ msgid "failed to fetch objects from bundle URI '%s'" msgstr "gagal mengambil objek dari URI bundel '%s'" #: builtin/clone.c +msgid "failed to fetch advertised bundles" +msgstr "gagal mengambil bundel yang diiklankan" + +#: builtin/clone.c msgid "remote transport reported error" msgstr "transportasi remote melaporkan kesalahan" @@ -5714,7 +5760,7 @@ msgstr "" "tidak dapat memilih karakter komentar yang tidak terpakai\n" "dalam pesan komit saat ini" -#: builtin/commit.c +#: builtin/commit.c builtin/merge-tree.c #, c-format msgid "could not lookup commit %s" msgstr "tidak dapat mencari komit %s" @@ -6022,7 +6068,7 @@ msgstr "tangal" msgid "override date for commit" msgstr "timpa tanggal komit" -#: builtin/commit.c parse-options.h ref-filter.h +#: builtin/commit.c builtin/merge-tree.c parse-options.h ref-filter.h msgid "commit" msgstr "komit" @@ -6176,7 +6222,7 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<opsi>]" -#: builtin/config.c builtin/env--helper.c +#: builtin/config.c #, c-format msgid "unrecognized --type argument, %s" msgstr "argumen --type tidak dikenal %s" @@ -6285,11 +6331,11 @@ msgstr "temukan setelan warna: slot [stdout-is-tty]" msgid "Type" msgstr "Tipe" -#: builtin/config.c builtin/env--helper.c builtin/hash-object.c +#: builtin/config.c builtin/hash-object.c msgid "type" msgstr "tipe" -#: builtin/config.c builtin/env--helper.c +#: builtin/config.c msgid "value is given this type" msgstr "Nilai diberikan tipe ini" @@ -6344,7 +6390,7 @@ msgstr "" "perlihatkan cakupan konfigurasi (pohon kerja, lokal, global, sistem, " "perintah)" -#: builtin/config.c builtin/env--helper.c +#: builtin/config.c msgid "value" msgstr "nilai" @@ -6887,34 +6933,6 @@ msgstr "tidak ada <alat> yang diberikan untuk --tool=<alat>" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "tidak ada <perintah> yang diberikan untuk --extcmd=<perintah>" -#: builtin/env--helper.c -msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -msgstr "git env--helper --type=[bool|ulong] <opsi> <variabel lingkungan>" - -#: builtin/env--helper.c -msgid "default for git_env_*(...) to fall back on" -msgstr "asali untuk git_env_*(...) agar kembali" - -#: builtin/env--helper.c -msgid "be quiet only use git_env_*() value as exit code" -msgstr "jadi diam; hanya gunakan nilai git_env_*() sebagai kode keluar" - -#: builtin/env--helper.c -#, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "" -"opsi `--default' mengharapkan sebuah nilai boolean dengan `--type=bool`, " -"bukan `%s`" - -#: builtin/env--helper.c -#, c-format -msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not `" -"%s`" -msgstr "" -"opsi `--default' mengharapkan sebuah nilai unsigned long dengan `--" -"type=ulong`, bukan `%s`" - #: builtin/fast-export.c msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<opsi rev-list>]" @@ -7423,6 +7441,11 @@ msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow pada repositori penuh tidak masuk akal" #: builtin/fetch.c +#, c-format +msgid "failed to fetch bundles from '%s'" +msgstr "gagal mengambil bundel dari '%s'" + +#: builtin/fetch.c msgid "fetch --all does not take a repository argument" msgstr "fetch --all tidak mengambil argumen repositori" @@ -8730,13 +8753,21 @@ msgid "'git help config' for more information" msgstr "'git help config' untuk informasi lebih lanjut" #: builtin/hook.c -msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" -msgstr "git hook run [--ignore-missing] <nama kait> [-- <argumen kait>]" +msgid "" +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" +"args>]" +msgstr "" +"git hook run [--ignore-missing] [--to-stdin=<jalur>] <nama kait> [-- " +"<argumen kait>]" #: builtin/hook.c msgid "silently ignore missing requested <hook-name>" msgstr "diam-diam abaikan <nama kait> yang diminta yang hilang" +#: builtin/hook.c +msgid "file to read into hooks' stdin" +msgstr "gagal membaca masukan standar kait" + #: builtin/index-pack.c #, c-format msgid "object type mismatch at %s" @@ -9799,11 +9830,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" -" [--symref] [<repository> [<refs>...]]" +" [--symref] [<repository> [<patterns>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<kunci>]\n" -" [--symref] [<repositori> [<referensi>...]]" +" [--symref] [<repositori> [<pola>...]]" #: builtin/ls-remote.c msgid "do not print remote URL" @@ -10126,9 +10157,17 @@ msgid "perform multiple merges, one per line of input" msgstr "lakukan banyak penggabungan, satu per baris masukan" #: builtin/merge-tree.c +msgid "specify a merge-base for the merge" +msgstr "harus menyebutkan sebuah dasar penggabungan untuk penggabungan" + +#: builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge tidak kompatibel dengan semua opsi lainnya" +#: builtin/merge-tree.c +msgid "--merge-base is incompatible with --stdin" +msgstr "--merge-base tidak kompatibel dengan --stdin" + #: builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." @@ -12207,7 +12246,7 @@ msgstr "minta transaksi atomik pada sisi remote" msgid "--delete doesn't make sense without any refs" msgstr "--delete tidak masuk akal tanpa referensi" -#: builtin/push.c +#: builtin/push.c t/helper/test-bundle-uri.c #, c-format msgid "bad repository '%s'" msgstr "repositori jelek '%s'" @@ -12485,6 +12524,10 @@ msgid "could not switch to %s" msgstr "tidak dapat mengganti ke %s" #: builtin/rebase.c +msgid "apply options and merge options cannot be used together" +msgstr "opsi apply dan opsi merge tidak dapat digunakan bersamaan" + +#: builtin/rebase.c #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -12769,8 +12812,20 @@ msgid "--strategy requires --merge or --interactive" msgstr "--strategy butuh --merge atau --interactive" #: builtin/rebase.c -msgid "apply options and merge options cannot be used together" -msgstr "opsi apply dan opsi merge tidak dapat digunakan bersamaan" +msgid "" +"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"autosquash" +msgstr "" +"opsi penerapan tidak kompatibel dengan rebase.autosquash. " +"Pertimbangkanmenambahkan --no-autosquash" + +#: builtin/rebase.c +msgid "" +"apply options are incompatible with rebase.updateRefs. Consider adding --no-" +"update-refs" +msgstr "" +"opsi penerapan tidak kompatibel dengan rebase.updateRefs. " +"Pertimbangkanmenambahkan --no-update-refs" #: builtin/rebase.c #, c-format @@ -15878,11 +15933,6 @@ msgstr "'%s' bukan nama submodul yang valid" msgid "git submodule--helper <command>" msgstr "git submodule--helper <nama>" -#: builtin/submodule--helper.c git.c -#, c-format -msgid "%s doesn't support --super-prefix" -msgstr "%s tidak mendukung --super-prefix" - #: builtin/symbolic-ref.c msgid "git symbolic-ref [-m <reason>] <name> <ref>" msgstr "git symbolic-ref [-m <alasan>] <nama> <referensi>" @@ -16805,6 +16855,11 @@ msgstr "core.fsyncMethod = batch tidak didukung pada platform ini" #: bundle-uri.c #, c-format +msgid "could not parse bundle list key %s with value '%s'" +msgstr "tidak dapat mengurai kunci daftar bundel %s dengan nilai '%s'" + +#: bundle-uri.c +#, c-format msgid "bundle list at '%s' has no mode" msgstr "daftar bundel pada '%s' tidak punya mode" @@ -16818,6 +16873,15 @@ msgstr "tidak cukup kemampuan" #: bundle-uri.c #, c-format +msgid "file downloaded from '%s' is not a bundle" +msgstr "berkas yang diunduh dari '%s' bukan sebuah bundel" + +#: bundle-uri.c +msgid "failed to store maximum creation token" +msgstr "gagal menyimpan token pembuatan maksimum" + +#: bundle-uri.c +#, c-format msgid "unrecognized bundle mode from URI '%s'" msgstr "mode bundel tidak dikenal dari URI '%s'" @@ -16837,6 +16901,15 @@ msgid "file at URI '%s' is not a bundle or bundle list" msgstr "berkas pada URI '%s' bukan sebuah bundel atau daftar bundel" #: bundle-uri.c +#, c-format +msgid "bundle-uri: unexpected argument: '%s'" +msgstr "bundle-uri: argumen tidak diharapkan: '%s'" + +#: bundle-uri.c +msgid "bundle-uri: expected flush after arguments" +msgstr "bundle-uri: bilasan diharapkan setelah argumen" + +#: bundle-uri.c msgid "bundle-uri: got an empty line" msgstr "bundle-uri: dapat satu baris kosong" @@ -16877,6 +16950,14 @@ msgid "need a repository to verify a bundle" msgstr "perlu sebuah repositori untuk verifikasi bundel" #: bundle.c +msgid "" +"some prerequisite commits exist in the object store, but are not connected " +"to the repository's history" +msgstr "" +"beberapa komit prasyarat ada pada penyimpanan objek, tetapi tidak terhubung " +"ke riwayat repositori" + +#: bundle.c #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %<PRIuMAX> refs:" @@ -18673,12 +18754,12 @@ msgstr "format objek tidak dikenal '%s' disebutkan oleh peladen" #: connect.c #, c-format -msgid "invalid ls-refs response: %s" -msgstr "jawaban ls-refs tidak valid: %s" +msgid "error on bundle-uri response line %d: %s" +msgstr "kesalahan pada baris tanggapan bundle-uri ke-%d: %s" #: connect.c -msgid "expected flush after ref listing" -msgstr "bilasan diharapkan setelah penyebutan referensi" +msgid "expected flush after bundle-uri listing" +msgstr "bilasan diharapkan setelah pendaftaran bundle-uri" #: connect.c msgid "expected response end packet after ref listing" @@ -18686,6 +18767,15 @@ msgstr "jawaban akhir paket diharapkan setelah penyebutan referensi" #: connect.c #, c-format +msgid "invalid ls-refs response: %s" +msgstr "jawaban ls-refs tidak valid: %s" + +#: connect.c +msgid "expected flush after ref listing" +msgstr "bilasan diharapkan setelah penyebutan referensi" + +#: connect.c +#, c-format msgid "protocol '%s' is not supported" msgstr "protokol '%s' tidak didukung" @@ -20134,16 +20224,14 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]" +" [--config-env=<name>=<envvar>] <command> [<args>]" msgstr "" "git [-v| --version] [-h | --help] [-C <jalur>] [-c <nama>=<nilai>]\n" " [--exec-path[=<jalur>]] [--html-path] [--man-path] [--info-path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<jalur>] [--work-tree=<jalur>] [--namespace=<nama>]\n" -" [--super-prefix=<jalur>] [--config-env=<nama>=<variabel " -"lingkungan>]\n" +" [--config-env=<nama>=<variabel lingkungan>]\n" " <perintah> [<argumen>]" #: git.c @@ -20175,11 +20263,6 @@ msgstr "tidak ada ruang nama yang diberikan untuk --namespace\n" #: git.c #, c-format -msgid "no prefix given for --super-prefix\n" -msgstr "tidak ada prefiks yang diberikan untuk --super-prefix\n" - -#: git.c -#, c-format msgid "-c expects a configuration string\n" msgstr "-c mengharapkan sebuah untai konfigurasi\n" @@ -20316,8 +20399,13 @@ msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand gagal: %s %s" #: gpg-interface.c -msgid "gpg failed to sign the data" -msgstr "gpg gagal menandatangani data" +#, c-format +msgid "" +"gpg failed to sign the data:\n" +"%s" +msgstr "" +"gpg gagal menandatangani data:\n" +"%s" #: gpg-interface.c msgid "user.signingKey needs to be set for ssh signing" @@ -21706,6 +21794,11 @@ msgstr "sampah pada ujung berkas objek '%s'" #: object-file.c #, c-format +msgid "unable to open loose object %s" +msgstr "tidak dapat membuka objek longgar %s" + +#: object-file.c +#, c-format msgid "unable to parse %s header" msgstr "tidak dapat menguraikan kepala %s" @@ -21725,8 +21818,8 @@ msgstr "kepala untuk %s terlalu panjang, melebihi %d bita" #: object-file.c #, c-format -msgid "failed to read object %s" -msgstr "gagal membaca objek %s" +msgid "loose object %s (stored in %s) is corrupt" +msgstr "objek longgar %s (disimpan di %s) rusak" #: object-file.c #, c-format @@ -21735,11 +21828,6 @@ msgstr "pengganti %s tidak ditemukan untuk %s" #: object-file.c #, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "objek longgar %s (disimpan di %s) rusak" - -#: object-file.c -#, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "objek terpak %s (disimpan di %s) rusak" @@ -21754,10 +21842,6 @@ msgid "unable to set permission to '%s'" msgstr "tidak dapat menyetel perizinan ke '%s'" #: object-file.c -msgid "file write error" -msgstr "kesalahan menulis berkas" - -#: object-file.c msgid "error when closing loose object file" msgstr "kesalahan saat menutup berkas objek longgar" @@ -21817,12 +21901,13 @@ msgid "cannot read object for %s" msgstr "tidak dapat membaca objek untuk %s" #: object-file.c -msgid "corrupt commit" -msgstr "komit rusak" +#, c-format +msgid "object fails fsck: %s" +msgstr "fsck objek gagal: %s" #: object-file.c -msgid "corrupt tag" -msgstr "tag rusak" +msgid "refusing to create malformed object" +msgstr "menolak membuat objek jelek" #: object-file.c #, c-format @@ -22137,11 +22222,6 @@ msgid "cannot fstat bitmap file" msgstr "tidak dapat fstat berkas bitmap" #: pack-bitmap.c -#, c-format -msgid "ignoring extra bitmap file: '%s'" -msgstr "mengabaikan berkas bitmap tambahan: '%s'" - -#: pack-bitmap.c msgid "checksum doesn't match in MIDX and bitmap" msgstr "checksum tidak cocok di MIDX dan bitmap" @@ -22469,6 +22549,10 @@ msgid "use <n> digits to display object names" msgstr "gunakan <n> digit untuk menampilkan nama objek" #: parse-options.h +msgid "prefixed path to initial superproject" +msgstr "jalur terprefiks ke superproyek awal" + +#: parse-options.h msgid "how to strip spaces and #comments from message" msgstr "bagaimana cara mengupas spasi dan #komentar dari pesan" @@ -23071,6 +23155,16 @@ msgstr "di depan %d, di belakang %d" #: ref-filter.c #, c-format +msgid "%%(%.*s) does not take arguments" +msgstr "%%(%.*s) tidak mengambil argumen" + +#: ref-filter.c +#, c-format +msgid "unrecognized %%(%.*s) argument: %s" +msgstr "argumen %%(%.*s) tidak dikenal: %s" + +#: ref-filter.c +#, c-format msgid "expected format: %%(color:<color>)" msgstr "format yang diharapkan: %%(color:<warna>)" @@ -23091,26 +23185,6 @@ msgstr "Nilai bilangan bulat diharapkan refname:rstrip=%s" #: ref-filter.c #, c-format -msgid "unrecognized %%(%s) argument: %s" -msgstr "argumen %%(%s) tidak dikenal: %s" - -#: ref-filter.c -#, c-format -msgid "%%(objecttype) does not take arguments" -msgstr "%%(objecttype) tidak mengambil argumen" - -#: ref-filter.c -#, c-format -msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) tidak mengambil argumen" - -#: ref-filter.c -#, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) tidak mengambil argumen" - -#: ref-filter.c -#, c-format msgid "expected %%(trailers:key=<value>)" msgstr "diharapkan %%(trailers:key=<nilai>)" @@ -23131,11 +23205,6 @@ msgstr "nilai positif '%s' diharapkan di %%(%s)" #: ref-filter.c #, c-format -msgid "unrecognized email option: %s" -msgstr "opsi surel tidak dikenal: %s" - -#: ref-filter.c -#, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format diharapkan: %%(align:<lebar>,<posisi>)" @@ -23151,13 +23220,13 @@ msgstr "lebar tidak dikenal: %s" #: ref-filter.c #, c-format -msgid "positive width expected with the %%(align) atom" -msgstr "lebar positif diharapkan dengan atom %%(align)" +msgid "unrecognized %%(%s) argument: %s" +msgstr "argumen %%(%s) tidak dikenal: %s" #: ref-filter.c #, c-format -msgid "%%(rest) does not take arguments" -msgstr "%%(rest) tidak mengambil argumen" +msgid "positive width expected with the %%(align) atom" +msgstr "lebar positif diharapkan dengan atom %%(align)" #: ref-filter.c #, c-format @@ -24687,6 +24756,28 @@ msgstr "git %s: gagal menyegarkan indeks" #: sequencer.c #, c-format +msgid "'%s' is not a valid label" +msgstr "'%s' bukan label valid" + +#: sequencer.c +#, c-format +msgid "'%s' is not a valid refname" +msgstr "'%s' bukan nama referensi valid" + +#: sequencer.c +#, c-format +msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" +msgstr "" +"update-ref memerlukan nama referensi terkualifikasi penuh, misalnya refs/" +"heads/%s" + +#: sequencer.c +#, c-format +msgid "invalid command '%.*s'" +msgstr "perintah tidak valid '%.*s'" + +#: sequencer.c +#, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tidak menerima argumen: '%s'" @@ -25660,6 +25751,19 @@ msgstr "ls-tree kembalikan kode kembali %d yang tak diharapkan" msgid "failed to lstat '%s'" msgstr "gagal men-lstat '%s'" +#: t/helper/test-bundle-uri.c +msgid "no remote configured to get bundle URIs from" +msgstr "tidak ada remote yang dikonfigurasi untuk mendapatkan URI bundel" + +#: t/helper/test-bundle-uri.c +#, c-format +msgid "remote '%s' has no configured URL" +msgstr "remote '%s' tidak punya URL terkonfigurasi" + +#: t/helper/test-bundle-uri.c +msgid "could not get the bundle-uri list" +msgstr "tidak dapat mendapatkan daftar bundle-uri" + #: t/helper/test-cache-tree.c msgid "test-tool cache-tree <options> (control|prime|update)" msgstr "test-tool cache-tree <opsi> (control|prime|update)" @@ -26101,6 +26205,14 @@ msgstr "Membatalkan." msgid "failed to push all needed submodules" msgstr "gagal mendorong semua submodul yang dibutuhkan" +#: transport.c +msgid "bundle-uri operation not supported by protocol" +msgstr "operasi bundle-uri tidak didukung oleh protokol" + +#: transport.c +msgid "could not retrieve server-advertised bundle-uri list" +msgstr "tidak dapat menerima daftar bundle-uri teriklankan server" + #: tree-walk.c msgid "too-short tree object" msgstr "objek pohon terlalu pendek" @@ -27005,13 +27117,22 @@ msgstr "Berkas yang diabaikan" #: wt-status.c #, c-format msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." +"It took %.2f seconds to enumerate untracked files,\n" +"but the results were cached, and subsequent runs may be faster." msgstr "" -"Butuh %.2f detik untuk menghitung berkas tak terlacak. 'status -uno'\n" -"mungkin bisa mempercepat, tapi Anda harus berhati-hati jangan sampai lupa\n" -"untuk tambahkan berkas baru sendiri (lihat 'git help status')." +"Butuh %.2f detik untuk mengenumerasikan berkas tak terlacak,\n" +"tapi hasilnya ditembolokkan, dan invokasi berikutnya mungkin\n" +"lebih cepat." + +#: wt-status.c +#, c-format +msgid "It took %.2f seconds to enumerate untracked files." +msgstr "Butuh %.2f detik untuk mengenumerasikan berkas tak terlacak." + +#: wt-status.c +msgid "See 'git help status' for information on how to improve this." +msgstr "" +"Lihat 'git help status' untuk informasi bagaimana meningkatkankeadaan ini." #: wt-status.c #, c-format @@ -27190,241 +27311,6 @@ msgstr "Anda perlu menjalankan perintah ini dari level atas dari pohon kerja." msgid "Unable to determine absolute path of git directory" msgstr "Tidak dapat menentukan jalur absolut direktori git" -#. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl -#, perl-format -msgid "%12s %12s %s" -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "touched %d path\n" -msgid_plural "touched %d paths\n" -msgstr[0] "" -msgstr[1] "" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging." -msgstr "" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for stashing." -msgstr "" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for unstaging." -msgstr "" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for applying." -msgstr "" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding." -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "failed to open hunk edit file for writing: %s" -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "" -"---\n" -"To remove '%s' lines, make them ' ' lines (context).\n" -"To remove '%s' lines, delete them.\n" -"Lines starting with %s will be removed.\n" -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "failed to open hunk edit file for reading: %s" -msgstr "" - -#: git-add--interactive.perl -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this hunk and all later hunks in the file\n" -"d - do not stage this hunk or any of the later hunks in the file" -msgstr "" - -#: git-add--interactive.perl -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file" -msgstr "" - -#: git-add--interactive.perl -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"a - unstage this hunk and all later hunks in the file\n" -"d - do not unstage this hunk or any of the later hunks in the file" -msgstr "" - -#: git-add--interactive.perl -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" - -#: git-add--interactive.perl -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" - -#: git-add--interactive.perl -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" - -#: git-add--interactive.perl -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" - -#: git-add--interactive.perl -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" - -#: git-add--interactive.perl -msgid "" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" - -#: git-add--interactive.perl -msgid "The selected hunks do not apply to the index!\n" -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "ignoring unmerged: %s\n" -msgstr "" - -#: git-add--interactive.perl -msgid "No other hunks to goto\n" -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "Invalid number: '%s'\n" -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "Sorry, only %d hunk available.\n" -msgid_plural "Sorry, only %d hunks available.\n" -msgstr[0] "" -msgstr[1] "" - -#: git-add--interactive.perl -msgid "No other hunks to search\n" -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "Malformed search regexp %s: %s\n" -msgstr "" - -#: git-add--interactive.perl -msgid "No hunk matches the given pattern\n" -msgstr "" - -#: git-add--interactive.perl -msgid "No previous hunk\n" -msgstr "" - -#: git-add--interactive.perl -msgid "No next hunk\n" -msgstr "" - -#: git-add--interactive.perl -msgid "Sorry, cannot split this hunk\n" -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "Split into %d hunk.\n" -msgid_plural "Split into %d hunks.\n" -msgstr[0] "" -msgstr[1] "" - -#: git-add--interactive.perl -msgid "Sorry, cannot edit this hunk\n" -msgstr "" - -#. TRANSLATORS: please do not translate the command names -#. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl -msgid "" -"status - show paths with changes\n" -"update - add working tree state to the staged set of changes\n" -"revert - revert staged set of changes back to the HEAD version\n" -"patch - pick hunks and update selectively\n" -"diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of " -"changes\n" -msgstr "" - -#: git-add--interactive.perl -msgid "missing --" -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "unknown --patch mode: %s" -msgstr "" - -#: git-add--interactive.perl -#, perl-format -msgid "invalid argument %s, expecting --" -msgstr "" - #: git-send-email.perl msgid "local zone differs from GMT by a non-minute interval\n" msgstr "zona lokal berbeda dari GMT oleh selang non-menit\n" @@ -27808,147 +27694,3 @@ msgstr "Melewati %s dengan akhiran cadangan '%s'.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Anda benar-benar ingin mengirim %s? [y|N]: " - -#, c-format -#~ msgid "unable to normalize object directory: %s" -#~ msgstr "tidak dapat menormalisasikan direktori objek: %s" - -#~ msgid "reset the bisection state" -#~ msgstr "setel ulang keadaan pembagian dua" - -#~ msgid "check whether bad or good terms exist" -#~ msgstr "periksa apakah ada istilah jelek atau bagus" - -#~ msgid "print out the bisect terms" -#~ msgstr "cetak istilah pembagian dua" - -#~ msgid "start the bisect session" -#~ msgstr "mulai sesi pembagian dua" - -#~ msgid "find the next bisection commit" -#~ msgstr "temukan komit pembagian dua berikutnya" - -#~ msgid "mark the state of ref (or refs)" -#~ msgstr "tandai keadaan referensi" - -#~ msgid "list the bisection steps so far" -#~ msgstr "daftar langkah pembagian dua sejauh ini" - -#~ msgid "replay the bisection process from the given file" -#~ msgstr "mainkan ulang proses pembagian dua dari berkas yang diberikan" - -#~ msgid "skip some commits for checkout" -#~ msgstr "lewati beberapa komit untuk checkout" - -#~ msgid "visualize the bisection" -#~ msgstr "visualisasikan pembagian dua" - -#~ msgid "use <cmd>... to automatically bisect" -#~ msgstr "gunakan <cmd>... untuk bagi dua otomatis." - -#~ msgid "no log for BISECT_WRITE" -#~ msgstr "tidak ada log untuk BISECT_WRITE" - -#~ msgid "Couldn't look up commit object for HEAD" -#~ msgstr "Tidak dapat mencari objek komit untuk HEAD" - -#~ msgid "git bundle create [<options>] <file> <git-rev-list args>" -#~ msgstr "git bundle create [<opsi>] <berkas> <argumen git-rev-list>" - -#, c-format -#~ msgid "options '%s' and '%s %s' cannot be used together" -#~ msgstr "opsi '%s' dan '%s %s' tidak dapat digunakan bersamaan" - -#~ msgid "git commit [<options>] [--] <pathspec>..." -#~ msgstr "git commit [<opsi>] [--] <spek jalur>..." - -#~ msgid "git fsck [<options>] [<object>...]" -#~ msgstr "git fsck [<opsi>] [<objek>...]" - -#~ msgid "git fsmonitor--daemon stop" -#~ msgstr "git fsmonitor--daemon stop" - -#~ msgid "git fsmonitor--daemon status" -#~ msgstr "git fsmonitor--daemon status" - -#~ msgid "failed to run 'git config'" -#~ msgstr "gagal menjalankan 'git config'" - -#, c-format -#~ msgid "could not get 'onto': '%s'" -#~ msgstr "tidak dapat mendapatkan 'ke': '%s'" - -#~ msgid "Could not resolve HEAD to a revision" -#~ msgstr "Tidak dapat menguraikan HEAD ke sebuah revisi" - -#, c-format -#~ msgid "missing required file: %s" -#~ msgstr "berkas yang diperlukan hilang: %s" - -#~ msgid "git revert [<options>] <commit-ish>..." -#~ msgstr "git revert [<opsi>] <mirip-komit>..." - -#~ msgid "git revert <subcommand>" -#~ msgstr "git revert <subperintah>" - -#~ msgid "git cherry-pick [<options>] <commit-ish>..." -#~ msgstr "git cherry-pick [<opsi>] <mirip-komit>..." - -#~ msgid "git cherry-pick <subcommand>" -#~ msgstr "git cherry-pick <subperintah>" - -#~ msgid "git rm [<options>] [--] <file>..." -#~ msgstr "git rm [<opsi>] [--] <berkas>..." - -#~ msgid "using --group=trailer with stdin is not supported" -#~ msgstr "mengguanakn --group=trailer dengan stdin tidak didukung" - -#~ msgid "git stash show [<options>] [<stash>]" -#~ msgstr "git stash show [<opsi>] [<stase>]" - -#~ msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#~ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stase>]" - -#~ msgid "" -#~ "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -#~ " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" -#~ " [--] [<pathspec>...]]" -#~ msgstr "" -#~ "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -#~ " [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n" -#~ " [--] [<spek jalur>...]" - -#~ msgid "" -#~ "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -#~ " [-u|--include-untracked] [-a|--all] [<message>]" -#~ msgstr "" -#~ "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -#~ " [-u|--include-untracked] [-a|--all] [<pesan>]" - -#~ msgid "path into the working tree" -#~ msgstr "jalur ke dalam pohon kerja" - -#~ msgid "recurse into submodules" -#~ msgstr "rekursi ke dalam submodul" - -#~ msgid "check if it is safe to write to the .gitmodules file" -#~ msgstr "periksa apakah itu aman untuk menulis ke berkas .gitmodules" - -#~ msgid "unset the config in the .gitmodules file" -#~ msgstr "batal setel konfigurasi dalam berkas .gitmodules" - -#~ msgid "git submodule--helper config --unset <name>" -#~ msgstr "git submodule--helper config --unset <nama>" - -#, c-format -#~ msgid "'%s' is not a valid submodule--helper subcommand" -#~ msgstr "'%s' bukan subperintah submodule--helper valid" - -#~ msgid "git upload-pack [<options>] <dir>" -#~ msgstr "git upload-pack [<opsi>] <direktori>" - -#~ msgid "git worktree add [<options>] <path> [<commit-ish>]" -#~ msgstr "git worktree add [<opsi>] <jalur> [<mirip komit>]" - -#~ msgid "git worktree lock [<options>] <path>" -#~ msgstr "git worktree lock [<opsi>] <jalur>" @@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2022 Peter Krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2023 Peter Krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010-2022. +# Peter Krefting <peter@softwolves.pp.se>, 2010-2023. # msgid "" msgstr "" -"Project-Id-Version: git 2.39.0\n" +"Project-Id-Version: git 2.40.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-11-29 04:57+0000\n" -"PO-Revision-Date: 2022-11-29 22:50+0100\n" +"POT-Creation-Date: 2023-03-02 09:34+0100\n" +"PO-Revision-Date: 2023-03-02 09:35+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -44,13 +44,13 @@ msgstr "kunde inte köa \"%s\"" msgid "could not write index" msgstr "kunde inte skriva indexet" -#, c-format, perl-format +#, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "uppdaterade %d sökväg\n" msgstr[1] "uppdaterade %d sökvägar\n" -#, c-format, perl-format +#, c-format msgid "note: %s is untracked now.\n" msgstr "observera: %s spÃ¥ras inte längre.\n" @@ -64,7 +64,7 @@ msgstr "Ã…terställ" msgid "Could not parse HEAD^{tree}" msgstr "kunde inte tolka HEAD^{tree}" -#, c-format, perl-format +#, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "Ã¥terställde %d sökväg\n" @@ -77,7 +77,7 @@ msgstr "Inga ospÃ¥rade filer.\n" msgid "Add untracked" msgstr "Lägg till ospÃ¥rad" -#, c-format, perl-format +#, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "lade till %d sökväg\n" @@ -171,19 +171,19 @@ msgstr "kunde inte uppdatera indexet" msgid "Bye.\n" msgstr "Hej dÃ¥.\n" -#, c-format, perl-format +#, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Köa borttagning [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "Köa tillägg [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Köa stycket [y,n,q,a,d%s,?]? " @@ -207,19 +207,19 @@ msgstr "" "a - köa stycket och alla följande i filen\n" "d - köa inte stycket eller nÃ¥got av de följande i filen\n" -#, c-format, perl-format +#, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Stash:a tillägg [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Stash:a stycket [y,n,q,a,d%s,?]? " @@ -243,19 +243,19 @@ msgstr "" "a - \"stash\":a stycket och alla följande i filen\n" "d - \"stash\":a inte stycket eller nÃ¥got av de följande i filen\n" -#, c-format, perl-format +#, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Ta bort ändrat läge frÃ¥n kön [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Ta bort borttagning frÃ¥n kön [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Ta bort tillägg frÃ¥n kön [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Ta bort stycket frÃ¥n kön [y,n,q,a,d%s,?]? " @@ -279,19 +279,19 @@ msgstr "" "a - ta bort stycket och alla följande i filen frÃ¥n kön\n" "d - ta inte bort stycket eller nÃ¥got av de följande i filen frÃ¥n kön\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Applicera ändrat läge pÃ¥ indexet [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Applicera borttagning pÃ¥ indexet [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Applicera tillägg pÃ¥ indexet [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Applicera stycket pÃ¥ indexet [y,n,q,a,d%s,?]? " @@ -315,19 +315,19 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller nÃ¥got av de följande i filen\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Kasta ändrat läge frÃ¥n arbetskatalogen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Kasta borttagning frÃ¥n arbetskatalogen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Kasta tillägg frÃ¥n arbetskatalogen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Kasta stycket frÃ¥n arbetskatalogen [y,n,q,a,d%s,?]? " @@ -351,19 +351,19 @@ msgstr "" "a - förkasta stycket och alla följande i filen\n" "d - förkasta inte stycket eller nÃ¥got av de följande i filen\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "Kasta ändrat läge frÃ¥n indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Kasta borttagning frÃ¥n indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "Kasta tillägg frÃ¥n indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "Kasta stycket frÃ¥n indexet och arbetskatalogen [y,n,q,a,d%s,?]? " @@ -380,19 +380,19 @@ msgstr "" "a - förkasta stycket och alla följande i filen\n" "d - förkasta inte stycket eller nÃ¥got av de följande i filen\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "Applicera ändrat läge pÃ¥ indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Applicera borttagning pÃ¥ indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "Applicera tillägg pÃ¥ indexet och arbetskatalogen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Applicera stycket pÃ¥ indexet och arbetskatalogen [y,n,q,a,d%s,?]? " @@ -409,19 +409,19 @@ msgstr "" "a - applicera stycket och alla följande i filen\n" "d - applicera inte stycket eller nÃ¥got av de följande i filen\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera ändrat läge pÃ¥ arbetskatalogen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera borttagning pÃ¥ arbetskatalogen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera tillägg pÃ¥ arbetskatalogen [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Applicera stycket pÃ¥ arbetskatalogen [y,n,q,a,d%s,?]? " @@ -497,8 +497,6 @@ msgstr "" "Ta bort \"%c\" rader genom att radera dem.\n" "Rader som börjar med %c kommer att tas bort.\n" -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -514,20 +512,12 @@ msgstr "kunde inte tolka styckehuvud" msgid "'git apply --cached' failed" msgstr "\"git apply --cached\" misslyckades" -#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -1374,6 +1364,12 @@ msgstr "läs .gitattributes i arbetskatalogen" msgid "report archived files on stderr" msgstr "rapportera arkiverade filer pÃ¥ standard fel" +msgid "time" +msgstr "tid" + +msgid "set modification time of archive entries" +msgstr "välj modifieringstid för arkivposter" + msgid "set compression level" msgstr "välj komprimeringsgrad" @@ -1414,6 +1410,13 @@ msgstr "Argumentet stöd inte för formatet \"%s\": -%d" msgid "%.*s is not a valid attribute name" msgstr "%-*s är inte ett giltigt namn pÃ¥ attribut" +msgid "unable to add additional attribute" +msgstr "Kunde inte lägga till ytterligare attribut" + +#, c-format +msgid "ignoring overly long attributes line %d" +msgstr "ignorerar överlÃ¥ng attributrad %d" + #, c-format msgid "%s not allowed: %s:%d" msgstr "%s inte tillÃ¥tet: %s:%d" @@ -1426,6 +1429,18 @@ msgstr "" "Använd '\\!' för att inleda med ett utropstecken." #, c-format +msgid "cannot fstat gitattributes file '%s'" +msgstr "kan inte utföra fstat pÃ¥ gitattributes-filen \"%s\"" + +#, c-format +msgid "ignoring overly large gitattributes file '%s'" +msgstr "ignorerar allt för stor gitattributes-fil \"%s\"" + +#, c-format +msgid "ignoring overly large gitattributes blob '%s'" +msgstr "ignorerar allt för stor gitattributes-objekt \"%s\"" + +#, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Felaktigt citerat innehÃ¥ll i filen \"%s\": %s" @@ -1702,11 +1717,11 @@ msgstr "undermodulen \"%s\": kan inte hitta undermodulen" #, c-format msgid "" -"You may try updating the submodules using 'git checkout %s && git submodule " -"update --init'" +"You may try updating the submodules using 'git checkout --no-recurse-" +"submodules %s && git submodule update --init'" msgstr "" -"Du kan försöka uppdatera undermodulerna med \"git checkout %s && git " -"submodule update --init\"" +"Du kan försöka uppdatera undermodulerna med \"git checkout --no-recurse-" +"submodules %s && git submodule update --init\"" #, c-format msgid "submodule '%s': cannot create branch '%s'" @@ -1741,6 +1756,13 @@ msgstr "ta bort \"%s\"\n" msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" +msgid "" +"the add.interactive.useBuiltin setting has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"inställningen add.interactive.useBuiltin har tagits bort!\n" +"Se dess post i \"git help config\" för detaljer." + msgid "Could not read the index" msgstr "Kunde inte läsa indexet" @@ -2125,6 +2147,9 @@ msgstr "git am [<flaggor>] (--continue | --skip | --abort)" msgid "run interactively" msgstr "kör interaktivt" +msgid "bypass pre-applypatch and applypatch-msg hooks" +msgstr "förbigÃ¥ pre-applypatch- och applypatch-msg-krokar" + msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" @@ -2265,32 +2290,27 @@ msgstr "git archive: protokollfel" msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" -msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [<incheckning>]" - msgid "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " -"[<paths>...]" +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" -"=<term>] [--no-checkout] [--first-parent] [<dÃ¥lig> [<bra>...]] [--] " -"[<sökvägar>...]" +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"checkout] [--first-parent] [<dÃ¥lig> [<bra>...]] [--] [<sökvägar>...]" -msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "git bisect--helper --bisect-state (bad|new) [<incheckning>]" +msgid "git bisect (good|bad) [<rev>...]" +msgstr "git bisect (good|bad) [<incheckning>...]" -msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "git bisect--helper --bisect-state (good|old) [<incheckning>...]" +msgid "git bisect skip [(<rev>|<range>)...]" +msgstr "git bisect skip [(<incheckning>|<intervall>)...]" -msgid "git bisect--helper --bisect-replay <filename>" -msgstr "git bisect--helper --bisect-replay <filnamn>" +msgid "git bisect reset [<commit>]" +msgstr "git bisect reset [<incheckning>]" -msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" -msgstr "git bisect--helper --bisect-skip [(<incheckning>|<intervall>)...]" +msgid "git bisect replay <logfile>" +msgstr "git bisect replay <loggfil>" -msgid "git bisect--helper --bisect-run <cmd>..." -msgstr "git bisect--helper --bisect-run <kommando>..." +msgid "git bisect run <cmd>..." +msgstr "git bisect run <kommando>..." #, c-format msgid "cannot open file '%s' in mode '%s'" @@ -2436,10 +2456,6 @@ msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"." -# cogito-relaterat -msgid "won't bisect on cg-seek'ed tree" -msgstr "kör inte \"bisect\" pÃ¥ träd där \"cg-seek\" använts" - msgid "bad HEAD - strange symbolic ref" msgstr "felaktigt HEAD - konstig symbolisk referens" @@ -2491,17 +2507,17 @@ msgid "bisect run failed: no command provided." msgstr "bisect-körning misslyckades: inget kommando gavs." #, c-format -msgid "unable to verify '%s' on good revision" -msgstr "kan inte bekräfta \"%s\" pÃ¥ bra revision" +msgid "unable to verify %s on good revision" +msgstr "kan inte bekräfta %s pÃ¥ bra revision" #, c-format msgid "bogus exit code %d for good revision" msgstr "falsk slutkod %d för bra revision" #, c-format -msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" msgstr "" -"\"bisect\"-körningen misslyckades: felkod %d frÃ¥n \"%s\" är < 0 eller >= 128" +"\"bisect\"-körningen misslyckades: felkod %d frÃ¥n %s är < 0 eller >= 128" #, c-format msgid "cannot open file '%s' for writing" @@ -2510,37 +2526,44 @@ msgstr "kan inte öppna \"%s\" för skrivning" msgid "bisect run cannot continue any more" msgstr "\"bisect\"-körningen kan inte fortsätta längre" -#, c-format msgid "bisect run success" msgstr "\"bisect\"-körningen lyckades" -#, c-format msgid "bisect found first bad commit" msgstr "bisect hittade första trasiga incheckning" #, c-format -msgid "" -"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " -"code %d" +msgid "bisect run failed: 'git bisect %s' exited with error code %d" msgstr "" -"\"bisect\"-körningen misslyckades: \"git bisect--helper --bisect-state %s\" " -"avslutades med felkoden %d" +"\"bisect\"-körningen misslyckades: \"git bisect %s\" avslutades med felkoden " +"%d" -msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset kräver antingen inget argument eller en incheckning" - -msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--bisect-terms kräver noll eller ett argument" +#, c-format +msgid "'%s' requires either no argument or a commit" +msgstr "\"%s\" kräver antingen inget argument eller en incheckning" -msgid "--bisect-next requires 0 arguments" -msgstr "--bisect-next kräver 0 argument" +#, c-format +msgid "'%s' requires 0 or 1 argument" +msgstr "\"%s\" kräver noll eller ett argument" -msgid "--bisect-log requires 0 arguments" -msgstr "--bisect-log kräver 0 argument" +#, c-format +msgid "'%s' requires 0 arguments" +msgstr "\"%s\" kräver noll argument" msgid "no logfile given" msgstr "ingen loggfil angiven" +#, c-format +msgid "'%s' failed: no command provided." +msgstr "\"%s\" misslyckades: inget kommando gavs." + +msgid "need a command" +msgstr "behöver ett kommando" + +#, c-format +msgid "unknown command: '%s'" +msgstr "okänt kommando: \"%s\"" + msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" @@ -3109,6 +3132,9 @@ msgstr "git bundle list-heads <fil> [<refnamn>...]" msgid "git bundle unbundle [--progress] <file> [<refname>...]" msgstr "git bundle unbundle [--progress] <fil> [<refnamn>...]" +msgid "need a <file> argument" +msgstr "behöver ett <fil>-argument" + msgid "do not show progress meter" msgstr "visa inte förloppsindikator" @@ -3162,10 +3188,6 @@ msgstr "%s kräver ett argument" msgid "%s takes no arguments" msgstr "%s tar inget argument" -#, c-format -msgid "unknown command: '%s'" -msgstr "okänt kommando: \"%s\"" - msgid "only one batch option may be specified" msgstr "endast en buntflagga kan anges" @@ -3300,11 +3322,17 @@ msgstr "<objekt> krävs med \"-%c\"" msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "endast tvÃ¥ argument krävs i <typ> <objekt>-läge, inte %d" -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." -msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..." +msgid "" +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " +"<pathname>..." +msgstr "" +"git check-attr [--source <träd:igt>] [-a | --all | <attr>...] [--] " +"<sökväg>..." -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" -msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]" +msgid "" +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" +msgstr "" +"git check-attr --stdin [-z] [--source <träd:igt>] [-a | --all | <attr>...]" msgid "report all attributes set on file" msgstr "visa alla attribut som satts pÃ¥ filen" @@ -3318,6 +3346,12 @@ msgstr "läs filnamn frÃ¥n standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" +msgid "<tree-ish>" +msgstr "<träd-igt>" + +msgid "which tree-ish to check attributes at" +msgstr "vilken träd-igt att kontrollera attribut pÃ¥" + msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -3895,7 +3929,7 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#, c-format, perl-format +#, c-format msgid "Huh (%s)?\n" msgstr "VadÃ¥ (%s)?\n" @@ -4044,9 +4078,6 @@ msgstr "djup" msgid "create a shallow clone of that depth" msgstr "skapa en grund klon pÃ¥ detta djup" -msgid "time" -msgstr "tid" - msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon frÃ¥n en angiven tidpunkt" @@ -4273,6 +4304,9 @@ msgstr "misslyckades initiera arkivet, hoppar över bunt-URI" msgid "failed to fetch objects from bundle URI '%s'" msgstr "misslyckades hämta objekt frÃ¥n bunt-URI \"%s\"" +msgid "failed to fetch advertised bundles" +msgstr "misslyckades hämta annonserade buntar" + msgid "remote transport reported error" msgstr "fjärrtransport rapporterade fel" @@ -5507,29 +5541,6 @@ msgstr "inget <verktyg> angavs för --tool=<verktyg>" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" -msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -msgstr "git env--helper --type=[bool|ulong] <flaggor> <miljövariabel>" - -msgid "default for git_env_*(...) to fall back on" -msgstr "standard för git_env_*(...) att falla tillbaka pÃ¥" - -msgid "be quiet only use git_env_*() value as exit code" -msgstr "var tyst, använd bara git_env_*() som resultatvärde" - -#, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "" -"flaggan \"--default\" förväntar ett sanningsvärde med \"--type=bool\", inte " -"\"%s\"" - -#, c-format -msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not `" -"%s`" -msgstr "" -"flaggan \"--default\" förväntar ett teckenlöst lÃ¥ngt värde med \"--type=ulong" -"\", inte \"%s\"" - msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<rev-list-flaggor>]" @@ -5922,6 +5933,10 @@ msgstr "negativa djup stöds inte i --deepen" msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas pÃ¥ ett komplett arkiv" +#, c-format +msgid "failed to fetch bundles from '%s'" +msgstr "misslyckades hämta buntar frÃ¥n \"%s\"" + msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet pÃ¥ ett arkiv som argument" @@ -6945,12 +6960,19 @@ msgstr "användning: %s%s" msgid "'git help config' for more information" msgstr "\"git help config\" för mer information" -msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" -msgstr "git hook run [--ignore-missing] <krok-namn> [-- <krok-argument>]" +msgid "" +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" +"args>]" +msgstr "" +"git hook run [--ignore-missing] [--to-stdin=<sökväg>] <krok-namn> [-- <krok-" +"argument>]" msgid "silently ignore missing requested <hook-name>" msgstr "ignorera tyst om önskat <krok-namn> saknas" +msgid "file to read into hooks' stdin" +msgstr "misslyckades läsa till krokens standard in" + #, c-format msgid "object type mismatch at %s" msgstr "objekttyp stämmer inte överens vid %s" @@ -7770,11 +7792,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" -" [--symref] [<repository> [<refs>...]]" +" [--symref] [<repository> [<patterns>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<nyckel>]\n" -" [--symref] [<arkiv> [<referenser>...]]" +" [--symref] [<arkiv> [<mönster>...]]" msgid "do not print remote URL" msgstr "visa inte fjärr-URL" @@ -8018,9 +8040,15 @@ msgstr "tillÃ¥t sammanslagning av orelaterade historier" msgid "perform multiple merges, one per line of input" msgstr "utför flera sammanslagningar, en per indatarad" +msgid "specify a merge-base for the merge" +msgstr "ange en sammanslagningsbas för sammanslagningen" + msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge är inkompatibelt med andra flaggor" +msgid "--merge-base is incompatible with --stdin" +msgstr "--merge-base är inkompatibel med --stdin" + #, c-format msgid "malformed input line: '%s'." msgstr "felaktig indatarad: \"%s\"." @@ -9896,6 +9924,10 @@ msgstr "" msgid "could not switch to %s" msgstr "kunde inte växla till %s" +msgid "apply options and merge options cannot be used together" +msgstr "" +"appliceringsflaggor och sammanslagningsflaggor kan inte användas tillsammans" + #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -10124,9 +10156,19 @@ msgstr "Okänt läge: %s" msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" -msgid "apply options and merge options cannot be used together" +msgid "" +"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"autosquash" msgstr "" -"appliceringsflaggor och sammanslagningsflaggor kan inte användas tillsammans" +"argument för \"apply\" är inkompatibla med rebase.autosquash. Överväg att " +"lägga till --no-autosquash" + +msgid "" +"apply options are incompatible with rebase.updateRefs. Consider adding --no-" +"update-refs" +msgstr "" +"argument för \"apply\" är inkompatibla med rebase.updateRefs. Överväg att " +"lägga till --no-update-refs" #, c-format msgid "Unknown rebase backend: %s" @@ -12594,10 +12636,6 @@ msgstr "\"%s\" är inte ett giltigt namn pÃ¥ undermodul" msgid "git submodule--helper <command>" msgstr "git submodule--helper <kommando>" -#, c-format -msgid "%s doesn't support --super-prefix" -msgstr "%s stöder inte --super-prefix" - msgid "git symbolic-ref [-m <reason>] <name> <ref>" msgstr "git symbolic-ref [-m <orsak>] <namn> <ref>" @@ -13328,6 +13366,10 @@ msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch stöds inte pÃ¥ denna plattform" #, c-format +msgid "could not parse bundle list key %s with value '%s'" +msgstr "kunde inte tolka listnyckeln %s med värdet \"%s\"" + +#, c-format msgid "bundle list at '%s' has no mode" msgstr "buntlistan pÃ¥ \"%s\" har inget läge" @@ -13338,6 +13380,13 @@ msgid "insufficient capabilities" msgstr "otillräckliga kapabiliteter" #, c-format +msgid "file downloaded from '%s' is not a bundle" +msgstr "filen hämtad frÃ¥n \"%s\" är inte en bunt" + +msgid "failed to store maximum creation token" +msgstr "misslyckades lagra maximal skaparsymbol" + +#, c-format msgid "unrecognized bundle mode from URI '%s'" msgstr "okänt buntlägre frÃ¥n URI:en \"%s\"" @@ -13353,6 +13402,13 @@ msgstr "kunde inte hämta bunt frÃ¥n URI:en \"%s\"" msgid "file at URI '%s' is not a bundle or bundle list" msgstr "filen pÃ¥ URI:en \"%s\" är inte en bunt eller buntlista" +#, c-format +msgid "bundle-uri: unexpected argument: '%s'" +msgstr "bundle-uri: okänt argument: \"%s\"" + +msgid "bundle-uri: expected flush after arguments" +msgstr "bundle-uri: förväntade \"flush\" efter argument" + msgid "bundle-uri: got an empty line" msgstr "bunt-uri: fick en tom rad" @@ -13384,6 +13440,13 @@ msgstr "Arkivet saknar dessa nödvändiga incheckningar:" msgid "need a repository to verify a bundle" msgstr "behöver ett arkiv för att bekräfta en bunt." +msgid "" +"some prerequisite commits exist in the object store, but are not connected " +"to the repository's history" +msgstr "" +"nÃ¥gra förutsättande incheckningar finns i objektkatalogen, men är inte " +"anslutna i arkivets historik" + #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %<PRIuMAX> refs:" @@ -14789,15 +14852,22 @@ msgid "unknown object format '%s' specified by server" msgstr "okänt objektformat \"%s\" angavs av servern" #, c-format +msgid "error on bundle-uri response line %d: %s" +msgstr "fel pÃ¥ bundle-uri-svar rad %d: %s" + +msgid "expected flush after bundle-uri listing" +msgstr "förväntade \"flush\" efter bundle-uri-listan" + +msgid "expected response end packet after ref listing" +msgstr "förväntade svarsavslutningspaket efter ref-listan" + +#, c-format msgid "invalid ls-refs response: %s" msgstr "ogiltigt svar pÃ¥ ls-refs: %s" msgid "expected flush after ref listing" msgstr "förväntade \"flush\" efter ref-listan" -msgid "expected response end packet after ref listing" -msgstr "förväntade svarsavslutningspaket efter ref-listan" - #, c-format msgid "protocol '%s' is not supported" msgstr "protokollet \"%s\" stöds inte" @@ -15945,8 +16015,7 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]" +" [--config-env=<name>=<envvar>] <command> [<args>]" msgstr "" "git [-v | --version] [-h |--help] [-C <sökväg>] [-c <namn>=<värde>]\n" " [--exec-path[=<sökväg>]] [--html-path] [--man-path] [--info-" @@ -15954,8 +16023,7 @@ msgstr "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n" -" [--super-prefix=<sökväg>] [--config-env=<namn>=<miljövar>]\n" -" <kommando> [<flaggor>]" +" [--config-env=<namn>=<miljövar>] <kommando> [<flaggor>]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -15981,10 +16049,6 @@ msgid "no namespace given for --namespace\n" msgstr "ingen namnrymd angavs för --namespace\n" #, c-format -msgid "no prefix given for --super-prefix\n" -msgstr "inget prefix angavs för --super-prefix\n" - -#, c-format msgid "-c expects a configuration string\n" msgstr "-c förväntar en konfigurationssträng\n" @@ -16096,8 +16160,13 @@ msgstr "gpg.ssh.defaultKeyCommand lyckades men gav inga nycklar: %s %s" msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand misslyckades: %s %s" -msgid "gpg failed to sign the data" -msgstr "gpg misslyckades signera data" +#, c-format +msgid "" +"gpg failed to sign the data:\n" +"%s" +msgstr "" +"gpg misslyckades signera data:\n" +"%s" msgid "user.signingKey needs to be set for ssh signing" msgstr "user.signingKey mÃ¥ste anges för ssh-signering" @@ -17229,6 +17298,10 @@ msgid "garbage at end of loose object '%s'" msgstr "skräp i slutet av löst objekt \"%s\"" #, c-format +msgid "unable to open loose object %s" +msgstr "kan inte öppna lösa objekt %s" + +#, c-format msgid "unable to parse %s header" msgstr "kan inte tolka %s-huvud" @@ -17244,18 +17317,14 @@ msgid "header for %s too long, exceeds %d bytes" msgstr "huvudet för %s är för lÃ¥ngt, mer än %d byte" #, c-format -msgid "failed to read object %s" -msgstr "misslyckades läsa objektet %s" +msgid "loose object %s (stored in %s) is corrupt" +msgstr "löst objekt %s (lagrat i %s) är trasigt" #, c-format msgid "replacement %s not found for %s" msgstr "ersättningen %s hittades inte för %s" #, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "löst objekt %s (lagrat i %s) är trasigt" - -#, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "packat objekt %s (lagrat i %s) är trasigt" @@ -17267,9 +17336,6 @@ msgstr "kunde inte skriva filen %s" msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till \"%s\"" -msgid "file write error" -msgstr "fel vid skrivning av fil" - msgid "error when closing loose object file" msgstr "fel vid stängning av fil för löst objekt" @@ -17316,11 +17382,12 @@ msgstr "kunde inte skapa katalogen %s" msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" -msgid "corrupt commit" -msgstr "trasik incheckning" +#, c-format +msgid "object fails fsck: %s" +msgstr "objekt klarar inte fsck: %s" -msgid "corrupt tag" -msgstr "trasig tagg" +msgid "refusing to create malformed object" +msgstr "vägrar skapa ett felaktigt format objekt" #, c-format msgid "read error while indexing %s" @@ -17581,10 +17648,6 @@ msgstr "ogiltigt XOR-offset i bitkarte-packindex" msgid "cannot fstat bitmap file" msgstr "kan inte utföra \"fstat\" pÃ¥ bitkartefil" -#, c-format -msgid "ignoring extra bitmap file: '%s'" -msgstr "ignorerar extra bitkartefil: %s" - msgid "checksum doesn't match in MIDX and bitmap" msgstr "checksumman stämmer inte i MIDX och bitkarta" @@ -17849,6 +17912,9 @@ msgstr "var mer tyst" msgid "use <n> digits to display object names" msgstr "använd <n> siffror för att visa objektnamn" +msgid "prefixed path to initial superproject" +msgstr "inledande sökväg till start-överprojekt" + msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer ska tas bort frÃ¥n meddelande" @@ -18351,6 +18417,14 @@ msgid "ahead %d, behind %d" msgstr "före %d, bakom %d" #, c-format +msgid "%%(%.*s) does not take arguments" +msgstr "%%(%.*s) tar inte argument" + +#, c-format +msgid "unrecognized %%(%.*s) argument: %s" +msgstr "okänt %%(%.*s)-argument: %s" + +#, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" @@ -18367,22 +18441,6 @@ msgid "Integer value expected refname:rstrip=%s" msgstr "Heltalsvärde förväntades refname:rstrip=%s" #, c-format -msgid "unrecognized %%(%s) argument: %s" -msgstr "okänt %%(%s)-argument: %s" - -#, c-format -msgid "%%(objecttype) does not take arguments" -msgstr "%%(objecttype) tar inte argument" - -#, c-format -msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) tar inte argument" - -#, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) tar inte argument" - -#, c-format msgid "expected %%(trailers:key=<value>)" msgstr "förväntade %%(trailers:key=<värde>)" @@ -18399,10 +18457,6 @@ msgid "positive value expected '%s' in %%(%s)" msgstr "positivt värde förväntat \"%s\" i %%(%s)" #, c-format -msgid "unrecognized email option: %s" -msgstr "okänd e-postalternativ: %s" - -#, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" @@ -18415,12 +18469,12 @@ msgid "unrecognized width:%s" msgstr "okänd bredd:%s" #, c-format -msgid "positive width expected with the %%(align) atom" -msgstr "positiv bredd förväntad med atomen %%(align)" +msgid "unrecognized %%(%s) argument: %s" +msgstr "okänt %%(%s)-argument: %s" #, c-format -msgid "%%(rest) does not take arguments" -msgstr "%%(rest) tar inte argument" +msgid "positive width expected with the %%(align) atom" +msgstr "positiv bredd förväntad med atomen %%(align)" #, c-format msgid "malformed field name: %.*s" @@ -19656,6 +19710,22 @@ msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" #, c-format +msgid "'%s' is not a valid label" +msgstr "\"%s\" är inte en giltig etikett" + +#, c-format +msgid "'%s' is not a valid refname" +msgstr "\"%s\" är inte ett giltigt referensnamn" + +#, c-format +msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" +msgstr "update-ref kräver ett fullständigt referensnamn, t.ex refs/heads/%s" + +#, c-format +msgid "invalid command '%.*s'" +msgstr "ogiltigt kommando \"%.*s\"" + +#, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" @@ -20453,6 +20523,16 @@ msgstr "ls-tree returnerade en oväntad returkod %d" msgid "failed to lstat '%s'" msgstr "misslyckades ta status (lstat) pÃ¥ \"%s\"" +msgid "no remote configured to get bundle URIs from" +msgstr "ingen fjärr att hämta bunt-URI:er frÃ¥n inställd" + +#, c-format +msgid "remote '%s' has no configured URL" +msgstr "fjärren \"%s\" har ingen URL konfigurerad" + +msgid "could not get the bundle-uri list" +msgstr "kunde inte hämta bundle-uri-listan" + msgid "test-tool cache-tree <options> (control|prime|update)" msgstr "test-tool cache-tree <flaggor> (control|prime|update)" @@ -20806,6 +20886,12 @@ msgstr "Avbryter." msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" +msgid "bundle-uri operation not supported by protocol" +msgstr "bundle-uri-funktionen stöds inte av protokollet" + +msgid "could not retrieve server-advertised bundle-uri list" +msgstr "kunde inte hämta bundle-uri-listan som servern annonserade" + msgid "too-short tree object" msgstr "trädobjekt för kort" @@ -21540,13 +21626,18 @@ msgstr "Ignorerade filer" #, c-format msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." +"It took %.2f seconds to enumerate untracked files,\n" +"but the results were cached, and subsequent runs may be faster." msgstr "" -"Det tog %.2f sekunder att räkna upp ospÃ¥rade filer. \"status -uno\"\n" -"kan gÃ¥ snabbare, men du mÃ¥ste vara försiktig sÃ¥ du inte glömmer\n" -"lägga till nya filer själv (se \"git help status\")." +"Det tog %.2f sekunder att räkna upp ospÃ¥rade filer,\n" +"men resultaten cachelagrades och senare körningar kan bli snabbare." + +#, c-format +msgid "It took %.2f seconds to enumerate untracked files." +msgstr "Det tog %.2f sekunder att räkna upp ospÃ¥rade filer." + +msgid "See 'git help status' for information on how to improve this." +msgstr "Se \"git help status\" för information om hur du kan förbättra detta." # %s är nästa sträng eller tom. #, c-format @@ -21689,274 +21780,6 @@ msgstr "Du mÃ¥ste köra kommandot frÃ¥n arbetskatalogens toppnivÃ¥." msgid "Unable to determine absolute path of git directory" msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" -#. TRANSLATORS: you can adjust this to align "git add -i" status menu -#, perl-format -msgid "%12s %12s %s" -msgstr "%12s %12s %s" - -#, perl-format -msgid "touched %d path\n" -msgid_plural "touched %d paths\n" -msgstr[0] "rörde %d sökväg\n" -msgstr[1] "rörde %d sökvägar\n" - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging." -msgstr "" -"Om patchen kan appliceras rent kommer det redigerade stycket att\n" -"köas omedelbart." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for stashing." -msgstr "" -"Om patchen kan appliceras rent kommer det redigerade stycket att\n" -"läggas till i \"stash\" omedelbart." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for unstaging." -msgstr "" -"Om patchen kan appliceras rent kommer det redigerade stycket att\n" -"tas bort frÃ¥n kön omedelbart." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for applying." -msgstr "" -"Om patchen kan appliceras rent kommer det redigerade stycket att\n" -"markeras för applicering omedelbart." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding." -msgstr "" -"Om patchen kan appliceras rent kommer det redigerade stycket att\n" -"markeras för kasta omedelbart." - -#, perl-format -msgid "failed to open hunk edit file for writing: %s" -msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s" - -#, perl-format -msgid "" -"---\n" -"To remove '%s' lines, make them ' ' lines (context).\n" -"To remove '%s' lines, delete them.\n" -"Lines starting with %s will be removed.\n" -msgstr "" -"---\n" -"Ta bort \"%s\" rader genom att göra dem \" \"-rader (sammanhang).\n" -"Ta bort \"%s\" rader genom att radera dem.\n" -"Rader som börjar med %s kommer att tas bort.\n" - -#, perl-format -msgid "failed to open hunk edit file for reading: %s" -msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s" - -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this hunk and all later hunks in the file\n" -"d - do not stage this hunk or any of the later hunks in the file" -msgstr "" -"y - köa stycket\n" -"n - köa inte stycket\n" -"q - avsluta; köa inte stycket eller nÃ¥got av de följande\n" -"a - köa stycket och alla följande i filen\n" -"d - köa inte stycket eller nÃ¥got av de följande i filen" - -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file" -msgstr "" -"y - \"stash\":a stycket\n" -"n - \"stash\":a inte stycket\n" -"q - avsluta; \"stash\":a inte stycket eller nÃ¥got av de följande\n" -"a - \"stash\":a stycket och alla följande i filen\n" -"d - \"stash\":a inte stycket eller nÃ¥got av de följande i filen" - -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"a - unstage this hunk and all later hunks in the file\n" -"d - do not unstage this hunk or any of the later hunks in the file" -msgstr "" -"y - ta bort stycket frÃ¥n kön\n" -"n - ta inte bort stycket frÃ¥n kön\n" -"q - avsluta; ta inte bort stycket eller nÃ¥got av de följande frÃ¥n kön\n" -"a - ta bort stycket och alla följande i filen frÃ¥n kön\n" -"d - ta inte bort stycket eller nÃ¥got av de följande i filen frÃ¥n kön" - -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - applicera stycket pÃ¥ indexet\n" -"n - applicera inte stycket pÃ¥ indexet\n" -"q - avsluta; applicera inte stycket eller nÃ¥got av de följande\n" -"a - applicera stycket och alla följande i filen\n" -"d - applicera inte stycket eller nÃ¥got av de följande i filen" - -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - förkasta stycket frÃ¥n arbetskatalogen\n" -"n - förkasta inte stycket frÃ¥n arbetskatalogen\n" -"q - avsluta; förkasta inte stycket eller nÃ¥got av de följande\n" -"a - förkasta stycket och alla följande i filen\n" -"d - förkasta inte stycket eller nÃ¥got av de följande i filen" - -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - förkasta stycket frÃ¥n indexet och arbetskatalogen\n" -"n - förkasta inte stycket frÃ¥n indexet och arbetskatalogen\n" -"q - avsluta; förkasta inte stycket eller nÃ¥got av de följande\n" -"a - förkasta stycket och alla följande i filen\n" -"d - förkasta inte stycket eller nÃ¥got av de följande i filen" - -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - applicera stycket pÃ¥ indexet och arbetskatalogen\n" -"n - applicera inte stycket pÃ¥ indexet och arbetskatalogen\n" -"q - avsluta; applicera inte stycket eller nÃ¥got av de följande\n" -"a - applicera stycket och alla följande i filen\n" -"d - applicera inte stycket eller nÃ¥got av de följande i filen" - -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - applicera stycket pÃ¥ arbetskatalogen\n" -"n - applicera inte stycket pÃ¥ arbetskatalogen\n" -"q - avsluta; applicera inte stycket eller nÃ¥got av de följande\n" -"a - applicera stycket och alla följande i filen\n" -"d - applicera inte stycket eller nÃ¥got av de följande i filen" - -msgid "" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"g - välj ett stycke att gÃ¥ till\n" -"/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n" -"j - lämna stycket obestämt, se nästa obestämda stycke\n" -"J - lämna stycket obestämt, se nästa stycke\n" -"k - lämna stycket obestämt, se föregÃ¥ende obestämda stycke\n" -"K - lämna stycket obestämt, se föregÃ¥ende stycke\n" -"s - dela aktuellt stycke i mindre styckens\n" -"e - redigera aktuellt stycke manuellt\n" -"? - visa hjälp\n" - -msgid "The selected hunks do not apply to the index!\n" -msgstr "Markerade stycken kan inte appliceras pÃ¥ indexet!\n" - -#, perl-format -msgid "ignoring unmerged: %s\n" -msgstr "ignorerar ej sammanslagen: %s\n" - -msgid "No other hunks to goto\n" -msgstr "Inga andra stycken att gÃ¥ till\n" - -#, perl-format -msgid "Invalid number: '%s'\n" -msgstr "Ogiltigt siffervärde: \"%s\"\n" - -#, perl-format -msgid "Sorry, only %d hunk available.\n" -msgid_plural "Sorry, only %d hunks available.\n" -msgstr[0] "Beklagar, det finns bara %d stycke.\n" -msgstr[1] "Beklagar, det finns bara %d stycken.\n" - -msgid "No other hunks to search\n" -msgstr "Inga andra stycken att söka efter\n" - -#, perl-format -msgid "Malformed search regexp %s: %s\n" -msgstr "Felaktigt format pÃ¥ reguljärt sökuttryck %s: %s\n" - -msgid "No hunk matches the given pattern\n" -msgstr "Inga stycken motsvarar givet mönster\n" - -msgid "No previous hunk\n" -msgstr "Inget föregÃ¥ende stycke\n" - -msgid "No next hunk\n" -msgstr "Inget följande stycke\n" - -msgid "Sorry, cannot split this hunk\n" -msgstr "Beklagar, kan inte dela stycket\n" - -#, perl-format -msgid "Split into %d hunk.\n" -msgid_plural "Split into %d hunks.\n" -msgstr[0] "Dela i %d stycke.\n" -msgstr[1] "Dela i %d stycken.\n" - -msgid "Sorry, cannot edit this hunk\n" -msgstr "Beklagar, kan inte redigera stycket\n" - -#. TRANSLATORS: please do not translate the command names -#. 'status', 'update', 'revert', etc. -msgid "" -"status - show paths with changes\n" -"update - add working tree state to the staged set of changes\n" -"revert - revert staged set of changes back to the HEAD version\n" -"patch - pick hunks and update selectively\n" -"diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of " -"changes\n" -msgstr "" -"status - visa sökvägar med ändringar\n" -"update - lägg arbetskatalogens tillstÃ¥nd till köade ändringar\n" -"revert - Ã¥terställ köade ändringar till HEAD-versionen\n" -"patch - välj och uppdatera valda stycken\n" -"diff - visa diff mellan HEAD och index\n" -"add untracked - lägg till innehÃ¥ll i ospÃ¥rade filer till köade ändringar\n" - -msgid "missing --" -msgstr "saknad --" - -#, perl-format -msgid "unknown --patch mode: %s" -msgstr "okänt läge för --patch: %s" - -#, perl-format -msgid "invalid argument %s, expecting --" -msgstr "felaktigt argument %s, förväntar --" - msgid "local zone differs from GMT by a non-minute interval\n" msgstr "lokal zon skiljer sig frÃ¥n GMT med delar av minuter\n" @@ -1,8 +1,8 @@ # Turkish translations for Git # Git Türkçe çevirileri -# Copyright (C) 2020-2022 Emir SARI <emir_sari@icloud.com> +# Copyright (C) 2020-2023 Emir SARI <emir_sari@icloud.com> # This file is distributed under the same license as the Git package. -# Emir SARI <emir_sari@icloud.com>, 2020-2022 +# Emir SARI <emir_sari@icloud.com>, 2020-2023 # # ######################################################### # # Git Türkçe kavramlar dizini / Git Turkish Glossary # @@ -92,8 +92,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Turkish Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-12-07 17:32+0300\n" -"PO-Revision-Date: 2022-12-07 18:00+0300\n" +"POT-Creation-Date: 2023-03-03 11:32+0300\n" +"PO-Revision-Date: 2023-03-03 11:40+0300\n" "Last-Translator: Emir SARI <emir_sari@icloud.com>\n" "Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n" "Language: tr\n" @@ -128,13 +128,13 @@ msgstr "'%s' hazırlanamadı" msgid "could not write index" msgstr "indeks yazılamadı" -#, c-format, perl-format +#, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "%d yol güncellendi\n" msgstr[1] "%d yol güncellendi\n" -#, c-format, perl-format +#, c-format msgid "note: %s is untracked now.\n" msgstr "not: %s artık izlenmiyor.\n" @@ -148,7 +148,7 @@ msgstr "Geri al" msgid "Could not parse HEAD^{tree}" msgstr "HEAD^{tree} ayrıştırılamadı" -#, c-format, perl-format +#, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "%d yol geri alındı\n" @@ -161,7 +161,7 @@ msgstr "Ä°zlenmeyen dosya yok.\n" msgid "Add untracked" msgstr "Ä°zlenmeyenleri ekle" -#, c-format, perl-format +#, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "%d yol eklendi\n" @@ -255,19 +255,19 @@ msgstr "indeks yenilenemedi" msgid "Bye.\n" msgstr "Güle güle.\n" -#, c-format, perl-format +#, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Kip deÄŸiÅŸimi hazırlansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Silme hazırlansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "Ekleme hazırlansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Bu parça hazırlansın mı [y,n,q,a,d%s,?]? " @@ -291,19 +291,19 @@ msgstr "" "a - bu parçayı ve sonraki tüm parçaları hazırla\n" "d - bu parçayı veya sonraki parçalardan herhangi birini hazırlama\n" -#, c-format, perl-format +#, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Kip deÄŸiÅŸimi zulalansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Silme zulalansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Ekleme zulalansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Bu parça zulalansın mı [y,n,q,a,d%s,?]? " @@ -327,19 +327,19 @@ msgstr "" "a - bu parçayı ve sonraki tüm parçaları zulala\n" "d - bu parçayı veya sonraki parçalardan herhangi birini zulalama\n" -#, c-format, perl-format +#, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Kip deÄŸiÅŸimi hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Silme hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Ekleme hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Bu parça hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? " @@ -363,19 +363,19 @@ msgstr "" "a - bu parçayı ve sonraki tüm parçaları hazırlıktan çıkar\n" "d - bu parçayı veya sonraki parçalardan herhangi birini hazırlıktan çıkarma\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Kip deÄŸiÅŸimi indekse uygulansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Silme indekse uygulansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Ekleme indekse uygulansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Bu parça indekse uygulansın mı [y,n,q,a,d%s,?]? " @@ -399,19 +399,19 @@ msgstr "" "a - bu parçayı ve sonraki tüm parçaları uygula\n" "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Kip deÄŸiÅŸimi çalışma aÄŸacından atılsın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Silme çalışma aÄŸacından atılsın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Ekleme çalışma aÄŸacından atılsın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Bu parça çalışma aÄŸacından atılsın mı [y,n,q,a,d%s,?]? " @@ -435,20 +435,20 @@ msgstr "" "a - bu parçayı ve sonraki tüm parçaları at\n" "d - bu parçayı veya sonraki parçalardan herhangi birini atma\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Kip deÄŸiÅŸimi indeksten ve çalışma aÄŸacından atılsın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Silme indeksten ve çalışma aÄŸacından atılsın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "Ekleme indeksten ve çalışma aÄŸacından atılsın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "Bu parça indeksten ve çalışma aÄŸacından atılsın mı [y,n,q,a,d%s,?]? " @@ -465,20 +465,20 @@ msgstr "" "a - bu parçayı ve sonraki tüm parçaları at\n" "d - bu parçayı veya sonraki parçalardan herhangi birini atma\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Kip deÄŸiÅŸimi indekse ve çalışma aÄŸacına uygulansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Silme indekse ve çalışma aÄŸacına uygulansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "Ekleme indekse ve çalışma aÄŸacına uygulansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Bu parça indekse ve çalışma aÄŸacına uygulansın mı [y,n,q,a,d%s,?]? " @@ -495,19 +495,19 @@ msgstr "" "a - bu parçayı ve sonraki tüm parçaları uygula\n" "d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Kip deÄŸiÅŸimi çalışma aÄŸacına uygulansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Silme çalışma aÄŸacına uygulansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "Ekleme çalışma aÄŸacına uygulansın mı [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Bu parça çalışma aÄŸacına uygulansın mı [y,n,q,a,d%s,?]? " @@ -583,8 +583,6 @@ msgstr "" "'%c' satır kaldırmak için onları silin.\n" "%c kaldırılacak.\n" -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -600,20 +598,12 @@ msgstr "parça üstbilgisi ayrıştırılamadı" msgid "'git apply --cached' failed" msgstr "'git apply --cached' baÅŸarısız oldu" -#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -1444,6 +1434,12 @@ msgstr "çalışma dizinindeki .gitattributes'u oku" msgid "report archived files on stderr" msgstr "arÅŸivlenmiÅŸ dosyaları stderr'de raporla" +msgid "time" +msgstr "zaman" + +msgid "set modification time of archive entries" +msgstr "arÅŸiv girdilerinin deÄŸiÅŸtirilme zamanını ayarla" + msgid "set compression level" msgstr "sıkıştırma düzeyini ayarla" @@ -1484,6 +1480,13 @@ msgstr "'%s' biçimi için desteklenmeyen argüman: -%d" msgid "%.*s is not a valid attribute name" msgstr "%.*s geçerli bir öznitelik adı deÄŸil" +msgid "unable to add additional attribute" +msgstr "ek öznitelik eklenemiyor" + +#, c-format +msgid "ignoring overly long attributes line %d" +msgstr "pek uzun öznitelik satırı %d yok sayılıyor" + #, c-format msgid "%s not allowed: %s:%d" msgstr "%s izin verilmiyor: %s:%d" @@ -1496,6 +1499,18 @@ msgstr "" "Gerçek öncü ünlem için '\\!' kullanın." #, c-format +msgid "cannot fstat gitattributes file '%s'" +msgstr "fstat gitattributes dosyası '%s' bulunamıyor" + +#, c-format +msgid "ignoring overly large gitattributes file '%s'" +msgstr "pek büyük gitattributes dosyası '%s' dosyası yok sayılıyor" + +#, c-format +msgid "ignoring overly large gitattributes blob '%s'" +msgstr "pek büyük gitattributes ikili nesnesi '%s' yok sayılıyor" + +#, c-format msgid "Badly quoted content in file '%s': %s" msgstr "'%s' dosyasında hatalı tırnaÄŸa alınmış içerik: %s" @@ -1771,11 +1786,11 @@ msgstr "'%s' altmodülü: altmodül bulunamıyor" #, c-format msgid "" -"You may try updating the submodules using 'git checkout %s && git submodule " -"update --init'" +"You may try updating the submodules using 'git checkout --no-recurse-" +"submodules %s && git submodule update --init'" msgstr "" -"Altmodülleri güncellemeyi 'git checkout %s && git submodule update --init' " -"kullanarak deneyebilirsiniz" +"'git checkout --no-recurse-submodules %s && git submodule update --init' " +"kullanarak altmodülleri güncellemeyi deneyebilirsiniz" #, c-format msgid "submodule '%s': cannot create branch '%s'" @@ -1810,6 +1825,13 @@ msgstr "kaldır: '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "Ä°ndeksi yeniledikten sonra hazırlanmamış deÄŸiÅŸiklikler:" +msgid "" +"the add.interactive.useBuiltin setting has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"add.interactive.useBuiltin ayarı kaldırıldı!\n" +"Ayrıntılar için onun 'git help config' içindeki girdisine bakın." + msgid "Could not read the index" msgstr "Ä°ndeks okunamadı" @@ -2200,6 +2222,9 @@ msgstr "git am [<seçenekler>] (--continue | --skip | --abort)" msgid "run interactively" msgstr "etkileÅŸimli olarak çalıştır" +msgid "bypass pre-applypatch and applypatch-msg hooks" +msgstr "pre-applypatch ve applypatch-msg kancalarını atla" + msgid "historical option -- no-op" msgstr "tarihi seçenek -- no-op" @@ -2342,32 +2367,27 @@ msgstr "git archive: Protokol hatası" msgid "git archive: expected a flush" msgstr "git archive: FloÅŸ bekleniyordu" -msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [<iÅŸleme>]" - msgid "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " -"[<paths>...]" +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{new,bad}=<terim> --term-{old,good}" -"=<terim>] [--no-checkout] [--first-parent] [<kötü> [<iyi>...]] [--] " -"[<yollar>...]" +"git bisect start [--term-{new,bad}=<terim> --term-{old,good}=<terim>] [--" +"no-checkout] [--first-parent] [<kötü> [<iyi>...]] [--] [<yol-blrtç>...]" -msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]" +msgid "git bisect (good|bad) [<rev>...]" +msgstr "git bisect (good|bad) [<rev>...]" -msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]" +msgid "git bisect skip [(<rev>|<range>)...]" +msgstr "git bisect skip [(<rev>|<erim>)...]" -msgid "git bisect--helper --bisect-replay <filename>" -msgstr "git bisect--helper --bisect-replay <dosyaadı>" +msgid "git bisect reset [<commit>]" +msgstr "git bisect reset [<iÅŸleme>]" -msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" -msgstr "git bisect--helper --bisect-skip [(<rev>|<erim>)...]" +msgid "git bisect replay <logfile>" +msgstr "git bisect replay <günlük-dosyası>" -msgid "git bisect--helper --bisect-run <cmd>..." -msgstr "git bisect--helper --bisect-run <komut>..." +msgid "git bisect run <cmd>..." +msgstr "git bisect run <komut>..." #, c-format msgid "cannot open file '%s' in mode '%s'" @@ -2511,9 +2531,6 @@ msgstr "hatalı HEAD - Bana bir HEAD gerek" msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "'%s' çıkış yapımı baÅŸarısız. 'git bisect start <geçerli-dal>' deneyin." -msgid "won't bisect on cg-seek'ed tree" -msgstr "cg-seek yapılmış bir aÄŸaçta ikili arama yapılmayacak" - msgid "bad HEAD - strange symbolic ref" msgstr "hatalı HEAD - tuhaf sembolik baÅŸvuru" @@ -2565,17 +2582,16 @@ msgid "bisect run failed: no command provided." msgstr "ikili arama baÅŸarısız: Komut verilmedi." #, c-format -msgid "unable to verify '%s' on good revision" -msgstr "'%s', iyi revizyonda doÄŸrulanamadı" +msgid "unable to verify %s on good revision" +msgstr "%s, iyi revizyonda doÄŸrulanamıyor" #, c-format msgid "bogus exit code %d for good revision" msgstr "iyi revizyon için anlamsız %d çıkış kodu" #, c-format -msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" -msgstr "" -"bisect çalıştırılamadı: çıkış kodu %d, '%s' konumundan, < 0 veya >= 128" +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" +msgstr "bisect çalıştırılamadı: çıkış kodu %d, %s konumundan, < 0 veya >= 128" #, c-format msgid "cannot open file '%s' for writing" @@ -2584,37 +2600,42 @@ msgstr "'%s' dosyası yazma için açılamadı" msgid "bisect run cannot continue any more" msgstr "ikili arama artık çalışmayı sürdüremiyor" -#, c-format msgid "bisect run success" msgstr "ikili arama baÅŸarılı" -#, c-format msgid "bisect found first bad commit" msgstr "ikili arama ilk hatalı iÅŸlemeyi buldu" #, c-format -msgid "" -"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " -"code %d" -msgstr "" -"ikili arama çalıştırılamadı: 'git bisect--helper --bisect-state %s', %d hata " -"koduyla çıktı" - -msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset bir argüman veya iÅŸleme gerektirmiyor" +msgid "bisect run failed: 'git bisect %s' exited with error code %d" +msgstr "ikili arama çalıştırılamadı: 'git bisect %s', %d hata koduyla çıktı" -msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--bisect-terms 0 veya 1 argüman gerektiriyor" +#, c-format +msgid "'%s' requires either no argument or a commit" +msgstr "'%s', bir argüman veya iÅŸleme gerektirmiyor" -msgid "--bisect-next requires 0 arguments" -msgstr "--bisect-next 0 argüman gerektiriyor" +#, c-format +msgid "'%s' requires 0 or 1 argument" +msgstr "'%s', 0 veya 1 argümanı gerektiriyor" -msgid "--bisect-log requires 0 arguments" -msgstr "--bisect-log 0 argüman gerektiriyor" +#, c-format +msgid "'%s' requires 0 arguments" +msgstr "'%s', 0 argüman gerektiriyor" msgid "no logfile given" msgstr "hiçbir günlük dosyası verilmedi" +#, c-format +msgid "'%s' failed: no command provided." +msgstr "'%s' baÅŸarısız: Komut verilmedi." + +msgid "need a command" +msgstr "bir komut gerekli" + +#, c-format +msgid "unknown command: '%s'" +msgstr "bilinmeyen komut: '%s'" + msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<seçenekler>] [<rev-sçnk>] [<rev>] [--] <dosya>" @@ -2744,7 +2765,7 @@ msgstr[0] "%s dosyasında yalnızca %lu satır var" msgstr[1] "%s dosyasında yalnızca %lu satır var" msgid "Blaming lines" -msgstr "Genel bakış satırları" +msgstr "Satırlara bakılıyor" msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [<seçenekler>] [-r | -a] [--merged] [--no-merged]" @@ -3181,6 +3202,9 @@ msgstr "git bundle list-heads <dosya> [<baÅŸvuru-adı>...]" msgid "git bundle unbundle [--progress] <file> [<refname>...]" msgstr "git bundle unbundle [--progress] <dosya> [<baÅŸvuru-adı>...]" +msgid "need a <file> argument" +msgstr "bir <dosya> argümanı gerekiyor" + msgid "do not show progress meter" msgstr "ilerleme çubuÄŸunu gösterme" @@ -3234,10 +3258,6 @@ msgstr "%s, argümanlar gerektiriyor" msgid "%s takes no arguments" msgstr "%s, bir argüman almıyor" -#, c-format -msgid "unknown command: '%s'" -msgstr "bilinmeyen komut: '%s'" - msgid "only one batch option may be specified" msgstr "yalnızca bir toplu iÅŸ seçeneÄŸi belirtilebilir" @@ -3373,11 +3393,18 @@ msgstr "<nesne>, '-%c' ile gerekiyor" msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "<tür> <nesne> kipinde yalnızca iki argümana izin veriliyor, %d deÄŸil" -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." -msgstr "git check-attr [-a | --all | <öznitelik>...] [--] <yol-adı>..." +msgid "" +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " +"<pathname>..." +msgstr "" +"git check-attr [--source <aÄŸacımsı>] [-a | --all | <öznitelik>...] [--] <yol-" +"adı>..." -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" -msgstr "git check-attr --stdin [-z] [-a | --all | <öznitelik>...]" +msgid "" +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" +msgstr "" +"git check-attr --stdin [-z] [--source <aÄŸacımsı>] [-a | --all | " +"<öznitelik>...]" msgid "report all attributes set on file" msgstr "tüm dosya özniteliklerini bildir" @@ -3391,6 +3418,12 @@ msgstr "dosya adlarını stdin'den oku" msgid "terminate input and output records by a NUL character" msgstr "girdi ve çıktı kayıtlarını bir NUL karakteri ile sonlandır" +msgid "<tree-ish>" +msgstr "<aÄŸacımsı>" + +msgid "which tree-ish to check attributes at" +msgstr "özniteliklerin hangi aÄŸacımsıda denetleneceÄŸi" + msgid "suppress progress reporting" msgstr "ilerleme bildirimini gizle" @@ -3967,7 +4000,7 @@ msgstr "" "* - tüm ögeleri seç\n" " - (boÅŸ) seçimi bitir\n" -#, c-format, perl-format +#, c-format msgid "Huh (%s)?\n" msgstr "Pardon (%s)?\n" @@ -4116,9 +4149,6 @@ msgstr "derinlik" msgid "create a shallow clone of that depth" msgstr "verilen derinlikte sığ bir depo oluÅŸtur" -msgid "time" -msgstr "zaman" - msgid "create a shallow clone since a specific time" msgstr "verilen zamandan sonrasını içeren bir sığ depo oluÅŸtur" @@ -4346,6 +4376,9 @@ msgstr "depo ilklendirilemedi, demet URI'si atlanıyor" msgid "failed to fetch objects from bundle URI '%s'" msgstr "'%s' demet URI'sinden nesneler getirilemedi" +msgid "failed to fetch advertised bundles" +msgstr "tanıtılan demetler alınamadı" + msgid "remote transport reported error" msgstr "uzak konum taşıması hata bildirdi" @@ -5589,29 +5622,6 @@ msgstr "--tool=<araç> için bir <araç> verilmedi" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "--extcmd=<komut> için bir <komut> verilmedi" -msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -msgstr "git env--helper --type=[bool|ulong] <seçenekler> <ortam-dÄŸÅŸkn>" - -msgid "default for git_env_*(...) to fall back on" -msgstr "git_env_*(...)'ın geri çekileceÄŸi öntanımlı" - -msgid "be quiet only use git_env_*() value as exit code" -msgstr "sessiz ol, yalnızca git_env_*() deÄŸerini çıkış kodu olarak kullan" - -#, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "" -"--default seçeneÄŸi, --type=bool ile birlikte bir Boole deÄŸeri bekliyor, '%s' " -"deÄŸil" - -#, c-format -msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not " -"`%s`" -msgstr "" -"--default seçeneÄŸi, --type=ulong ile birlikte bir imzalanmamış uzun deÄŸer " -"bekliyor, '%s' deÄŸil" - msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<revizyon-listesi-seçenekleri>]" @@ -6009,6 +6019,10 @@ msgstr "--deepen içinde negatif derinlik desteklenmiyor" msgid "--unshallow on a complete repository does not make sense" msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor" +#, c-format +msgid "failed to fetch bundles from '%s'" +msgstr "'%s' konumundan demetler getirilemedi" + msgid "fetch --all does not take a repository argument" msgstr "fetch --all bir depo argümanı almıyor" @@ -7028,12 +7042,19 @@ msgstr "kullanım: %s%s" msgid "'git help config' for more information" msgstr "ek bilgi için: 'git help config'" -msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" -msgstr "git hook run [--ignore-missing] <kanca-adı> [-- <kanca-argümanları>]" +msgid "" +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" +"args>]" +msgstr "" +"git hook run [--ignore-missing] [--to-stdin=<yol>] <kanca-adı> [-- <kanca-" +"argümanları>]" msgid "silently ignore missing requested <hook-name>" msgstr "istenen eksik <kanca-adı> sessizce yok sayılıyor" +msgid "file to read into hooks' stdin" +msgstr "kancaların stdin'ine okunacak dosya" + #, c-format msgid "object type mismatch at %s" msgstr "%s konumunda nesne türü uyuÅŸmazlığı" @@ -7856,11 +7877,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" -" [--symref] [<repository> [<refs>...]]" +" [--symref] [<repository> [<patterns>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<yürütülebilir>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<anahtar>]\n" -" [--symref] [<depo> [<baÅŸvurular>...]]" +" [--symref] [<depo> [<dizgiler>...]]" msgid "do not print remote URL" msgstr "uzak konum URL'sini yazdırma" @@ -8104,9 +8125,15 @@ msgstr "birbiriyle iliÅŸkisi olmayan geçmiÅŸlerin birleÅŸtirilmesine izin ver" msgid "perform multiple merges, one per line of input" msgstr "girdi satırı başına bir adet çoklu birleÅŸtirmeler gerçekleÅŸtir" +msgid "specify a merge-base for the merge" +msgstr "birleÅŸtirme için bir birleÅŸtirme temeli belirtilmeli" + msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge, tüm diÄŸer seçeneklerle uyumsuz" +msgid "--merge-base is incompatible with --stdin" +msgstr "--merge-base, --stdin ile uyumsuz" + #, c-format msgid "malformed input line: '%s'." msgstr "hatalı oluÅŸturulmuÅŸ girdi satırı: '%s'." @@ -9985,6 +10012,9 @@ msgstr "" msgid "could not switch to %s" msgstr "ÅŸuraya geçilemedi: %s" +msgid "apply options and merge options cannot be used together" +msgstr "uygulama seçenekleri ve birleÅŸtirme seçenekleri birlikte kullanılamaz" + #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " @@ -10220,8 +10250,19 @@ msgstr "Bilinmeyen kip: %s" msgid "--strategy requires --merge or --interactive" msgstr "--strategy, --merge veya --interactive gerektiriyor" -msgid "apply options and merge options cannot be used together" -msgstr "uygulama seçenekleri ve birleÅŸtirme seçenekleri birlikte kullanılamaz" +msgid "" +"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"autosquash" +msgstr "" +"uygulama seçenekleri, rebase.autosquash ile uyumlu deÄŸil. --no-autosquash " +"eklemeyi düşünün" + +msgid "" +"apply options are incompatible with rebase.updateRefs. Consider adding --no-" +"update-refs" +msgstr "" +"uygulama seçenekleri, rebase.updateRefs ile uyumlu deÄŸil. --no-update-refs " +"eklemeyi düşünün" #, c-format msgid "Unknown rebase backend: %s" @@ -12698,10 +12739,6 @@ msgstr "'%s' geçerli bir altmodül adı deÄŸil" msgid "git submodule--helper <command>" msgstr "git submodule--helper <komut>" -#, c-format -msgid "%s doesn't support --super-prefix" -msgstr "%s, --super-prefix desteklemiyor" - msgid "git symbolic-ref [-m <reason>] <name> <ref>" msgstr "git symbolic-ref [-m <neden>] <ad> <baÅŸvuru>" @@ -13426,6 +13463,10 @@ msgid "core.fsyncMethod = batch is unsupported on this platform" msgstr "core.fsyncMethod = batch, bu platformda desteklenmiyor" #, c-format +msgid "could not parse bundle list key %s with value '%s'" +msgstr "demet liste anahtarı %s ile '%s' deÄŸeri ayrıştırılamıyor" + +#, c-format msgid "bundle list at '%s' has no mode" msgstr "'%s' konumundaki demet listesinin kipi yok" @@ -13436,6 +13477,13 @@ msgid "insufficient capabilities" msgstr "yetersiz yetenekler" #, c-format +msgid "file downloaded from '%s' is not a bundle" +msgstr "'%s' konumundan indirilen dosya bir demet deÄŸil" + +msgid "failed to store maximum creation token" +msgstr "en büyük oluÅŸturma jetonu depolanamadı" + +#, c-format msgid "unrecognized bundle mode from URI '%s'" msgstr "'%s' URI'sinden tanımlanamayan demet kipi" @@ -13451,6 +13499,13 @@ msgstr "'%s' URI'sinden demet indirilemedi" msgid "file at URI '%s' is not a bundle or bundle list" msgstr "'%s' URI'sindeki dosya bir demet veya demet listesi deÄŸil" +#, c-format +msgid "bundle-uri: unexpected argument: '%s'" +msgstr "bundle-uri: beklenmedik argüman: '%s'" + +msgid "bundle-uri: expected flush after arguments" +msgstr "bundle-uri: argümanlardan sonra floÅŸ bekleniyordu" + msgid "bundle-uri: got an empty line" msgstr "bundle-uri: boÅŸ bir satır alındı" @@ -13482,6 +13537,13 @@ msgstr "Depo aÅŸağıdaki önkoÅŸul iÅŸlemelere iye deÄŸil:" msgid "need a repository to verify a bundle" msgstr "bir demeti doÄŸrulamak için bir depo gerekiyor" +msgid "" +"some prerequisite commits exist in the object store, but are not connected " +"to the repository's history" +msgstr "" +"nesne deposunda bazı önkoÅŸul iÅŸlemeleri var; ancak deponun geçmiÅŸine baÄŸlı " +"deÄŸiller" + #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %<PRIuMAX> refs:" @@ -14882,15 +14944,22 @@ msgid "unknown object format '%s' specified by server" msgstr "sunucu tarafından bilinmeyen nesne biçimi '%s' belirtildi" #, c-format +msgid "error on bundle-uri response line %d: %s" +msgstr "bundle-uri %d. yanıt satırında hata: %s" + +msgid "expected flush after bundle-uri listing" +msgstr "bundle-uri listelemesinden sonra floÅŸ bekleniyordu" + +msgid "expected response end packet after ref listing" +msgstr "baÅŸvuru listelemesinden sonra yanıt sonu paketi bekleniyordu" + +#, c-format msgid "invalid ls-refs response: %s" msgstr "geçersiz ls-refs yanıtı: %s" msgid "expected flush after ref listing" msgstr "baÅŸvuru listelemesinden sonra floÅŸ bekleniyordu" -msgid "expected response end packet after ref listing" -msgstr "baÅŸvuru listelemesinden sonra yanıt sonu paketi bekleniyordu" - #, c-format msgid "protocol '%s' is not supported" msgstr "'%s' protokolü desteklenmiyor" @@ -16041,16 +16110,14 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]" +" [--config-env=<name>=<envvar>] <command> [<args>]" msgstr "" "git [-v | --version] [-h | --help] [-C <yol>] [-c <ad>=<deÄŸer>]\n" " [--exec-path[=<yol>]] [--html-path] [--man-path] [--info-path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<yol>] [--work-tree=<yol>] [--namespace=<ad>]\n" -" [--super-prefix=<yol>] [--config-env=<ad>=<çevredeÄŸiÅŸkeni>]\n" -" <komut> [<argümanlar>]" +" [--config-env=<ad>=<çevre-deÄŸiÅŸkeni>] <komut> [<argümanlar>]" msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" @@ -16076,10 +16143,6 @@ msgid "no namespace given for --namespace\n" msgstr "--namespace için ad alanı verilmedi\n" #, c-format -msgid "no prefix given for --super-prefix\n" -msgstr "--super-prefix için önek verilmedi\n" - -#, c-format msgid "-c expects a configuration string\n" msgstr "-c bir yapılandırma dizisi bekliyor\n" @@ -16194,8 +16257,13 @@ msgstr "" msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand baÅŸarısız oldu: %s %s" -msgid "gpg failed to sign the data" -msgstr "gpg veriyi imzalayamadı" +#, c-format +msgid "" +"gpg failed to sign the data:\n" +"%s" +msgstr "" +"gpg veriyi imzalayamadı:\n" +"%s" msgid "user.signingKey needs to be set for ssh signing" msgstr "user.signingKey'in ssh imzalaması için ayarlanması gerekiyor" @@ -17336,6 +17404,10 @@ msgid "garbage at end of loose object '%s'" msgstr "gevÅŸek nesne '%s' sonunda anlamsız veri" #, c-format +msgid "unable to open loose object %s" +msgstr "gevÅŸek nesne %s açılamıyor" + +#, c-format msgid "unable to parse %s header" msgstr "%s üstbilgisi ayrıştırılamıyor" @@ -17351,18 +17423,14 @@ msgid "header for %s too long, exceeds %d bytes" msgstr "%s üstbilgisi pek uzun, %d bayt'ı aşıyor" #, c-format -msgid "failed to read object %s" -msgstr "%s nesnesi okunamadı" +msgid "loose object %s (stored in %s) is corrupt" +msgstr "%s gevÅŸek nesnesi (%s içinde depolanıyor) hasarlı" #, c-format msgid "replacement %s not found for %s" msgstr "%s yedeÄŸi %s için bulunamadı" #, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "%s gevÅŸek nesnesi (%s içinde depolanıyor) hasarlı" - -#, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "paketlenmiÅŸ nesne %s (%s içinde depolanıyor) hasarlı" @@ -17374,9 +17442,6 @@ msgstr "%s dosyası yazılamıyor" msgid "unable to set permission to '%s'" msgstr "'%s' ögesine izin ayarlanamıyor" -msgid "file write error" -msgstr "dosya yazım hatası" - msgid "error when closing loose object file" msgstr "gevÅŸek nesne dosyası kapatılırken hata" @@ -17422,11 +17487,12 @@ msgstr "%s dizini oluÅŸturulamıyor" msgid "cannot read object for %s" msgstr "%s için nesne okunamıyor" -msgid "corrupt commit" -msgstr "hasarlı iÅŸleme" +#, c-format +msgid "object fails fsck: %s" +msgstr "nesne fsck'yi baÅŸarısız ediyor: %s" -msgid "corrupt tag" -msgstr "hasarlı etiket" +msgid "refusing to create malformed object" +msgstr "hatalı oluÅŸturulmuÅŸ nesne oluÅŸturma reddediliyor" #, c-format msgid "read error while indexing %s" @@ -17690,10 +17756,6 @@ msgstr "biteÅŸlem paket indeksinde geçersi XOR ofseti" msgid "cannot fstat bitmap file" msgstr "biteÅŸlem dosyası fstat yapılamıyor" -#, c-format -msgid "ignoring extra bitmap file: '%s'" -msgstr "ek biteÅŸlem dosyası yok sayılıyor: '%s'" - msgid "checksum doesn't match in MIDX and bitmap" msgstr "saÄŸlama toplamı, MIDX ve biteÅŸlem içinde uymuyor" @@ -17956,6 +18018,9 @@ msgstr "daha sessiz ol" msgid "use <n> digits to display object names" msgstr "nesne adlarını görüntülemek için <n> basamak kullan" +msgid "prefixed path to initial superproject" +msgstr "yol, ilk üst projeye öneklendi" + msgid "how to strip spaces and #comments from message" msgstr "iletiden boÅŸlukları ve #yorumları çıkart" @@ -18448,6 +18513,14 @@ msgid "ahead %d, behind %d" msgstr "%d önünde, %d arkasında" #, c-format +msgid "%%(%.*s) does not take arguments" +msgstr "%%(%.*s) argüman almıyor" + +#, c-format +msgid "unrecognized %%(%.*s) argument: %s" +msgstr "tanımlanamayan %%(%.*s) argümanı: %s" + +#, c-format msgid "expected format: %%(color:<color>)" msgstr "beklenen biçim: %%(color:<renk>)" @@ -18464,22 +18537,6 @@ msgid "Integer value expected refname:rstrip=%s" msgstr "Tamsayı deÄŸeri ÅŸunu bekliyordu: refname:rstrip=%s" #, c-format -msgid "unrecognized %%(%s) argument: %s" -msgstr "tanımlanamayan %%(%s) argümanı: %s" - -#, c-format -msgid "%%(objecttype) does not take arguments" -msgstr "%%(objecttype) argüman almıyor" - -#, c-format -msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) argüman almıyor" - -#, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) argüman almıyor" - -#, c-format msgid "expected %%(trailers:key=<value>)" msgstr "%%(trailers:key=<deÄŸer>) bekleniyordu" @@ -18496,10 +18553,6 @@ msgid "positive value expected '%s' in %%(%s)" msgstr "pozitif deÄŸer ÅŸurada '%s' bekliyordu: %%(%s)" #, c-format -msgid "unrecognized email option: %s" -msgstr "tanımlanamayan e-posta seçeneÄŸi: %s" - -#, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "beklenen biçim: %%(align:<geniÅŸlik>,<konum>)" @@ -18512,12 +18565,12 @@ msgid "unrecognized width:%s" msgstr "tanımlanamayan geniÅŸlik:%s" #, c-format -msgid "positive width expected with the %%(align) atom" -msgstr "pozitif geniÅŸlik %%(align) ögeciÄŸi ile birlikte bekleniyordu" +msgid "unrecognized %%(%s) argument: %s" +msgstr "tanımlanamayan %%(%s) argümanı: %s" #, c-format -msgid "%%(rest) does not take arguments" -msgstr "%%(rest) argüman almıyor" +msgid "positive width expected with the %%(align) atom" +msgstr "pozitif geniÅŸlik %%(align) ögeciÄŸi ile birlikte bekleniyordu" #, c-format msgid "malformed field name: %.*s" @@ -19755,6 +19808,23 @@ msgid "git %s: failed to refresh the index" msgstr "git %s: indeks yenilenemedi" #, c-format +msgid "'%s' is not a valid label" +msgstr "'%s', geçerli bir etiket deÄŸil" + +#, c-format +msgid "'%s' is not a valid refname" +msgstr "'%s', geçerli bir baÅŸvuru adı deÄŸil" + +#, c-format +msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" +msgstr "" +"update-ref, tümüyle kalifiye bir baÅŸvuru adı gerektiriyor; örn. refs/heads/%s" + +#, c-format +msgid "invalid command '%.*s'" +msgstr "geçersiz komut %.*s" + +#, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s argüman kabul etmiyor: '%s'" @@ -20549,6 +20619,16 @@ msgstr "ls-tree beklenmedik bir biçimde %d kodu ile çıktı" msgid "failed to lstat '%s'" msgstr "'%s', lstat yapılamadı" +msgid "no remote configured to get bundle URIs from" +msgstr "demet URI'lerini almak için bir uzak konum yapılandırılmamış" + +#, c-format +msgid "remote '%s' has no configured URL" +msgstr "'%s' uzak konumunun yapılandırılmış bir URL'si yok" + +msgid "could not get the bundle-uri list" +msgstr "bundle-uri listesi alınamadı" + msgid "test-tool cache-tree <options> (control|prime|update)" msgstr "test-tool cache-tree <seçenekler> (control|prime|update)" @@ -20900,6 +20980,12 @@ msgstr "Ä°ptal ediliyor." msgid "failed to push all needed submodules" msgstr "gereken tüm altmodüller itilemedi" +msgid "bundle-uri operation not supported by protocol" +msgstr "bundle-uri iÅŸlemi protokol tarafından desteklenmiyor" + +msgid "could not retrieve server-advertised bundle-uri list" +msgstr "sunucu tarafından tanıtılan bundle-uri listesi alınamadı" + msgid "too-short tree object" msgstr "aÄŸaç nesnesi çok kısa" @@ -21629,13 +21715,18 @@ msgstr "Yok sayılan dosyalar" #, c-format msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." +"It took %.2f seconds to enumerate untracked files,\n" +"but the results were cached, and subsequent runs may be faster." msgstr "" -"Ä°zlenmeyen dosyaların ortaya dökülmesi %.2f saniye sürdü. 'status -uno'\n" -"bunu hızlandırabilir; ancak yeni dosyaları eklemeyi unutmamanız\n" -"konusunda dikkatli olmalısınız (ek bilgi için 'git help status')." +"Ä°zlenmeyen dosyaları ortaya dökme %.2f saniye sürdü;\n" +"ancak sonuçlar önbelleÄŸe alındı ve sonrakiler daha hızlı olabilir." + +#, c-format +msgid "It took %.2f seconds to enumerate untracked files." +msgstr "Ä°zlenmeyen dosyaları ortaya dökme %.2f saniye sürdü." + +msgid "See 'git help status' for information on how to improve this." +msgstr "Bunu iyileÅŸtirme üzerine bilgi için 'git help status'a bakın." #, c-format msgid "Untracked files not listed%s" @@ -21650,7 +21741,8 @@ msgstr "DeÄŸiÅŸiklik yok" #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -"Ä°ÅŸlemeye eklenen deÄŸiÅŸiklik yok (\"git add\" ve/veya \"git commit -a\" kullanın)\n" +"Ä°ÅŸlemeye eklenen deÄŸiÅŸiklik yok (\"git add\" ve/veya \"git commit -a\" " +"kullanın)\n" #, c-format msgid "no changes added to commit\n" @@ -21778,275 +21870,6 @@ msgstr "Bu komutu çalışma aÄŸacının en üst düzeyinden çalıştırmanız msgid "Unable to determine absolute path of git directory" msgstr "Git dizininin kesin yolu algılanamıyor" -#. TRANSLATORS: you can adjust this to align "git add -i" status menu -#, perl-format -msgid "%12s %12s %s" -msgstr "%12s %12s %s" - -#, perl-format -msgid "touched %d path\n" -msgid_plural "touched %d paths\n" -msgstr[0] "%d yola dokunuldu\n" -msgstr[1] "%d yola dokunuldu\n" - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging." -msgstr "" -"EÄŸer yama sorunsuzca uygulanırsa düzenlenen parça derhal hazırlama\n" -"için imlenecektir." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for stashing." -msgstr "" -"EÄŸer yama sorunsuzca uygulanırsa düzenlenen parça derhal zulalama\n" -"için imlenecektir." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for unstaging." -msgstr "" -"EÄŸer yama sorunsuzca uygulanırsa, düzenlenen parça derhal hazırlıktan\n" -"çıkarılma için imlenecektir." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for applying." -msgstr "" -"EÄŸer yama sorunsuzca uygulanırsa düzenlenen parça derhal uygulama\n" -"için imlenecektir." - -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding." -msgstr "" -"EÄŸer yama sorunsuzca uygulanırsa düzenlenen parça derhal ıskartaya\n" -"çıkarım için imlenecektir." - -#, perl-format -msgid "failed to open hunk edit file for writing: %s" -msgstr "parça düzenleme dosyası yazım için açılamadı: %s" - -#, perl-format -msgid "" -"---\n" -"To remove '%s' lines, make them ' ' lines (context).\n" -"To remove '%s' lines, delete them.\n" -"Lines starting with %s will be removed.\n" -msgstr "" -"---\n" -"'%s' satır kaldırmak için onları ' ' satır yapın (baÄŸlam).\n" -"'%s' satır kaldırmak için onları silin.\n" -"%s ile baÅŸlayan satırlar kaldırılacaktır.\n" - -#, perl-format -msgid "failed to open hunk edit file for reading: %s" -msgstr "parça düzenleme dosyası okuma için açılamadı: %s" - -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this hunk and all later hunks in the file\n" -"d - do not stage this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı hazırla\n" -"n - bu parçayı hazırlama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini hazırlama\n" -"a - bu parçayı ve sonraki tüm parçaları hazırla\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlama" - -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı zulala\n" -"n - bu parçayı zulalama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini zulalama\n" -"a - bu parçayı ve sonraki tüm parçaları zulala\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini zulalama" - -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"a - unstage this hunk and all later hunks in the file\n" -"d - do not unstage this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı hazırlıktan çıkar\n" -"n - bu parçayı hazırlıktan çıkarma\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini hazırlıktan çıkarma\n" -"a - bu parçayı ve sonraki tüm parçaları hazırlıktan çıkar\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlıktan çıkarma" - -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı indekse uygula\n" -"n - bu parçayı indekse uygulama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n" -"a - bu parçayı ve sonraki tüm parçaları uygula\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama" - -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı çalışma aÄŸacından at\n" -"n - bu parçayı çalışma aÄŸacından atma\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini atma\n" -"a - bu parçayı ve sonraki tüm parçaları at\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini atma" - -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı çalışma aÄŸacından ve indeksten at\n" -"n - bu parçayı çalışma aÄŸacından ve indeksten atma\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini atma\n" -"a - bu parçayı ve sonraki tüm parçaları at\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini atma" - -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı indekse ve çalışma aÄŸacına uygula\n" -"n - bu parçayı indekse ve çalışma aÄŸacına uygulama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n" -"a - bu parçayı ve sonraki tüm parçaları uygula\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama" - -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - bu parçayı çalışma aÄŸacına uygula\n" -"n - bu parçayı çalışma aÄŸacına uygulama\n" -"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n" -"a - bu parçayı ve sonraki tüm parçaları uygula\n" -"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama" - -msgid "" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"g - gidilecek bir parça seç\n" -"/ - verilen düzenli ifade ile eÅŸleÅŸen bir parça ara\n" -"j - bu parça için sonra karar ver, bir sonraki karar verilmemiÅŸ parçayı gör\n" -"J - bu parça için sonra karar ver, bir sonraki parçayı gör\n" -"k - bu parça için sonra karar ver, bir önceki karar verilmemiÅŸ parçayı gör\n" -"K - bu parça için sonra karar ver, bir önceki parçayı gör\n" -"s - geçerli parçayı daha ufak parçalara böl\n" -"e - geçerli parçayı el ile düzenle\n" -"? - yardımı yazdır\n" - -msgid "The selected hunks do not apply to the index!\n" -msgstr "Seçili parçalar indekse uygulanamıyor!\n" - -#, perl-format -msgid "ignoring unmerged: %s\n" -msgstr "birleÅŸtirilmeyenler yok sayılıyor: %s\n" - -msgid "No other hunks to goto\n" -msgstr "Gidilecek baÅŸka parça yok\n" - -#, perl-format -msgid "Invalid number: '%s'\n" -msgstr "Geçersiz sayı: '%s'\n" - -#, perl-format -msgid "Sorry, only %d hunk available.\n" -msgid_plural "Sorry, only %d hunks available.\n" -msgstr[0] "Ãœzgünüm, yalnızca %d parça kullanılabilir.\n" -msgstr[1] "Ãœzgünüm, yalnızca %d parça kullanılabilir.\n" - -msgid "No other hunks to search\n" -msgstr "Aranacak baÅŸka parça yok\n" - -#, perl-format -msgid "Malformed search regexp %s: %s\n" -msgstr "Hatalı oluÅŸturulmuÅŸ arama düzenli ifadesi %s: %s\n" - -msgid "No hunk matches the given pattern\n" -msgstr "Verilen dizgi ile hiçbir parça eÅŸleÅŸmiyor\n" - -msgid "No previous hunk\n" -msgstr "Öncesinde parça yok\n" - -msgid "No next hunk\n" -msgstr "Sonrasında parça yok\n" - -msgid "Sorry, cannot split this hunk\n" -msgstr "Ãœzgünüm, bu parça bölünemiyor\n" - -#, perl-format -msgid "Split into %d hunk.\n" -msgid_plural "Split into %d hunks.\n" -msgstr[0] "%d parçaya bölündü.\n" -msgstr[1] "%d parçaya bölündü.\n" - -msgid "Sorry, cannot edit this hunk\n" -msgstr "Ãœzgünüm, bu parça düzenlenemiyor\n" - -#. TRANSLATORS: please do not translate the command names -#. 'status', 'update', 'revert', etc. -msgid "" -"status - show paths with changes\n" -"update - add working tree state to the staged set of changes\n" -"revert - revert staged set of changes back to the HEAD version\n" -"patch - pick hunks and update selectively\n" -"diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of " -"changes\n" -msgstr "" -"status - deÄŸiÅŸiklik içeren yolları göster\n" -"update - çalışma aÄŸacı durumunu hazırlanan deÄŸiÅŸiklik setine ekle\n" -"revert - hazırlanan deÄŸiÅŸiklik setini HEAD sürümüne geri al\n" -"patch - parçaları seç ve seçici olarak güncelle\n" -"diff - HEAD ve indeks arasındaki diff'i (ayrımları) görüntüle\n" -"add untracked - izlenmeyen dosyaların içeriÄŸini hazırlanan deÄŸiÅŸiklik setine " -"ekle\n" - -msgid "missing --" -msgstr "-- eksik" - -#, perl-format -msgid "unknown --patch mode: %s" -msgstr "bilinmeyen --patch kipi: %s" - -#, perl-format -msgid "invalid argument %s, expecting --" -msgstr "geçersiz argüman %s, -- bekleniyor" - msgid "local zone differs from GMT by a non-minute interval\n" msgstr "yerel dilim GMT'den bir dakikadan az bir aralıkla ayrımlı\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 1a0026a7dc..2b88f9b781 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -139,14 +139,14 @@ # upstream | 上游 # upstream branch | 上游分支 # working tree | 工作区 -# Fangyi Zhou <me@fangyi.io>, 2021-2022. +# Fangyi Zhou <me@fangyi.io>, 2021-2023. # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-12-01 14:04+0000\n" -"PO-Revision-Date: 2022-12-01 14:17+0000\n" +"POT-Creation-Date: 2023-03-07 23:37+0000\n" +"PO-Revision-Date: 2023-03-07 23:40+0000\n" "Last-Translator: Fangyi Zhou <me@fangyi.io>\n" "Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n" "Language: zh_CN\n" @@ -165,19 +165,19 @@ msgstr "嗯（%s）？" msgid "could not read index" msgstr "ä¸èƒ½è¯»å–索引" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "binary" msgstr "二进制" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "nothing" msgstr "æ— " -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "unchanged" msgstr "没有修改" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Update" msgstr "æ›´æ–°" @@ -190,15 +190,15 @@ msgstr "ä¸èƒ½æš‚å˜ '%s'" msgid "could not write index" msgstr "ä¸èƒ½å†™å…¥ç´¢å¼•" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "更新了 %d 个路径\n" msgstr[1] "更新了 %d 个路径\n" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "note: %s is untracked now.\n" msgstr "说明：%s 现已æˆä¸ºæœªè·Ÿè¸ªçš„。\n" @@ -207,7 +207,7 @@ msgstr "说明：%s 现已æˆä¸ºæœªè·Ÿè¸ªçš„。\n" msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' çš„ make_cache_entry æ“作失败" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Revert" msgstr "还原" @@ -215,24 +215,24 @@ msgstr "还原" msgid "Could not parse HEAD^{tree}" msgstr "ä¸èƒ½è§£æž HEAD^{tree}" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "还原了 %d 个路径\n" msgstr[1] "还原了 %d 个路径\n" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c #, c-format msgid "No untracked files.\n" msgstr "没有未跟踪的文件。\n" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Add untracked" msgstr "æ·»åŠ æœªè·Ÿè¸ªçš„" -#: add-interactive.c git-add--interactive.perl -#, c-format, perl-format +#: add-interactive.c +#, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "å¢žåŠ äº† %d 个路径\n" @@ -243,21 +243,21 @@ msgstr[1] "å¢žåŠ äº† %d 个路径\n" msgid "ignoring unmerged: %s" msgstr "忽略未åˆå…¥çš„：%s" -#: add-interactive.c add-patch.c git-add--interactive.perl +#: add-interactive.c add-patch.c #, c-format msgid "Only binary files changed.\n" msgstr "åªæœ‰äºŒè¿›åˆ¶æ–‡ä»¶è¢«ä¿®æ”¹ã€‚\n" -#: add-interactive.c add-patch.c git-add--interactive.perl +#: add-interactive.c add-patch.c #, c-format msgid "No changes.\n" msgstr "没有修改。\n" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Patch update" msgstr "è¡¥ä¸æ›´æ–°" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "Review diff" msgstr "检视 diff" @@ -325,25 +325,25 @@ msgstr "选择一个编å·æ¡ç›®" msgid "(empty) select nothing" msgstr "（空）ä¸é€‰æ‹©ä»»ä½•å†…容" -#: add-interactive.c builtin/clean.c git-add--interactive.perl +#: add-interactive.c builtin/clean.c msgid "*** Commands ***" msgstr "*** 命令 ***" -#: add-interactive.c builtin/clean.c git-add--interactive.perl +#: add-interactive.c builtin/clean.c msgid "What now" msgstr "请选择" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "staged" msgstr "缓å˜" -#: add-interactive.c git-add--interactive.perl +#: add-interactive.c msgid "unstaged" msgstr "未缓å˜" #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c -#: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c -#: builtin/submodule--helper.c git-add--interactive.perl +#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c +#: builtin/pull.c builtin/submodule--helper.c msgid "path" msgstr "路径" @@ -351,28 +351,28 @@ msgstr "路径" msgid "could not refresh index" msgstr "ä¸èƒ½åˆ·æ–°ç´¢å¼•" -#: add-interactive.c builtin/clean.c git-add--interactive.perl +#: add-interactive.c builtin/clean.c #, c-format msgid "Bye.\n" msgstr "å†è§ã€‚\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "æš‚å˜æ¨¡å¼å˜æ›´ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "æš‚å˜åˆ 除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "æš‚å˜æ·»åŠ 动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "æš‚å˜è¯¥å— [y,n,q,a,d%s,?]? " @@ -396,23 +396,23 @@ msgstr "" "a - æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "è´®è—模å¼å˜æ›´ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "è´®è—åˆ é™¤åŠ¨ä½œ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "è´®è—æ·»åŠ åŠ¨ä½œ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "è´®è—è¯¥å— [y,n,q,a,d%s,?]? " @@ -436,23 +436,23 @@ msgstr "" "a - è´®è—该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è´®è—该å—和本文件ä¸åŽé¢çš„全部å—\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "å–消暂å˜æ¨¡å¼å˜æ›´ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "å–消暂å˜åˆ 除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "å–消暂å˜æ·»åŠ 动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "å–消暂å˜è¯¥å— [y,n,q,a,d%s,?]? " @@ -476,23 +476,23 @@ msgstr "" "a - å–消暂å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦å–消暂å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "将模å¼å˜æ›´åº”用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "å°†åˆ é™¤æ“作应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "å°†æ·»åŠ æ“作应用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "将该å—应用到索引 [y,n,q,a,d%s,?]? " @@ -516,23 +516,23 @@ msgstr "" "a - 应用该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦åº”用该å—和本文件ä¸åŽé¢çš„全部å—\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区ä¸ä¸¢å¼ƒæ¨¡å¼å˜æ›´ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区ä¸ä¸¢å¼ƒåˆ 除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区ä¸ä¸¢å¼ƒæ·»åŠ 动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区ä¸ä¸¢å¼ƒè¯¥å— [y,n,q,a,d%s,?]? " @@ -556,23 +556,23 @@ msgstr "" "a - 丢弃该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦ä¸¢å¼ƒè¯¥å—和本文件ä¸åŽé¢çš„全部å—\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区ä¸ä¸¢å¼ƒæ¨¡å¼å˜æ›´ [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区ä¸ä¸¢å¼ƒåˆ 除动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区ä¸ä¸¢å¼ƒæ·»åŠ 动作 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区ä¸ä¸¢å¼ƒè¯¥å— [y,n,q,a,d%s,?]? " @@ -590,23 +590,23 @@ msgstr "" "a - 丢弃该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦ä¸¢å¼ƒè¯¥å—和本文件ä¸åŽé¢çš„全部å—\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "将模å¼å˜æ›´åº”用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "å°†åˆ é™¤æ“作应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "å°†æ·»åŠ æ“作应用到索引和工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "将该å—应用到索引和工作区 [y,n,q,a,d%s,?]? " @@ -624,23 +624,23 @@ msgstr "" "a - 应用该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦åº”用该å—和本文件ä¸åŽé¢çš„全部å—\n" -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "将模å¼å˜æ›´åº”用到工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "å°†åˆ é™¤æ“作应用到工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "å°†æ·»åŠ æ“作应用到工作区 [y,n,q,a,d%s,?]? " -#: add-patch.c git-add--interactive.perl -#, c-format, perl-format +#: add-patch.c +#, c-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "将该å—应用到工作区 [y,n,q,a,d%s,?]? " @@ -708,7 +708,7 @@ msgstr "" "\tä¸æ˜¯ç»“尾于：\n" "%.*s" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动å—ç¼–è¾‘æ¨¡å¼ -- 查看底部的快速指å—。\n" @@ -725,9 +725,7 @@ msgstr "" "è¦åˆ 除 '%c' å¼€å§‹çš„è¡Œï¼Œåˆ é™¤å®ƒä»¬ã€‚\n" "以 %c å¼€å§‹çš„è¡Œå°†è¢«åˆ é™¤ã€‚\n" -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -744,21 +742,13 @@ msgstr "æ— æ³•è§£æžæ•°æ®å—头信æ¯" msgid "'git apply --cached' failed" msgstr "'git apply --cached' 失败" -#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑å—ä¸èƒ½è¢«åº”用。é‡æ–°ç¼–辑（选择 \"no\" 丢弃ï¼ï¼‰ [y/n]? " @@ -767,11 +757,11 @@ msgstr "您的编辑å—ä¸èƒ½è¢«åº”用。é‡æ–°ç¼–辑（选择 \"no\" 丢弃ï¼ï msgid "The selected hunks do not apply to the index!" msgstr "选ä¸çš„å—ä¸èƒ½åº”用到索引ï¼" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "Apply them to the worktree anyway? " msgstr "æ— è®ºå¦‚ä½•éƒ½è¦åº”用到工作区么？" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "Nothing was applied.\n" msgstr "未应用。\n" @@ -809,11 +799,11 @@ msgstr "没有下一个å—" msgid "No other hunks to goto" msgstr "没有其它å¯ä¾›è·³è½¬çš„å—" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "go to which hunk (<ret> to see more)? " msgstr "跳转到哪个å—（<回车> 查看更多）？ " -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "go to which hunk? " msgstr "跳转到哪个å—？" @@ -833,7 +823,7 @@ msgstr[1] "对ä¸èµ·ï¼Œåªæœ‰ %d 个å¯ç”¨å—。" msgid "No other hunks to search" msgstr "没有其它å¯ä¾›æŸ¥æ‰¾çš„å—" -#: add-patch.c git-add--interactive.perl +#: add-patch.c msgid "search for regex? " msgstr "使用æ£åˆ™è¡¨è¾¾å¼æœç´¢ï¼Ÿ" @@ -1413,7 +1403,7 @@ msgstr "ä¸èƒ½ä¸ºæ–°å»ºæ–‡ä»¶ %s 创建åŽç«¯å˜å‚¨" msgid "unable to add cache entry for %s" msgstr "æ— æ³•ä¸º %s æ·»åŠ ç¼“å˜æ¡ç›®" -#: apply.c builtin/bisect--helper.c builtin/gc.c +#: apply.c builtin/bisect.c builtin/gc.c #, c-format msgid "failed to write to '%s'" msgstr "æ— æ³•å†™å…¥ '%s'" @@ -1748,7 +1738,7 @@ msgstr "æ ¼å¼" msgid "archive format" msgstr "å½’æ¡£æ ¼å¼" -#: archive.c builtin/log.c +#: archive.c builtin/log.c parse-options.h msgid "prefix" msgstr "å‰ç¼€" @@ -1782,6 +1772,15 @@ msgstr "读å–工作区ä¸çš„ .gitattributes" msgid "report archived files on stderr" msgstr "åœ¨æ ‡å‡†é”™è¯¯ä¸ŠæŠ¥å‘Šå½’æ¡£æ–‡ä»¶" +#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pull.c +msgid "time" +msgstr "时间" + +#: archive.c +msgid "set modification time of archive entries" +msgstr "设置归档æ¡ç›®çš„修改时间" + #: archive.c msgid "set compression level" msgstr "设置压缩级别" @@ -1838,6 +1837,15 @@ msgid "%.*s is not a valid attribute name" msgstr "%.*s ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„属性å" #: attr.c +msgid "unable to add additional attribute" +msgstr "ä¸èƒ½æ·»åŠ é¢å¤–属性" + +#: attr.c +#, c-format +msgid "ignoring overly long attributes line %d" +msgstr "忽略过长的属性行 %d" + +#: attr.c #, c-format msgid "%s not allowed: %s:%d" msgstr "ä¸å…许 %s：%s:%d" @@ -1850,6 +1858,21 @@ msgstr "" "负值模版在 git attributes ä¸è¢«å¿½ç•¥\n" "当å—符串确实è¦ä»¥æ„Ÿå¹å·å¼€å§‹æ—¶ï¼Œä½¿ç”¨ '\\!'。" +#: attr.c +#, c-format +msgid "cannot fstat gitattributes file '%s'" +msgstr "æ— æ³• fstat gitattributes 文件 '%s'" + +#: attr.c +#, c-format +msgid "ignoring overly large gitattributes file '%s'" +msgstr "忽略过大的 gitattributes 文件 '%s'" + +#: attr.c +#, c-format +msgid "ignoring overly large gitattributes blob '%s'" +msgstr "忽略过大的 gitattributes æ•°æ®å¯¹è±¡ '%s'" + #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" @@ -1982,8 +2005,8 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse å’Œ --first-parent 共用，需è¦æŒ‡å®šæœ€æ–°çš„æ交" #: blame.c builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c -#: ref-filter.c remote.c sequencer.c submodule.c +#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c ref-filter.c +#: remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "版本é历åˆå§‹åŒ–失败" @@ -2161,10 +2184,11 @@ msgstr "å模组 '%s'ï¼šæ— æ³•æ‰¾åˆ°å模组" #: branch.c #, c-format msgid "" -"You may try updating the submodules using 'git checkout %s && git submodule " -"update --init'" +"You may try updating the submodules using 'git checkout --no-recurse-" +"submodules %s && git submodule update --init'" msgstr "" -"ä½ å¯ä»¥ç”¨ 'git checkout %s && git submodule update --init' æ¥å°è¯•æ›´æ–°å模组" +"ä½ å¯ä»¥ç”¨ 'git checkout --no-recurse-submodules %s && git submodule update --" +"init' æ¥å°è¯•æ›´æ–°å模组" #: branch.c #, c-format @@ -2208,6 +2232,14 @@ msgstr "åˆ é™¤ '%s'\n" msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之åŽå°šæœªè¢«æš‚å˜çš„å˜æ›´ï¼š" +#: builtin/add.c +msgid "" +"the add.interactive.useBuiltin setting has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"设置 add.interactive.useBuiltin å·²ç»è¢«ç§»é™¤ï¼\n" +"查看 'git help config' ä¸çš„相关æ¡ç›®ä»¥èŽ·å–更多信æ¯ã€‚" + #: builtin/add.c builtin/rev-parse.c msgid "Could not read the index" msgstr "ä¸èƒ½è¯»å–索引" @@ -2659,7 +2691,7 @@ msgid "" "Not rewinding to ORIG_HEAD" msgstr "您好åƒåœ¨ä¸Šä¸€æ¬¡ 'am' 失败åŽç§»åŠ¨äº† HEAD。未回退至 ORIG_HEAD" -#: builtin/am.c builtin/bisect--helper.c worktree.c +#: builtin/am.c builtin/bisect.c worktree.c #, c-format msgid "failed to read '%s'" msgstr "æ— æ³•è¯»å– '%s'" @@ -2682,6 +2714,10 @@ msgid "run interactively" msgstr "以交互å¼æ–¹å¼è¿è¡Œ" #: builtin/am.c +msgid "bypass pre-applypatch and applypatch-msg hooks" +msgstr "绕过 pre-applypatch å’Œ applypatch-msg é’©å" + +#: builtin/am.c msgid "historical option -- no-op" msgstr "è€çš„å‚æ•° —— æ— ä½œç”¨" @@ -2870,110 +2906,105 @@ msgstr "git archive：å议错误" msgid "git archive: expected a flush" msgstr "git archive：应有一个 flush 包" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-reset [<æ交>]" - -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "" -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " -"[<paths>...]" +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-" +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{new,bad}=<术è¯> --term-{old,good}" -"=<术è¯>] [--no-checkout] [--first-parent] [<å> [<好>...]] [--] [<路径>...]" +"git bisect start [--term-{new,bad}=<术è¯> --term-{old,good}=<术è¯>] [--no-" +"checkout] [--first-parent] [<å> [<好>...]] [--] [<è·¯å¾„è§„æ ¼>...]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" -msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]" +#: builtin/bisect.c +msgid "git bisect (good|bad) [<rev>...]" +msgstr "git bisect (good|bad) [<版本>...]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" -msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]" +#: builtin/bisect.c +msgid "git bisect skip [(<rev>|<range>)...]" +msgstr "git bisect skip [(<版本>|<范围>)...]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-replay <filename>" -msgstr "git bisect--helper --bisect-replay <文件>" +#: builtin/bisect.c +msgid "git bisect reset [<commit>]" +msgstr "git bisect reset [<æ交>]" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" -msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]" +#: builtin/bisect.c +msgid "git bisect replay <logfile>" +msgstr "git bisect replay <日志文件>" -#: builtin/bisect--helper.c -msgid "git bisect--helper --bisect-run <cmd>..." -msgstr "git bisect--helper --bisect-run <命令>..." +#: builtin/bisect.c +msgid "git bisect run <cmd>..." +msgstr "git bisect run <命令>..." -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "ä¸èƒ½ä»¥ '%2$s' 模å¼æ‰“开文件 '%1$s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "could not write to file '%s'" msgstr "ä¸èƒ½å†™å…¥æ–‡ä»¶ '%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' for reading" msgstr "ä¸èƒ½æ‰“开文件 '%s' æ¥è¯»å–" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s' is not a valid term" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„术è¯" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "ä¸èƒ½ä½¿ç”¨å†…置命令 '%s' 作为术è¯" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "can't change the meaning of the term '%s'" msgstr "ä¸èƒ½ä¿®æ”¹æœ¯è¯ '%s' çš„å«ä¹‰" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "please use two different terms" msgstr "请使用两个ä¸åŒçš„术è¯" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "We are not bisecting.\n" msgstr "我们没有在二分查找。\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„æ交" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "ä¸èƒ½æ£€å‡ºåŽŸå§‹ HEAD '%s'。å°è¯• 'git bisect reset <æ交>'。" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Bad bisect_write argument: %s" msgstr "åçš„ bisect_write å‚数：%s" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "æ— æ³•èŽ·å–版本 '%s' 的对象 ID" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "couldn't open the file '%s'" msgstr "æ— æ³•æ‰“å¼€æ–‡ä»¶ '%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "æ— æ•ˆçš„å‘½ä»¤ï¼šæ‚¨å½“å‰æ£å¤„于一个 %s/%s 二分查找ä¸" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -2982,7 +3013,7 @@ msgstr "" "您需è¦ç»™æˆ‘至少一个 %s 和一个 %s 版本。\n" "为æ¤æ‚¨å¯ä»¥ç”¨ \"git bisect %s\" å’Œ \"git bisect %s\"。" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -2993,7 +3024,7 @@ msgstr "" "然åŽéœ€è¦æ供我至少一个 %s 和一个 %s 版本。\n" "为æ¤æ‚¨å¯ä»¥ç”¨ \"git bisect %s\" å’Œ \"git bisect %s\" 命令。" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "bisecting only with a %s commit" msgstr "在åªæœ‰ä¸€ä¸ª %s æ交的情况下二分查找" @@ -3002,37 +3033,37 @@ msgstr "在åªæœ‰ä¸€ä¸ª %s æ交的情况下二分查找" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]？ " -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "status: waiting for both good and bad commits\n" msgstr "状æ€ï¼šæ£åœ¨ç‰å¾…好的和åçš„æ交\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "status: waiting for bad commit, %d good commit known\n" msgid_plural "status: waiting for bad commit, %d good commits known\n" msgstr[0] "状æ€ï¼šæ£åœ¨ç‰å¾…åçš„æ交，已知 %d 个好的æ交\n" msgstr[1] "状æ€ï¼šæ£åœ¨ç‰å¾…åçš„æ交，已知 %d 个好的æ交\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "status: waiting for good commit(s), bad commit known\n" msgstr "状æ€ï¼šæ£åœ¨ç‰å¾…好的æ交，已知åçš„æ交\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "no terms defined" msgstr "未定义术è¯" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "您当å‰é’ˆå¯¹æ—§çŠ¶æ€çš„术è¯æ˜¯ %s，对新状æ€çš„术è¯æ˜¯ %s。\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -3041,52 +3072,48 @@ msgstr "" "命令 'git bisect terms' çš„å‚æ•° %s æ— æ•ˆã€‚\n" "支æŒçš„选项有：--term-good|--term-old å’Œ --term-bad|--term-new。" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "revision walk setup failed\n" msgstr "版本é历设置失败\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "could not open '%s' for appending" msgstr "æ— æ³•æ‰“å¼€ '%s' è¿›è¡Œè¿½åŠ " -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "'' is not a valid term" msgstr "'' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„术è¯" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "unrecognized option: '%s'" msgstr "未识别的选项：'%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起æ¥ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„版本" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bad HEAD - I need a HEAD" msgstr "åçš„ HEAD - 我需è¦ä¸€ä¸ª HEAD" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "检出 '%s' 失败。å°è¯• 'git bisect start <有效分支>'。" -#: builtin/bisect--helper.c -msgid "won't bisect on cg-seek'ed tree" -msgstr "ä¸ä¼šåœ¨åšäº† cg-seek çš„æ ‘ä¸ŠåšäºŒåˆ†æŸ¥æ‰¾" - -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bad HEAD - strange symbolic ref" msgstr "åçš„ HEAD - 奇怪的符å·å¼•ç”¨" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "invalid ref: '%s'" msgstr "æ— æ•ˆçš„å¼•ç”¨ï¼š'%s'" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "You need to start by \"git bisect start\"\n" msgstr "您需è¦æ‰§è¡Œ \"git bisect start\" æ¥å¼€å§‹\n" @@ -3094,113 +3121,122 @@ msgstr "您需è¦æ‰§è¡Œ \"git bisect start\" æ¥å¼€å§‹\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "Do you want me to do it for you [Y/n]? " msgstr "æ‚¨æƒ³è®©æˆ‘ä¸ºæ‚¨è¿™æ ·åšä¹ˆ[Y/n]？ " -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "Please call `--bisect-state` with at least one argument" msgstr "请使用至少一个å‚数调用 `--bisect-state`" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' åªèƒ½å¸¦ä¸€ä¸ªå‚数。" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Bad rev input: %s" msgstr "å的版本输入：%s" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "Bad rev input (not a commit): %s" msgstr "å的版本输入（ä¸æ˜¯æ交）：%s" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "We are not bisecting." msgstr "我们没有在二分查找。" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s'?? 您在说什么?" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot read file '%s' for replaying" msgstr "ä¸èƒ½è¯»å–文件 '%s' æ¥é‡æ”¾" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "running %s\n" msgstr "æ£åœ¨æ‰§è¡Œ %s\n" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bisect run failed: no command provided." msgstr "二分查找è¿è¡Œå¤±è´¥ï¼šæ²¡æœ‰æ供命令。" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format -msgid "unable to verify '%s' on good revision" -msgstr "æ— æ³•åœ¨å¥½ç‰ˆæœ¬ä¸éªŒè¯ '%s'" +msgid "unable to verify %s on good revision" +msgstr "æ— æ³•åœ¨å¥½ç‰ˆæœ¬ä¸éªŒè¯ %s" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "bogus exit code %d for good revision" msgstr "好版本返回错误的退出ç %d" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format -msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" -msgstr "二分查找è¿è¡Œå¤±è´¥ï¼šå‘½ä»¤ '%2$s' 的退出ç %1$d < 0 或 >= 128" +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" +msgstr "二分查找è¿è¡Œå¤±è´¥ï¼šå‘½ä»¤ %2$s 的退出ç %1$d < 0 或 >= 128" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format msgid "cannot open file '%s' for writing" msgstr "æ— æ³•æ‰“å¼€æ–‡ä»¶ '%s' 进行写入" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "bisect run cannot continue any more" msgstr "二分查找ä¸èƒ½ç»§ç»è¿è¡Œ" -#: builtin/bisect--helper.c -#, c-format +#: builtin/bisect.c msgid "bisect run success" msgstr "二分查找è¿è¡ŒæˆåŠŸ" -#: builtin/bisect--helper.c -#, c-format +#: builtin/bisect.c msgid "bisect found first bad commit" msgstr "二分查找找到了第一个åçš„æ交" -#: builtin/bisect--helper.c +#: builtin/bisect.c #, c-format -msgid "" -"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " -"code %d" -msgstr "二分查找è¿è¡Œå¤±è´¥ï¼š'git bisect--helper --bisect-state %s' 退出ç 为 %d" +msgid "bisect run failed: 'git bisect %s' exited with error code %d" +msgstr "二分查找è¿è¡Œå¤±è´¥ï¼š'git bisect %s' 退出ç 为 %d" -#: builtin/bisect--helper.c -msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset æ— éœ€å‚数或者需è¦ä¸€ä¸ªæ交" - -#: builtin/bisect--helper.c -msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--bisect-terms éœ€è¦ 0 或 1 个å‚æ•°" +#: builtin/bisect.c +#, c-format +msgid "'%s' requires either no argument or a commit" +msgstr "'%s' æ— éœ€å‚数或者需è¦ä¸€ä¸ªæ交" -#: builtin/bisect--helper.c -msgid "--bisect-next requires 0 arguments" -msgstr "--bisect-next éœ€è¦ 0 个å‚æ•°" +#: builtin/bisect.c +#, c-format +msgid "'%s' requires 0 or 1 argument" +msgstr "'%s' æ— éœ€å‚数或者需è¦ä¸€ä¸ªå‚æ•°" -#: builtin/bisect--helper.c -msgid "--bisect-log requires 0 arguments" -msgstr "--bisect-log éœ€è¦ 0 个å‚æ•°" +#: builtin/bisect.c +#, c-format +msgid "'%s' requires 0 arguments" +msgstr "'%s' æ— éœ€å‚æ•°" -#: builtin/bisect--helper.c +#: builtin/bisect.c msgid "no logfile given" msgstr "未æ供日志文件" +#: builtin/bisect.c +#, c-format +msgid "'%s' failed: no command provided." +msgstr "'%s' è¿è¡Œå¤±è´¥ï¼šæ²¡æœ‰æ供命令。" + +#: builtin/bisect.c +msgid "need a command" +msgstr "需è¦ä¸€ä¸ªå‘½ä»¤" + +#: builtin/bisect.c builtin/cat-file.c +#, c-format +msgid "unknown command: '%s'" +msgstr "未知命令：'%s'" + #: builtin/blame.c msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" @@ -3912,6 +3948,10 @@ msgstr "git bundle list-heads <文件> [<引用å>...]" msgid "git bundle unbundle [--progress] <file> [<refname>...]" msgstr "git bundle unbundle [--progress] <文件> [<引用å>...]" +#: builtin/bundle.c +msgid "need a <file> argument" +msgstr "需è¦ä¸€ä¸ª <文件> å‚æ•°" + #: builtin/bundle.c builtin/pack-objects.c msgid "do not show progress meter" msgstr "ä¸æ˜¾ç¤ºè¿›åº¦è¡¨" @@ -3982,11 +4022,6 @@ msgid "%s takes no arguments" msgstr "%s ä¸éœ€è¦å‚æ•°" #: builtin/cat-file.c -#, c-format -msgid "unknown command: '%s'" -msgstr "未知命令：'%s'" - -#: builtin/cat-file.c msgid "only one batch option may be specified" msgstr "åªèƒ½æŒ‡å®šä¸€ä¸ªæ‰¹å¤„ç†é€‰é¡¹" @@ -4155,12 +4190,17 @@ msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "<类型> <对象> 模å¼åªå…许两个å‚数，而ä¸æ˜¯ %d 个" #: builtin/check-attr.c -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." -msgstr "git check-attr [-a | --all | <属性>...] [--] <路径å>..." +msgid "" +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] " +"<pathname>..." +msgstr "" +"git check-attr [--source <æ ‘å¯¹è±¡>] [-a | --all | <属性>...] [--] <路径å>..." #: builtin/check-attr.c -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" -msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" +msgid "" +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]" +msgstr "" +"git check-attr --stdin [-z] [--source <æ ‘å¯¹è±¡>] [-a | --all | <属性>...]" #: builtin/check-attr.c msgid "report all attributes set on file" @@ -4178,6 +4218,14 @@ msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å‡ºæ–‡ä»¶å" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL å—符终结" +#: builtin/check-attr.c +msgid "<tree-ish>" +msgstr "<æ ‘å¯¹è±¡>" + +#: builtin/check-attr.c +msgid "which tree-ish to check attributes at" +msgstr "è¦ç”¨å“ªä¸€ä¸ªæ ‘对象æ¥æ£€æŸ¥å±žæ€§" + #: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c msgid "suppress progress reporting" msgstr "ä¸æ˜¾ç¤ºè¿›åº¦æŠ¥å‘Š" @@ -4849,7 +4897,7 @@ msgstr "æ‹’ç»åˆ 除当å‰å·¥ä½œç›®å½•\n" msgid "Would refuse to remove current working directory\n" msgstr "将拒ç»åˆ 除当å‰å·¥ä½œç›®å½•\n" -#: builtin/clean.c git-add--interactive.perl +#: builtin/clean.c #, c-format msgid "" "Prompt help:\n" @@ -4862,7 +4910,7 @@ msgstr "" "foo - 通过唯一å‰ç¼€é€‰æ‹©ä¸€ä¸ªé€‰é¡¹\n" " - （空）什么也ä¸é€‰æ‹©\n" -#: builtin/clean.c git-add--interactive.perl +#: builtin/clean.c #, c-format msgid "" "Prompt help:\n" @@ -4883,8 +4931,8 @@ msgstr "" "* - 选择所有选项\n" " - （空）结æŸé€‰æ‹©\n" -#: builtin/clean.c git-add--interactive.perl -#, c-format, perl-format +#: builtin/clean.c +#, c-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" @@ -5073,10 +5121,6 @@ msgstr "深度" msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c -msgid "time" -msgstr "时间" - #: builtin/clone.c msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" @@ -5365,6 +5409,10 @@ msgid "failed to fetch objects from bundle URI '%s'" msgstr "æ— æ³•ä»Žå½’æ¡£åŒ… URI '%s' 获å–对象" #: builtin/clone.c +msgid "failed to fetch advertised bundles" +msgstr "æ— æ³•èŽ·å–公布的归档包" + +#: builtin/clone.c msgid "remote transport reported error" msgstr "è¿œç¨‹ä¼ è¾“æŠ¥å‘Šé”™è¯¯" @@ -5733,7 +5781,7 @@ msgid "" "in the current commit message" msgstr "æ— æ³•é€‰æ‹©ä¸€ä¸ªæœªè¢«å½“å‰æ交说明使用的注释å—符" -#: builtin/commit.c +#: builtin/commit.c builtin/merge-tree.c #, c-format msgid "could not lookup commit %s" msgstr "ä¸èƒ½æŸ¥è¯¢æ交 %s" @@ -6035,7 +6083,7 @@ msgstr "日期" msgid "override date for commit" msgstr "æ交时覆盖日期" -#: builtin/commit.c parse-options.h ref-filter.h +#: builtin/commit.c builtin/merge-tree.c parse-options.h ref-filter.h msgid "commit" msgstr "æ交" @@ -6186,7 +6234,7 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<选项>]" -#: builtin/config.c builtin/env--helper.c +#: builtin/config.c #, c-format msgid "unrecognized --type argument, %s" msgstr "未能识别的 --type å‚数，%s" @@ -6295,11 +6343,11 @@ msgstr "获得颜色设置：é…ç½® [stdout-is-tty]" msgid "Type" msgstr "类型" -#: builtin/config.c builtin/env--helper.c builtin/hash-object.c +#: builtin/config.c builtin/hash-object.c msgid "type" msgstr "类型" -#: builtin/config.c builtin/env--helper.c +#: builtin/config.c msgid "value is given this type" msgstr "å–值为该类型" @@ -6351,7 +6399,7 @@ msgstr "显示é…置的æ¥æºï¼ˆæ–‡ä»¶ã€æ ‡å‡†è¾“å…¥ã€æ•°æ®å¯¹è±¡ï¼Œæˆ–命令 msgid "show scope of config (worktree, local, global, system, command)" msgstr "显示é…置的作用域（工作区ã€æœ¬åœ°ã€å…¨å±€ã€ç³»ç»Ÿã€å‘½ä»¤ï¼‰" -#: builtin/config.c builtin/env--helper.c +#: builtin/config.c msgid "value" msgstr "å–值" @@ -6886,30 +6934,6 @@ msgstr "没有为 --tool=<工具> å‚æ•°æä¾› <工具>" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "没有为 --extcmd=<命令> å‚æ•°æä¾› <命令>" -#: builtin/env--helper.c -msgid "git env--helper --type=[bool|ulong] <options> <env-var>" -msgstr "git env--helper --type=[bool|ulong] <选项> <环境å˜é‡>" - -#: builtin/env--helper.c -msgid "default for git_env_*(...) to fall back on" -msgstr "git_env_*(...) 的默认值" - -#: builtin/env--helper.c -msgid "be quiet only use git_env_*() value as exit code" -msgstr "安é™æ¨¡å¼ï¼Œåªä½¿ç”¨ git_env_*() 的值作为退出ç " - -#: builtin/env--helper.c -#, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "选项 `--default' å’Œ `--type=bool` 期望一个布尔值，ä¸æ˜¯ `%s`" - -#: builtin/env--helper.c -#, c-format -msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not " -"`%s`" -msgstr "选项 `--default' å’Œ `--type=ulong` æœŸæœ›ä¸€ä¸ªæ— ç¬¦å·é•¿æ•´åž‹ï¼Œä¸æ˜¯ `%s`" - #: builtin/fast-export.c msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<rev-list 选项>]" @@ -7404,6 +7428,11 @@ msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，å‚æ•° --unshallow 没有æ„义" #: builtin/fetch.c +#, c-format +msgid "failed to fetch bundles from '%s'" +msgstr "æ— æ³•ä»Ž '%s' 获å–归档包" + +#: builtin/fetch.c msgid "fetch --all does not take a repository argument" msgstr "fetch --all ä¸èƒ½å¸¦ä¸€ä¸ªä»“库å‚æ•°" @@ -8694,13 +8723,21 @@ msgid "'git help config' for more information" msgstr "'git help config' 获å–更多信æ¯" #: builtin/hook.c -msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" -msgstr "git hook run [--ignore-missing] <é’©åå称> [-- <é’©åå‚æ•°>]" +msgid "" +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-" +"args>]" +msgstr "" +"git hook run [--ignore-missing] [--to-stdin=<路径>] <é’©åå称> [-- <é’©åå‚æ•°" +">]" #: builtin/hook.c msgid "silently ignore missing requested <hook-name>" msgstr "é™é»˜åœ°å¿½ç•¥ç¼ºå¤±çš„ <é’©åå称>" +#: builtin/hook.c +msgid "file to read into hooks' stdin" +msgstr "读å–至钩åæ ‡å‡†è¾“å…¥çš„æ–‡ä»¶" + #: builtin/index-pack.c #, c-format msgid "object type mismatch at %s" @@ -9749,11 +9786,11 @@ msgstr "" msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" -" [--symref] [<repository> [<refs>...]]" +" [--symref] [<repository> [<patterns>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<å¯æ‰§è¡Œæ–‡ä»¶>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<é”®>]\n" -" [--symref] [<仓库> [<引用>...]]" +" [--symref] [<仓库> [<模å¼>...]]" #: builtin/ls-remote.c msgid "do not print remote URL" @@ -10073,9 +10110,17 @@ msgid "perform multiple merges, one per line of input" msgstr "实施多个åˆå¹¶ï¼Œæ¯è¾“入行一个" #: builtin/merge-tree.c +msgid "specify a merge-base for the merge" +msgstr "指定用于åˆå¹¶çš„åˆå¹¶åŸºçº¿" + +#: builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge 与其他所有选项ä¸å…¼å®¹" +#: builtin/merge-tree.c +msgid "--merge-base is incompatible with --stdin" +msgstr "--merge-base 与 --stdin ä¸å…¼å®¹" + #: builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." @@ -12088,7 +12133,7 @@ msgstr "需è¦è¿œç«¯æ”¯æŒåŽŸå事务" msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有æ„义" -#: builtin/push.c +#: builtin/push.c t/helper/test-bundle-uri.c #, c-format msgid "bad repository '%s'" msgstr "å的仓库 '%s'" @@ -12358,6 +12403,10 @@ msgid "could not switch to %s" msgstr "æ— æ³•åˆ‡æ¢åˆ° %s" #: builtin/rebase.c +msgid "apply options and merge options cannot be used together" +msgstr "应用选项和åˆå¹¶é€‰é¡¹ä¸èƒ½åŒæ—¶ä½¿ç”¨" + +#: builtin/rebase.c #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " @@ -12636,8 +12685,16 @@ msgid "--strategy requires --merge or --interactive" msgstr "--strategy éœ€è¦ --merge 或 --interactive" #: builtin/rebase.c -msgid "apply options and merge options cannot be used together" -msgstr "应用选项和åˆå¹¶é€‰é¡¹ä¸èƒ½åŒæ—¶ä½¿ç”¨" +msgid "" +"apply options are incompatible with rebase.autosquash. Consider adding --no-" +"autosquash" +msgstr "应用的选项与 rebase.autosquash ä¸å…¼å®¹ã€‚è€ƒè™‘åŠ ä¸Š --no-autosquash" + +#: builtin/rebase.c +msgid "" +"apply options are incompatible with rebase.updateRefs. Consider adding --no-" +"update-refs" +msgstr "应用的选项与 rebase.updateRefs ä¸å…¼å®¹ã€‚è€ƒè™‘åŠ ä¸Š --no-update-refs" #: builtin/rebase.c #, c-format @@ -15680,11 +15737,6 @@ msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„å模组å称" msgid "git submodule--helper <command>" msgstr "git submodule--helper <命令>" -#: builtin/submodule--helper.c git.c -#, c-format -msgid "%s doesn't support --super-prefix" -msgstr "%s ä¸æ”¯æŒ --super-prefix" - #: builtin/symbolic-ref.c msgid "git symbolic-ref [-m <reason>] <name> <ref>" msgstr "git symbolic-ref [-m <ç†ç”±>] <å称> <引用>" @@ -16590,6 +16642,11 @@ msgstr "core.fsyncMethod = batch ä¸æ”¯æŒæœ¬å¹³å°" #: bundle-uri.c #, c-format +msgid "could not parse bundle list key %s with value '%s'" +msgstr "ä¸èƒ½è§£æžå½’档包列表键 %s 的值 '%s'" + +#: bundle-uri.c +#, c-format msgid "bundle list at '%s' has no mode" msgstr "在 '%s' 的归档包列表没有模å¼" @@ -16603,6 +16660,15 @@ msgstr "缺ä¹èƒ½åŠ›" #: bundle-uri.c #, c-format +msgid "file downloaded from '%s' is not a bundle" +msgstr "下载自 '%s' 的文件ä¸æ˜¯å½’档包" + +#: bundle-uri.c +msgid "failed to store maximum creation token" +msgstr "æ— æ³•å‚¨å˜æœ€å¤§çš„创建令牌" + +#: bundle-uri.c +#, c-format msgid "unrecognized bundle mode from URI '%s'" msgstr "ä¸å¯è¾¨è®¤çš„归档包模å¼æ¥è‡ª URI '%s'" @@ -16622,6 +16688,15 @@ msgid "file at URI '%s' is not a bundle or bundle list" msgstr "ä½äºŽ URI '%s' 的文件ä¸æ˜¯å½’档包或归档包列表" #: bundle-uri.c +#, c-format +msgid "bundle-uri: unexpected argument: '%s'" +msgstr "bundle-uri: æ„外的å‚数：'%s'" + +#: bundle-uri.c +msgid "bundle-uri: expected flush after arguments" +msgstr "bundle-uri: 在å‚数之åŽåº”有一个 flush" + +#: bundle-uri.c msgid "bundle-uri: got an empty line" msgstr "bundle-uri: 获得了空行" @@ -16662,6 +16737,12 @@ msgid "need a repository to verify a bundle" msgstr "需è¦ä¸€ä¸ªä»“库æ¥æ ¡éªŒä¸€ä¸ªå½’档包" #: bundle.c +msgid "" +"some prerequisite commits exist in the object store, but are not connected " +"to the repository's history" +msgstr "一些å‰ç½®æ交å˜åœ¨äºŽå¯¹è±¡å‚¨å˜ä¸ï¼Œä½†æœªè¿žæŽ¥äºŽæœ¬ä»“库的历å²" + +#: bundle.c #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %<PRIuMAX> refs:" @@ -18439,12 +18520,12 @@ msgstr "æœåŠ¡å™¨ç»™å‡ºæœªçŸ¥çš„å¯¹è±¡æ ¼å¼ '%s'" #: connect.c #, c-format -msgid "invalid ls-refs response: %s" -msgstr "æ— æ•ˆçš„ ls-refs å“应：%s" +msgid "error on bundle-uri response line %d: %s" +msgstr "于 bundle-uri å“应行 %d å‘生错误：%s" #: connect.c -msgid "expected flush after ref listing" -msgstr "在引用列表之åŽåº”该有一个 flush 包" +msgid "expected flush after bundle-uri listing" +msgstr "在 bundle-uri 列表之åŽåº”该有一个 flush 包" #: connect.c msgid "expected response end packet after ref listing" @@ -18452,6 +18533,15 @@ msgstr "在引用列表之åŽåº”该有å“应结æŸåŒ…" #: connect.c #, c-format +msgid "invalid ls-refs response: %s" +msgstr "æ— æ•ˆçš„ ls-refs å“应：%s" + +#: connect.c +msgid "expected flush after ref listing" +msgstr "在引用列表之åŽåº”该有一个 flush 包" + +#: connect.c +#, c-format msgid "protocol '%s' is not supported" msgstr "ä¸æ”¯æŒ '%s' åè®®" @@ -19861,16 +19951,14 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]" +" [--config-env=<name>=<envvar>] <command> [<args>]" msgstr "" -"git [-v | --version] [--help] [-C <路径>] [-c <å称>=<å–值>]\n" +"git [-v | --version] [-h | --help] [-C <路径>] [-c <å称>=<å–值>]\n" " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<å称>]\n" -" [--super-prefix=<路径>] [--config-env=<å称>=<环境å˜é‡>]\n" -" <命令> [<å‚æ•°>]" +" [--config-env=<å称>=<环境å˜é‡>] <命令> [<å‚æ•°>]" #: git.c msgid "" @@ -19901,11 +19989,6 @@ msgstr "没有为 --namespace æ供命å空间\n" #: git.c #, c-format -msgid "no prefix given for --super-prefix\n" -msgstr "没有为 --super-prefix æä¾›å‰ç¼€\n" - -#: git.c -#, c-format msgid "-c expects a configuration string\n" msgstr "应为 -c æ供一个é…ç½®å—符串\n" @@ -20038,8 +20121,13 @@ msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s" #: gpg-interface.c -msgid "gpg failed to sign the data" -msgstr "gpg æ— æ³•ä¸ºæ•°æ®ç¾å" +#, c-format +msgid "" +"gpg failed to sign the data:\n" +"%s" +msgstr "" +"gpg æ— æ³•ä¸ºæ•°æ®ç¾å：\n" +"%s" #: gpg-interface.c msgid "user.signingKey needs to be set for ssh signing" @@ -21386,6 +21474,11 @@ msgstr "æ¾æ•£å¯¹è±¡ '%s' åŽé¢æœ‰åžƒåœ¾æ•°æ®" #: object-file.c #, c-format +msgid "unable to open loose object %s" +msgstr "æ— æ³•æ‰“å¼€æ¾æ•£å¯¹è±¡ %s" + +#: object-file.c +#, c-format msgid "unable to parse %s header" msgstr "æ— æ³•è§£æž %s 头部" @@ -21405,8 +21498,8 @@ msgstr "%s 的头部太长，超出了 %d å—节" #: object-file.c #, c-format -msgid "failed to read object %s" -msgstr "æ— æ³•è¯»å–对象 %s" +msgid "loose object %s (stored in %s) is corrupt" +msgstr "æ¾æ•£å¯¹è±¡ %s（ä¿å˜åœ¨ %s）已æŸå" #: object-file.c #, c-format @@ -21415,11 +21508,6 @@ msgstr "找ä¸åˆ° %2$s 的替代 %1$s" #: object-file.c #, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "æ¾æ•£å¯¹è±¡ %s（ä¿å˜åœ¨ %s）已æŸå" - -#: object-file.c -#, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包对象 %s（ä¿å˜åœ¨ %s）已æŸå" @@ -21434,10 +21522,6 @@ msgid "unable to set permission to '%s'" msgstr "æ— æ³•ä¸º '%s' 设置æƒé™" #: object-file.c -msgid "file write error" -msgstr "文件写错误" - -#: object-file.c msgid "error when closing loose object file" msgstr "å…³é—æ¾æ•£å¯¹è±¡æ–‡ä»¶æ—¶å‡ºé”™" @@ -21495,12 +21579,13 @@ msgid "cannot read object for %s" msgstr "ä¸èƒ½è¯»å–对象 %s" #: object-file.c -msgid "corrupt commit" -msgstr "æŸåçš„æ交" +#, c-format +msgid "object fails fsck: %s" +msgstr "对象 fsck 失败：%s" #: object-file.c -msgid "corrupt tag" -msgstr "æŸåçš„æ ‡ç¾" +msgid "refusing to create malformed object" +msgstr "æ‹’ç»åˆ›å»ºæ ¼å¼é”™è¯¯çš„对象" #: object-file.c #, c-format @@ -21811,11 +21896,6 @@ msgid "cannot fstat bitmap file" msgstr "ä¸èƒ½å¯¹ä½å›¾æ–‡ä»¶è°ƒç”¨ fstat" #: pack-bitmap.c -#, c-format -msgid "ignoring extra bitmap file: '%s'" -msgstr "忽略é¢å¤–çš„ä½å›¾æ–‡ä»¶ï¼š'%s'" - -#: pack-bitmap.c msgid "checksum doesn't match in MIDX and bitmap" msgstr "MIDX å’Œä½å›¾ä¸çš„æ ¡éªŒç ä¸åŒ¹é…" @@ -22142,6 +22222,10 @@ msgid "use <n> digits to display object names" msgstr "用 <n> ä½æ•°å—显示对象å" #: parse-options.h +msgid "prefixed path to initial superproject" +msgstr "用æ¥åˆå§‹åŒ–父项目的å‰ç¼€è·¯å¾„" + +#: parse-options.h msgid "how to strip spaces and #comments from message" msgstr "è®¾ç½®å¦‚ä½•åˆ é™¤æäº¤è¯´æ˜Žé‡Œçš„ç©ºæ ¼å’Œ#注释" @@ -22725,6 +22809,16 @@ msgstr "领先 %d，è½åŽ %d" #: ref-filter.c #, c-format +msgid "%%(%.*s) does not take arguments" +msgstr "%%(%.*s) ä¸å¸¦å‚æ•°" + +#: ref-filter.c +#, c-format +msgid "unrecognized %%(%.*s) argument: %s" +msgstr "未能识别的 %%(%.*s) å‚数：%s" + +#: ref-filter.c +#, c-format msgid "expected format: %%(color:<color>)" msgstr "æœŸæœ›çš„æ ¼å¼ï¼š%%(color:<颜色>)" @@ -22745,26 +22839,6 @@ msgstr "期望整数值 refname:rstrip=%s" #: ref-filter.c #, c-format -msgid "unrecognized %%(%s) argument: %s" -msgstr "未能识别的 %%(%s) å‚数：%s" - -#: ref-filter.c -#, c-format -msgid "%%(objecttype) does not take arguments" -msgstr "%%(objecttype) ä¸å¸¦å‚æ•°" - -#: ref-filter.c -#, c-format -msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) ä¸å¸¦å‚æ•°" - -#: ref-filter.c -#, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) ä¸å¸¦å‚æ•°" - -#: ref-filter.c -#, c-format msgid "expected %%(trailers:key=<value>)" msgstr "预期 %%(trailers:key=<值>)" @@ -22785,11 +22859,6 @@ msgstr "期望 %%(%2$s) ä¸çš„ '%1$s' 是一个æ£æ•°" #: ref-filter.c #, c-format -msgid "unrecognized email option: %s" -msgstr "未识别的邮件选项：%s" - -#: ref-filter.c -#, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "æœŸæœ›çš„æ ¼å¼ï¼š%%(align:<宽度>,<ä½ç½®>)" @@ -22805,13 +22874,13 @@ msgstr "未能识别的宽度：%s" #: ref-filter.c #, c-format -msgid "positive width expected with the %%(align) atom" -msgstr "å…ƒç´ %%(align) 需è¦ä¸€ä¸ªæ£æ•°çš„宽度" +msgid "unrecognized %%(%s) argument: %s" +msgstr "未能识别的 %%(%s) å‚数：%s" #: ref-filter.c #, c-format -msgid "%%(rest) does not take arguments" -msgstr "%%(rest) ä¸å¸¦å‚æ•°" +msgid "positive width expected with the %%(align) atom" +msgstr "å…ƒç´ %%(align) 需è¦ä¸€ä¸ªæ£æ•°çš„宽度" #: ref-filter.c #, c-format @@ -24317,6 +24386,26 @@ msgstr "git %sï¼šæ— æ³•åˆ·æ–°ç´¢å¼•" #: sequencer.c #, c-format +msgid "'%s' is not a valid label" +msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„æ ‡ç¾" + +#: sequencer.c +#, c-format +msgid "'%s' is not a valid refname" +msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„引用å" + +#: sequencer.c +#, c-format +msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s" +msgstr "update-ref 需è¦ä¸€ä¸ªå®Œæ•´çš„引用å，例如：refs/heads/%s" + +#: sequencer.c +#, c-format +msgid "invalid command '%.*s'" +msgstr "æ— æ•ˆå‘½ä»¤ '%.*s'" + +#: sequencer.c +#, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s ä¸æŽ¥å—å‚数：'%s'" @@ -25274,6 +25363,19 @@ msgstr "ls-tree 返回未知返回值 %d" msgid "failed to lstat '%s'" msgstr "æ— æ³•æ‰§è¡Œ lstat '%s'" +#: t/helper/test-bundle-uri.c +msgid "no remote configured to get bundle URIs from" +msgstr "没有远程被设置为å¯ä»¥èŽ·å–归档包 URI" + +#: t/helper/test-bundle-uri.c +#, c-format +msgid "remote '%s' has no configured URL" +msgstr "远程 '%s' 没有设置 URL" + +#: t/helper/test-bundle-uri.c +msgid "could not get the bundle-uri list" +msgstr "æ— æ³•èŽ·å– bundle-uri 列表" + #: t/helper/test-cache-tree.c msgid "test-tool cache-tree <options> (control|prime|update)" msgstr "test-tool cache-tree <选项> (control|prime|update)" @@ -25710,6 +25812,14 @@ msgstr "æ£åœ¨ç»ˆæ¢ã€‚" msgid "failed to push all needed submodules" msgstr "ä¸èƒ½æŽ¨é€å…¨éƒ¨éœ€è¦çš„å模组" +#: transport.c +msgid "bundle-uri operation not supported by protocol" +msgstr "åè®®ä¸æ”¯æŒ bundle-uri æ“作" + +#: transport.c +msgid "could not retrieve server-advertised bundle-uri list" +msgstr "æ— æ³•èŽ·å–æœåŠ¡å™¨å…¬å¸ƒçš„ bundle-uri 列表" + #: tree-walk.c msgid "too-short tree object" msgstr "太çŸçš„æ ‘å¯¹è±¡" @@ -26627,12 +26737,20 @@ msgstr "忽略的文件" #: wt-status.c #, c-format msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." +"It took %.2f seconds to enumerate untracked files,\n" +"but the results were cached, and subsequent runs may be faster." msgstr "" -"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能æ高速度，\n" -"但您需è¦å°å¿ƒä¸è¦å¿˜äº†æ·»åŠ 新文件（å‚è§ 'git help status'）。" +"枚举未追踪的文件花了 %.2f 秒，\n" +"结果已被缓å˜ï¼ŒåŽç»çš„执行会更快。" + +#: wt-status.c +#, c-format +msgid "It took %.2f seconds to enumerate untracked files." +msgstr "枚举未追踪的文件花了 %.2f 秒。" + +#: wt-status.c +msgid "See 'git help status' for information on how to improve this." +msgstr "å‚è§ 'git help status' æ¥èŽ·å–如何改善的信æ¯ã€‚" #: wt-status.c #, c-format @@ -26805,300 +26923,6 @@ msgstr "您需è¦åœ¨å·¥ä½œåŒºçš„顶级目录ä¸è¿è¡Œè¿™ä¸ªå‘½ä»¤ã€‚" msgid "Unable to determine absolute path of git directory" msgstr "ä¸èƒ½ç¡®å®š git 目录的ç»å¯¹è·¯å¾„" -#. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl -#, perl-format -msgid "%12s %12s %s" -msgstr "%12s %12s %s" - -#: git-add--interactive.perl -#, perl-format -msgid "touched %d path\n" -msgid_plural "touched %d paths\n" -msgstr[0] "触碰了 %d 个路径\n" -msgstr[1] "触碰了 %d 个路径\n" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging." -msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用，编辑å—将立å³æ ‡è®°ä¸ºæš‚å˜ã€‚" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for stashing." -msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用，编辑å—将立å³æ ‡è®°ä¸ºè´®è—。" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for unstaging." -msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用，编辑å—将立å³æ ‡è®°ä¸ºæœªæš‚å˜ã€‚" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for applying." -msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用，编辑å—将立å³æ ‡è®°ä¸ºåº”用。" - -#: git-add--interactive.perl -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for discarding." -msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用，编辑å—将立å³æ ‡è®°ä¸ºä¸¢å¼ƒã€‚" - -#: git-add--interactive.perl -#, perl-format -msgid "failed to open hunk edit file for writing: %s" -msgstr "æ— æ³•ä¸ºå†™å…¥æ‰“å¼€å—编辑文件：%s" - -#: git-add--interactive.perl -#, perl-format -msgid "" -"---\n" -"To remove '%s' lines, make them ' ' lines (context).\n" -"To remove '%s' lines, delete them.\n" -"Lines starting with %s will be removed.\n" -msgstr "" -"---\n" -"è¦åˆ 除 '%s' 开始的行，使其æˆä¸º ' ' 开始的行（上下文）。\n" -"è¦åˆ 除 '%s' å¼€å§‹çš„è¡Œï¼Œåˆ é™¤å®ƒä»¬ã€‚\n" -"以 %s å¼€å§‹çš„è¡Œå°†è¢«åˆ é™¤ã€‚\n" - -#: git-add--interactive.perl -#, perl-format -msgid "failed to open hunk edit file for reading: %s" -msgstr "æ— æ³•è¯»å–å—编辑文件：%s" - -#: git-add--interactive.perl -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this hunk and all later hunks in the file\n" -"d - do not stage this hunk or any of the later hunks in the file" -msgstr "" -"y - æš‚å˜è¯¥å—\n" -"n - ä¸è¦æš‚å˜è¯¥å—\n" -"q - 退出。ä¸æš‚å˜è¯¥å—åŠåŽé¢çš„全部å—\n" -"a - æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—\n" -"d - ä¸æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—" - -#: git-add--interactive.perl -msgid "" -"y - stash this hunk\n" -"n - do not stash this hunk\n" -"q - quit; do not stash this hunk or any of the remaining ones\n" -"a - stash this hunk and all later hunks in the file\n" -"d - do not stash this hunk or any of the later hunks in the file" -msgstr "" -"y - è´®è—该å—\n" -"n - ä¸è¦è´®è—该å—\n" -"q - 退出。ä¸è´®è—该å—åŠåŽé¢çš„全部å—\n" -"a - è´®è—该å—和本文件ä¸åŽé¢çš„全部å—\n" -"d - ä¸è´®è—该å—和本文件ä¸åŽé¢çš„全部å—" - -#: git-add--interactive.perl -msgid "" -"y - unstage this hunk\n" -"n - do not unstage this hunk\n" -"q - quit; do not unstage this hunk or any of the remaining ones\n" -"a - unstage this hunk and all later hunks in the file\n" -"d - do not unstage this hunk or any of the later hunks in the file" -msgstr "" -"y - ä¸æš‚å˜è¯¥å—\n" -"n - ä¸è¦ä¸æš‚å˜è¯¥å—\n" -"q - 退出。ä¸è¦ä¸æš‚å˜è¯¥å—åŠåŽé¢çš„全部å—\n" -"a - ä¸æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—\n" -"d - ä¸è¦ä¸æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—" - -#: git-add--interactive.perl -msgid "" -"y - apply this hunk to index\n" -"n - do not apply this hunk to index\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - 在索引ä¸åº”用该å—\n" -"n - ä¸è¦åœ¨ç´¢å¼•ä¸åº”用该å—\n" -"q - 退出。ä¸è¦åº”用该å—åŠåŽé¢çš„全部å—\n" -"a - 应用该å—和本文件ä¸åŽé¢çš„全部å—\n" -"d - ä¸è¦åº”用该å—和本文件ä¸åŽé¢çš„全部å—" - -#: git-add--interactive.perl -msgid "" -"y - discard this hunk from worktree\n" -"n - do not discard this hunk from worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - 在工作区ä¸ä¸¢å¼ƒè¯¥å—\n" -"n - ä¸è¦åœ¨å·¥ä½œåŒºä¸ä¸¢å¼ƒè¯¥å—\n" -"q - 退出。ä¸è¦ä¸¢å¼ƒè¯¥å—åŠåŽé¢çš„全部å—\n" -"a - 丢弃该å—和本文件ä¸åŽé¢çš„全部å—\n" -"d - ä¸è¦ä¸¢å¼ƒè¯¥å—和本文件ä¸åŽé¢çš„全部å—" - -#: git-add--interactive.perl -msgid "" -"y - discard this hunk from index and worktree\n" -"n - do not discard this hunk from index and worktree\n" -"q - quit; do not discard this hunk or any of the remaining ones\n" -"a - discard this hunk and all later hunks in the file\n" -"d - do not discard this hunk or any of the later hunks in the file" -msgstr "" -"y - 在索引和工作区ä¸ä¸¢å¼ƒè¯¥å—\n" -"n - ä¸è¦åœ¨ç´¢å¼•å’Œå·¥ä½œåŒºä¸ä¸¢å¼ƒè¯¥å—\n" -"q - 退出。ä¸è¦ä¸¢å¼ƒè¯¥å—åŠåŽé¢çš„全部å—\n" -"a - 丢弃该å—和本文件ä¸åŽé¢çš„全部å—\n" -"d - ä¸è¦ä¸¢å¼ƒè¯¥å—和本文件ä¸åŽé¢çš„全部å—" - -#: git-add--interactive.perl -msgid "" -"y - apply this hunk to index and worktree\n" -"n - do not apply this hunk to index and worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - 在索引和工作区ä¸åº”用该å—\n" -"n - ä¸è¦åœ¨ç´¢å¼•å’Œå·¥ä½œåŒºä¸åº”用该å—\n" -"q - 退出。ä¸è¦åº”用该å—åŠåŽé¢çš„全部å—\n" -"a - 应用该å—和本文件ä¸åŽé¢çš„全部å—\n" -"d - ä¸è¦åº”用该å—和本文件ä¸åŽé¢çš„全部å—" - -#: git-add--interactive.perl -msgid "" -"y - apply this hunk to worktree\n" -"n - do not apply this hunk to worktree\n" -"q - quit; do not apply this hunk or any of the remaining ones\n" -"a - apply this hunk and all later hunks in the file\n" -"d - do not apply this hunk or any of the later hunks in the file" -msgstr "" -"y - 在工作区ä¸åº”用该å—\n" -"n - ä¸è¦åœ¨å·¥ä½œåŒºä¸åº”用该å—\n" -"q - 退出。ä¸è¦åº”用该å—åŠåŽé¢çš„全部å—\n" -"a - 应用该å—和本文件ä¸åŽé¢çš„全部å—\n" -"d - ä¸è¦åº”用该å—和本文件ä¸åŽé¢çš„全部å—" - -#: git-add--interactive.perl -msgid "" -"g - select a hunk to go to\n" -"/ - search for a hunk matching the given regex\n" -"j - leave this hunk undecided, see next undecided hunk\n" -"J - leave this hunk undecided, see next hunk\n" -"k - leave this hunk undecided, see previous undecided hunk\n" -"K - leave this hunk undecided, see previous hunk\n" -"s - split the current hunk into smaller hunks\n" -"e - manually edit the current hunk\n" -"? - print help\n" -msgstr "" -"g - 选择跳转到一个å—\n" -"/ - 查找和给定æ£åˆ™è¡¨è¾¾å¼åŒ¹é…çš„å—\n" -"j - ç»´æŒè¯¥å—未决状æ€ï¼ŒæŸ¥çœ‹ä¸‹ä¸€ä¸ªæœªå†³å—\n" -"J - ç»´æŒè¯¥å—未决状æ€ï¼ŒæŸ¥çœ‹ä¸‹ä¸€ä¸ªå—\n" -"k - ç»´æŒè¯¥å—未决状æ€ï¼ŒæŸ¥çœ‹ä¸Šä¸€ä¸ªæœªå†³å—\n" -"K - ç»´æŒè¯¥å—未决状æ€ï¼ŒæŸ¥çœ‹ä¸Šä¸€ä¸ªå—\n" -"s - 拆分当å‰å—为更å°çš„å—\n" -"e - 手动编辑当å‰å—\n" -"? - 显示帮助\n" - -#: git-add--interactive.perl -msgid "The selected hunks do not apply to the index!\n" -msgstr "选ä¸çš„å—ä¸èƒ½åº”用到索引ï¼\n" - -#: git-add--interactive.perl -#, perl-format -msgid "ignoring unmerged: %s\n" -msgstr "忽略未åˆå…¥çš„：%s\n" - -#: git-add--interactive.perl -msgid "No other hunks to goto\n" -msgstr "没有其它å¯ä¾›è·³è½¬çš„å—\n" - -#: git-add--interactive.perl -#, perl-format -msgid "Invalid number: '%s'\n" -msgstr "æ— æ•ˆæ•°å—：'%s'\n" - -#: git-add--interactive.perl -#, perl-format -msgid "Sorry, only %d hunk available.\n" -msgid_plural "Sorry, only %d hunks available.\n" -msgstr[0] "对ä¸èµ·ï¼Œåªæœ‰ %d 个å¯ç”¨å—。\n" -msgstr[1] "对ä¸èµ·ï¼Œåªæœ‰ %d 个å¯ç”¨å—。\n" - -#: git-add--interactive.perl -msgid "No other hunks to search\n" -msgstr "没有其它å¯ä¾›æŸ¥æ‰¾çš„å—\n" - -#: git-add--interactive.perl -#, perl-format -msgid "Malformed search regexp %s: %s\n" -msgstr "错误的æ£åˆ™è¡¨è¾¾å¼ %s：%s\n" - -#: git-add--interactive.perl -msgid "No hunk matches the given pattern\n" -msgstr "没有和给定模å¼ç›¸åŒ¹é…çš„å—\n" - -#: git-add--interactive.perl -msgid "No previous hunk\n" -msgstr "没有å‰ä¸€ä¸ªå—\n" - -#: git-add--interactive.perl -msgid "No next hunk\n" -msgstr "没有下一个å—\n" - -#: git-add--interactive.perl -msgid "Sorry, cannot split this hunk\n" -msgstr "对ä¸èµ·ï¼Œä¸èƒ½æ‹†åˆ†è¿™ä¸ªå—\n" - -#: git-add--interactive.perl -#, perl-format -msgid "Split into %d hunk.\n" -msgid_plural "Split into %d hunks.\n" -msgstr[0] "拆分为 %d å—。\n" -msgstr[1] "拆分为 %d å—。\n" - -#: git-add--interactive.perl -msgid "Sorry, cannot edit this hunk\n" -msgstr "对ä¸èµ·ï¼Œä¸èƒ½ç¼–辑这个å—\n" - -#. TRANSLATORS: please do not translate the command names -#. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl -msgid "" -"status - show paths with changes\n" -"update - add working tree state to the staged set of changes\n" -"revert - revert staged set of changes back to the HEAD version\n" -"patch - pick hunks and update selectively\n" -"diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of " -"changes\n" -msgstr "" -"status - 显示å«å˜æ›´çš„路径\n" -"update - æ·»åŠ å·¥ä½œåŒºçŠ¶æ€è‡³æš‚å˜åˆ—表\n" -"revert - 还原修改的暂å˜é›†è‡³ HEAD 版本\n" -"patch - 挑选å—并且有选择地更新\n" -"diff - 显示 HEAD 和索引间差异\n" -"add untracked - æ·»åŠ æœªè·Ÿè¸ªæ–‡ä»¶çš„å†…å®¹è‡³æš‚å˜åˆ—表\n" - -#: git-add--interactive.perl -msgid "missing --" -msgstr "缺失 --" - -#: git-add--interactive.perl -#, perl-format -msgid "unknown --patch mode: %s" -msgstr "未知的 --patch 模å¼ï¼š%s" - -#: git-add--interactive.perl -#, perl-format -msgid "invalid argument %s, expecting --" -msgstr "æ— æ•ˆçš„å‚æ•° %s，期望是 --" - #: git-send-email.perl msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本地时间和 GMT 有ä¸åˆ°ä¸€åˆ†é’Ÿé—´éš”\n" @@ -1,6 +1,8 @@ #include "cache.h" +#include "alloc.h" #include "config.h" #include "commit.h" +#include "hex.h" #include "utf8.h" #include "diff.h" #include "revision.h" @@ -1857,7 +1859,8 @@ static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */ return consumed + 1; } -static size_t userformat_want_item(struct strbuf *sb, const char *placeholder, +static size_t userformat_want_item(struct strbuf *sb UNUSED, + const char *placeholder, void *context) { struct userformat_want *w = context; @@ -1,11 +1,11 @@ #ifndef PRETTY_H #define PRETTY_H -#include "cache.h" #include "date.h" #include "string-list.h" struct commit; +struct repository; struct strbuf; struct process_trailer_options; @@ -153,6 +153,8 @@ int commit_format_is_empty(enum cmit_fmt); /* Make subject of commit message suitable for filename */ void format_sanitized_subject(struct strbuf *sb, const char *msg, size_t len); +int has_non_ascii(const char *text); + /* * Set values of fields in "struct process_trailer_options" * according to trailers arguments. diff --git a/prio-queue.c b/prio-queue.c index d31b48e725..dc2476be53 100644 --- a/prio-queue.c +++ b/prio-queue.c @@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "prio-queue.h" static inline int compare(struct prio_queue *queue, int i, int j) diff --git a/progress.c b/progress.c index 0cdd875d37..9b33a2df32 100644 --- a/progress.c +++ b/progress.c @@ -59,7 +59,7 @@ void progress_test_force_update(void) } -static void progress_interval(int signum) +static void progress_interval(int signum UNUSED) { progress_update = 1; } diff --git a/promisor-remote.c b/promisor-remote.c index faa7612941..1db566982e 100644 --- a/promisor-remote.c +++ b/promisor-remote.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "hex.h" #include "object-store.h" #include "promisor-remote.h" #include "config.h" diff --git a/protocol-caps.c b/protocol-caps.c index bbde91810a..874bc815b4 100644 --- a/protocol-caps.c +++ b/protocol-caps.c @@ -1,9 +1,11 @@ #include "git-compat-util.h" #include "protocol-caps.h" #include "gettext.h" +#include "hex.h" #include "pkt-line.h" #include "strvec.h" #include "hash.h" +#include "hex.h" #include "object.h" #include "object-store.h" #include "string-list.h" diff --git a/prune-packed.c b/prune-packed.c index 261520b472..d2813f6a40 100644 --- a/prune-packed.c +++ b/prune-packed.c @@ -1,3 +1,4 @@ +#include "git-compat-util.h" #include "object-store.h" #include "packfile.h" #include "progress.h" @@ -1,5 +1,7 @@ #include "cache.h" +#include "alloc.h" #include "quote.h" +#include "strbuf.h" #include "strvec.h" int quote_path_fully = 1; diff --git a/range-diff.c b/range-diff.c index 086365dffb..4bd65ab749 100644 --- a/range-diff.c +++ b/range-diff.c @@ -383,7 +383,7 @@ static void output_pair_header(struct diff_options *diffopt, const char *color_new = diff_get_color_opt(diffopt, DIFF_FILE_NEW); const char *color_commit = diff_get_color_opt(diffopt, DIFF_COMMIT); const char *color; - char abbrev = diffopt->abbrev; + int abbrev = diffopt->abbrev; if (abbrev < 0) abbrev = DEFAULT_ABBREV; diff --git a/reachable.c b/reachable.c index aba63ebeb3..c9dab2a66b 100644 --- a/reachable.c +++ b/reachable.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "hex.h" #include "refs.h" #include "tag.h" #include "commit.h" @@ -48,7 +49,9 @@ static int add_one_ref(const char *path, const struct object_id *oid, * The traversal will have already marked us as SEEN, so we * only need to handle any progress reporting here. */ -static void mark_object(struct object *obj, const char *name, void *data) +static void mark_object(struct object *obj UNUSED, + const char *name UNUSED, + void *data) { update_progress(data); } @@ -152,7 +155,8 @@ static int add_recent_loose(const struct object_id *oid, } static int add_recent_packed(const struct object_id *oid, - struct packed_git *p, uint32_t pos, + struct packed_git *p, + uint32_t pos, void *data) { struct object *obj; @@ -202,10 +206,10 @@ int add_unseen_recent_objects_to_traversal(struct rev_info *revs, static int mark_object_seen(const struct object_id *oid, enum object_type type, - int exclude, - uint32_t name_hash, - struct packed_git *found_pack, - off_t found_offset) + int exclude UNUSED, + uint32_t name_hash UNUSED, + struct packed_git *found_pack UNUSED, + off_t found_offset UNUSED) { struct object *obj = lookup_object_by_type(the_repository, oid, type); if (!obj) diff --git a/read-cache.c b/read-cache.c index 35e5657877..1bcf673271 100644 --- a/read-cache.c +++ b/read-cache.c @@ -4,9 +4,11 @@ * Copyright (C) Linus Torvalds, 2005 */ #include "cache.h" +#include "alloc.h" #include "config.h" #include "diff.h" #include "diffcore.h" +#include "hex.h" #include "tempfile.h" #include "lockfile.h" #include "cache-tree.h" @@ -1,3 +1,4 @@ +#include "git-compat-util.h" #include "rebase.h" #include "config.h" #include "gettext.h" diff --git a/ref-filter.c b/ref-filter.c index f8203c6b05..ed802778da 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1,5 +1,6 @@ -#include "builtin.h" -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" +#include "hex.h" #include "parse-options.h" #include "refs.h" #include "wildmatch.h" @@ -13,7 +14,6 @@ #include "ref-filter.h" #include "revision.h" #include "utf8.h" -#include "git-compat-util.h" #include "version.h" #include "trailer.h" #include "wt-status.h" @@ -282,7 +282,8 @@ static int refname_atom_parser_internal(struct refname_atom *atom, const char *a return 0; } -static int remote_ref_atom_parser(struct ref_format *format, struct used_atom *atom, +static int remote_ref_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, const char *arg, struct strbuf *err) { struct string_list params = STRING_LIST_INIT_DUP; @@ -329,7 +330,8 @@ static int remote_ref_atom_parser(struct ref_format *format, struct used_atom *a return 0; } -static int objecttype_atom_parser(struct ref_format *format, struct used_atom *atom, +static int objecttype_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, const char *arg, struct strbuf *err) { if (arg) @@ -341,7 +343,8 @@ static int objecttype_atom_parser(struct ref_format *format, struct used_atom *a return 0; } -static int objectsize_atom_parser(struct ref_format *format, struct used_atom *atom, +static int objectsize_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, const char *arg, struct strbuf *err) { if (!arg) { @@ -361,7 +364,8 @@ static int objectsize_atom_parser(struct ref_format *format, struct used_atom *a return 0; } -static int deltabase_atom_parser(struct ref_format *format, struct used_atom *atom, +static int deltabase_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, const char *arg, struct strbuf *err) { if (arg) @@ -373,7 +377,8 @@ static int deltabase_atom_parser(struct ref_format *format, struct used_atom *at return 0; } -static int body_atom_parser(struct ref_format *format, struct used_atom *atom, +static int body_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, const char *arg, struct strbuf *err) { if (arg) @@ -382,7 +387,8 @@ static int body_atom_parser(struct ref_format *format, struct used_atom *atom, return 0; } -static int subject_atom_parser(struct ref_format *format, struct used_atom *atom, +static int subject_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, const char *arg, struct strbuf *err) { if (!arg) @@ -394,7 +400,8 @@ static int subject_atom_parser(struct ref_format *format, struct used_atom *atom return 0; } -static int trailers_atom_parser(struct ref_format *format, struct used_atom *atom, +static int trailers_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, const char *arg, struct strbuf *err) { atom->u.contents.trailer_opts.no_divider = 1; @@ -448,8 +455,9 @@ static int contents_atom_parser(struct ref_format *format, struct used_atom *ato return 0; } -static int raw_atom_parser(struct ref_format *format, struct used_atom *atom, - const char *arg, struct strbuf *err) +static int raw_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, + const char *arg, struct strbuf *err) { if (!arg) atom->u.raw_data.option = RAW_BARE; @@ -460,7 +468,8 @@ static int raw_atom_parser(struct ref_format *format, struct used_atom *atom, return 0; } -static int oid_atom_parser(struct ref_format *format, struct used_atom *atom, +static int oid_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, const char *arg, struct strbuf *err) { if (!arg) @@ -479,7 +488,8 @@ static int oid_atom_parser(struct ref_format *format, struct used_atom *atom, return 0; } -static int person_email_atom_parser(struct ref_format *format, struct used_atom *atom, +static int person_email_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, const char *arg, struct strbuf *err) { if (!arg) @@ -493,7 +503,8 @@ static int person_email_atom_parser(struct ref_format *format, struct used_atom return 0; } -static int refname_atom_parser(struct ref_format *format, struct used_atom *atom, +static int refname_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, const char *arg, struct strbuf *err) { return refname_atom_parser_internal(&atom->u.refname, arg, atom->name, err); @@ -510,7 +521,8 @@ static align_type parse_align_position(const char *s) return -1; } -static int align_atom_parser(struct ref_format *format, struct used_atom *atom, +static int align_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, const char *arg, struct strbuf *err) { struct align *align = &atom->u.align; @@ -562,7 +574,8 @@ static int align_atom_parser(struct ref_format *format, struct used_atom *atom, return 0; } -static int if_atom_parser(struct ref_format *format, struct used_atom *atom, +static int if_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, const char *arg, struct strbuf *err) { if (!arg) { @@ -577,7 +590,8 @@ static int if_atom_parser(struct ref_format *format, struct used_atom *atom, return 0; } -static int rest_atom_parser(struct ref_format *format, struct used_atom *atom, +static int rest_atom_parser(struct ref_format *format, + struct used_atom *atom UNUSED, const char *arg, struct strbuf *err) { if (arg) @@ -586,7 +600,8 @@ static int rest_atom_parser(struct ref_format *format, struct used_atom *atom, return 0; } -static int head_atom_parser(struct ref_format *format, struct used_atom *atom, +static int head_atom_parser(struct ref_format *format UNUSED, + struct used_atom *atom, const char *arg, struct strbuf *err) { if (arg) @@ -791,7 +806,7 @@ static void quote_formatting(struct strbuf *s, const char *str, ssize_t len, int } static int append_atom(struct atom_value *v, struct ref_formatting_state *state, - struct strbuf *unused_err) + struct strbuf *err UNUSED) { /* * Quote formatting is only done when the stack has a single @@ -841,7 +856,7 @@ static void end_align_handler(struct ref_formatting_stack **stack) } static int align_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state, - struct strbuf *unused_err) + struct strbuf *err UNUSED) { struct ref_formatting_stack *new_stack; @@ -888,7 +903,7 @@ static void if_then_else_handler(struct ref_formatting_stack **stack) } static int if_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state, - struct strbuf *unused_err) + struct strbuf *err UNUSED) { struct ref_formatting_stack *new_stack; struct if_then_else *if_then_else = xcalloc(1, @@ -915,7 +930,8 @@ static int is_empty(struct strbuf *buf) return cur == end; } -static int then_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state, +static int then_atom_handler(struct atom_value *atomv UNUSED, + struct ref_formatting_state *state, struct strbuf *err) { struct ref_formatting_stack *cur = state->stack; @@ -952,7 +968,8 @@ static int then_atom_handler(struct atom_value *atomv, struct ref_formatting_sta return 0; } -static int else_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state, +static int else_atom_handler(struct atom_value *atomv UNUSED, + struct ref_formatting_state *state, struct strbuf *err) { struct ref_formatting_stack *prev = state->stack; @@ -973,7 +990,8 @@ static int else_atom_handler(struct atom_value *atomv, struct ref_formatting_sta return 0; } -static int end_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state, +static int end_atom_handler(struct atom_value *atomv UNUSED, + struct ref_formatting_state *state, struct strbuf *err) { struct ref_formatting_stack *current = state->stack; @@ -1822,7 +1840,7 @@ static void lazy_init_worktree_map(void) populate_worktree_map(&(ref_to_worktree_map.map), ref_to_worktree_map.worktrees); } -static char *get_worktree_path(const struct used_atom *atom, const struct ref_array_item *ref) +static char *get_worktree_path(const struct ref_array_item *ref) { struct hashmap_entry entry, *e; struct ref_to_worktree_entry *lookup_result; @@ -1881,7 +1899,7 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err) refname = get_refname(atom, ref); else if (atom_type == ATOM_WORKTREEPATH) { if (ref->kind == FILTER_REFS_BRANCHES) - v->s = get_worktree_path(atom, ref); + v->s = get_worktree_path(ref); else v->s = xstrdup(""); continue; diff --git a/reflog-walk.c b/reflog-walk.c index 8a4d8fa3bd..4ba1a10c82 100644 --- a/reflog-walk.c +++ b/reflog-walk.c @@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "commit.h" #include "refs.h" #include "diff.h" diff --git a/reflog-walk.h b/reflog-walk.h index 8076f10d9f..4d93a26957 100644 --- a/reflog-walk.h +++ b/reflog-walk.h @@ -1,8 +1,6 @@ #ifndef REFLOG_WALK_H #define REFLOG_WALK_H -#include "cache.h" - struct commit; struct reflog_walk_info; struct date_mode; @@ -2,9 +2,11 @@ * The backend-independent part of the reference module. */ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" #include "hashmap.h" +#include "hex.h" #include "lockfile.h" #include "iterator.h" #include "refs.h" diff --git a/refs/debug.c b/refs/debug.c index eed8bc94b0..adc34c836f 100644 --- a/refs/debug.c +++ b/refs/debug.c @@ -1,4 +1,5 @@ - +#include "git-compat-util.h" +#include "hex.h" #include "refs-internal.h" #include "trace.h" diff --git a/refs/files-backend.c b/refs/files-backend.c index b89954355d..31bc5c45ee 100644 --- a/refs/files-backend.c +++ b/refs/files-backend.c @@ -1,9 +1,11 @@ #include "../cache.h" #include "../config.h" +#include "../hex.h" #include "../refs.h" #include "refs-internal.h" #include "ref-cache.h" #include "packed-backend.h" +#include "../ident.h" #include "../iterator.h" #include "../dir-iterator.h" #include "../lockfile.h" diff --git a/refs/packed-backend.c b/refs/packed-backend.c index 6f5a0709fb..b665d0f7d9 100644 --- a/refs/packed-backend.c +++ b/refs/packed-backend.c @@ -1,5 +1,7 @@ -#include "../cache.h" +#include "../git-compat-util.h" +#include "../alloc.h" #include "../config.h" +#include "../hex.h" #include "../refs.h" #include "refs-internal.h" #include "packed-backend.h" diff --git a/refs/ref-cache.c b/refs/ref-cache.c index 32afd8a40b..dc1ca49c85 100644 --- a/refs/ref-cache.c +++ b/refs/ref-cache.c @@ -1,4 +1,5 @@ -#include "../cache.h" +#include "../git-compat-util.h" +#include "../alloc.h" #include "../refs.h" #include "refs-internal.h" #include "ref-cache.h" diff --git a/refs/refs-internal.h b/refs/refs-internal.h index 69f93b0e2a..a85d113123 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -1,7 +1,6 @@ #ifndef REFS_REFS_INTERNAL_H #define REFS_REFS_INTERNAL_H -#include "cache.h" #include "refs.h" #include "iterator.h" @@ -1,4 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" +#include "hex.h" #include "strvec.h" #include "refs.h" #include "refspec.h" diff --git a/remote-curl.c b/remote-curl.c index a76b6405eb..ed7e3a043a 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" +#include "hex.h" #include "remote.h" #include "connect.h" #include "strbuf.h" @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" +#include "hex.h" #include "remote.h" #include "urlmatch.h" #include "refs.h" @@ -1,7 +1,6 @@ #ifndef REMOTE_H #define REMOTE_H -#include "cache.h" #include "parse-options.h" #include "hashmap.h" #include "refspec.h" diff --git a/replace-object.c b/replace-object.c index 320be2522d..0cf056c4fb 100644 --- a/replace-object.c +++ b/replace-object.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "hex.h" #include "oidmap.h" #include "object-store.h" #include "replace-object.h" diff --git a/replace-object.h b/replace-object.h index 3fbc32eb7b..500482b02b 100644 --- a/replace-object.h +++ b/replace-object.h @@ -5,6 +5,14 @@ #include "repository.h" #include "object-store.h" +/* + * Do replace refs need to be checked this run? This variable is + * initialized to true unless --no-replace-object is used or + * $GIT_NO_REPLACE_OBJECTS is set, but is set to false by some + * commands that do not want replace references to be active. + */ +extern int read_replace_refs; + struct replace_object { struct oidmap_entry original; struct object_id replacement; diff --git a/repo-settings.c b/repo-settings.c index 3dbd3f0e2e..0a6c0b381f 100644 --- a/repo-settings.c +++ b/repo-settings.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "repository.h" #include "midx.h" diff --git a/repository.h b/repository.h index e8c67ffe16..15a8afc5fb 100644 --- a/repository.h +++ b/repository.h @@ -1,7 +1,6 @@ #ifndef REPOSITORY_H #define REPOSITORY_H -#include "git-compat-util.h" #include "path.h" struct config_set; @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" +#include "hex.h" #include "lockfile.h" #include "string-list.h" #include "rerere.h" @@ -1,5 +1,6 @@ #include "git-compat-util.h" #include "cache-tree.h" +#include "hex.h" #include "lockfile.h" #include "refs.h" #include "reset.h" diff --git a/revision.c b/revision.c index 21f5f572c2..e4c066e90b 100644 --- a/revision.c +++ b/revision.c @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" +#include "hex.h" #include "object-store.h" #include "tag.h" #include "blob.h" @@ -1574,7 +1576,8 @@ void exclude_hidden_refs(struct ref_exclusions *exclusions, const char *section) { struct exclude_hidden_refs_cb cb; - if (strcmp(section, "receive") && strcmp(section, "uploadpack")) + if (strcmp(section, "fetch") && strcmp(section, "receive") && + strcmp(section, "uploadpack")) die(_("unsupported section for hidden refs: %s"), section); if (exclusions->hidden_refs_configured) @@ -3440,8 +3443,8 @@ void reset_revision_walk(void) } static int mark_uninteresting(const struct object_id *oid, - struct packed_git *pack, - uint32_t pos, + struct packed_git *pack UNUSED, + uint32_t pos UNUSED, void *cb) { struct rev_info *revs = cb; @@ -4159,7 +4162,7 @@ static struct commit *get_revision_1(struct rev_info *revs) * Return true for entries that have not yet been shown. (This is an * object_array_each_func_t.) */ -static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused) +static int entry_unshown(struct object_array_entry *entry, void *cb_data UNUSED) { return !(entry->item->flags & SHOWN); } diff --git a/revision.h b/revision.h index 30febad09a..ab71443696 100644 --- a/revision.h +++ b/revision.h @@ -8,6 +8,7 @@ #include "pretty.h" #include "diff.h" #include "commit-slab-decl.h" +#include "ident.h" #include "list-objects-filter-options.h" /** diff --git a/run-command.c b/run-command.c index 6bd16acb06..ba617655b2 100644 --- a/run-command.c +++ b/run-command.c @@ -341,19 +341,19 @@ static void child_close_pair(int fd[2]) child_close(fd[1]); } -static void child_error_fn(const char *err, va_list params) +static void child_error_fn(const char *err UNUSED, va_list params UNUSED) { const char msg[] = "error() should not be called in child\n"; xwrite(2, msg, sizeof(msg) - 1); } -static void child_warn_fn(const char *err, va_list params) +static void child_warn_fn(const char *err UNUSED, va_list params UNUSED) { const char msg[] = "warn() should not be called in child\n"; xwrite(2, msg, sizeof(msg) - 1); } -static void NORETURN child_die_fn(const char *err, va_list params) +static void NORETURN child_die_fn(const char *err UNUSED, va_list params UNUSED) { const char msg[] = "die() should not be called in child\n"; xwrite(2, msg, sizeof(msg) - 1); diff --git a/send-pack.c b/send-pack.c index f2e19838c9..423a5cfe22 100644 --- a/send-pack.c +++ b/send-pack.c @@ -1,6 +1,7 @@ -#include "builtin.h" +#include "git-compat-util.h" #include "config.h" #include "commit.h" +#include "hex.h" #include "refs.h" #include "object-store.h" #include "pkt-line.h" diff --git a/sequencer.c b/sequencer.c index a7e6db4f78..fb99115be5 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1,5 +1,7 @@ #include "cache.h" +#include "alloc.h" #include "config.h" +#include "hex.h" #include "lockfile.h" #include "dir.h" #include "object-store.h" @@ -263,10 +265,6 @@ static int git_sequencer_config(const char *k, const char *v, void *cb) if (opts->action == REPLAY_REVERT && !strcmp(k, "revert.reference")) opts->commit_use_reference = git_config_bool(k, v); - status = git_gpg_config(k, v, NULL); - if (status) - return status; - return git_diff_basic_config(k, v, NULL); } @@ -2479,12 +2477,11 @@ static int is_command(enum todo_command command, const char **bol) { const char *str = todo_command_info[command].str; const char nick = todo_command_info[command].c; - const char *p = *bol + 1; + const char *p = *bol; - return skip_prefix(*bol, str, bol) || - ((nick && **bol == nick) && - (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r' || !*p) && - (*bol = p)); + return (skip_prefix(p, str, &p) || (nick && *p++ == nick)) && + (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r' || !*p) && + (*bol = p); } static int check_label_or_ref_arg(enum todo_command command, const char *arg) @@ -2541,7 +2538,8 @@ static int parse_insn_line(struct repository *r, struct todo_item *item, break; } if (i >= TODO_COMMENT) - return -1; + return error(_("invalid command '%.*s'"), + (int)strcspn(bol, " \t\r\n"), bol); /* Eat up extra spaces/ tabs before object name */ padding = strspn(bol, " \t"); @@ -2579,12 +2577,10 @@ static int parse_insn_line(struct repository *r, struct todo_item *item, } if (item->command == TODO_FIXUP) { - if (skip_prefix(bol, "-C", &bol) && - (*bol == ' ' || *bol == '\t')) { + if (skip_prefix(bol, "-C", &bol)) { bol += strspn(bol, " \t"); item->flags |= TODO_REPLACE_FIXUP_MSG; - } else if (skip_prefix(bol, "-c", &bol) && - (*bol == ' ' || *bol == '\t')) { + } else if (skip_prefix(bol, "-c", &bol)) { bol += strspn(bol, " \t"); item->flags |= TODO_EDIT_FIXUP_MSG; } diff --git a/sequencer.h b/sequencer.h index 3bcdfa1b58..33dbaf5b66 100644 --- a/sequencer.h +++ b/sequencer.h @@ -1,11 +1,11 @@ #ifndef SEQUENCER_H #define SEQUENCER_H -#include "cache.h" #include "strbuf.h" #include "wt-status.h" struct commit; +struct index_state; struct repository; const char *git_path_commit_editmsg(void); @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "repository.h" #include "config.h" #include "pkt-line.h" @@ -8,17 +8,18 @@ #include "serve.h" #include "upload-pack.h" #include "bundle-uri.h" +#include "trace2.h" static int advertise_sid = -1; static int client_hash_algo = GIT_HASH_SHA1; -static int always_advertise(struct repository *r, - struct strbuf *value) +static int always_advertise(struct repository *r UNUSED, + struct strbuf *value UNUSED) { return 1; } -static int agent_advertise(struct repository *r, +static int agent_advertise(struct repository *r UNUSED, struct strbuf *value) { if (value) @@ -34,7 +35,7 @@ static int object_format_advertise(struct repository *r, return 1; } -static void object_format_receive(struct repository *r, +static void object_format_receive(struct repository *r UNUSED, const char *algo_name) { if (!algo_name) @@ -48,7 +49,7 @@ static void object_format_receive(struct repository *r, static int session_id_advertise(struct repository *r, struct strbuf *value) { if (advertise_sid == -1 && - git_config_get_bool("transfer.advertisesid", &advertise_sid)) + repo_config_get_bool(r, "transfer.advertisesid", &advertise_sid)) advertise_sid = 0; if (!advertise_sid) return 0; @@ -57,7 +58,7 @@ static int session_id_advertise(struct repository *r, struct strbuf *value) return 1; } -static void session_id_receive(struct repository *r, +static void session_id_receive(struct repository *r UNUSED, const char *client_sid) { if (!client_sid) diff --git a/server-info.c b/server-info.c index 0ec6c0c165..4043689202 100644 --- a/server-info.c +++ b/server-info.c @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "dir.h" +#include "hex.h" #include "repository.h" #include "refs.h" #include "object.h" diff --git a/sha1dc_git.c b/sha1dc_git.c index 5c300e812e..9b675a046e 100644 --- a/sha1dc_git.c +++ b/sha1dc_git.c @@ -1,4 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "sha1dc_git.h" +#include "hex.h" #ifdef DC_SHA1_EXTERNAL /* @@ -1,4 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" +#include "hex.h" #include "repository.h" #include "tempfile.h" #include "lockfile.h" @@ -6,6 +6,8 @@ #include "repository.h" #include "strbuf.h" +struct oid_array; + void set_alternate_shallow_file(struct repository *r, const char *path, int override); int register_shallow(struct repository *r, const struct object_id *oid); int unregister_shallow(const struct object_id *oid); @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "quote.h" #include "exec-cmd.h" #include "strbuf.h" diff --git a/sigchain.c b/sigchain.c index 022677b6ab..ee778c0580 100644 --- a/sigchain.c +++ b/sigchain.c @@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "sigchain.h" #define SIGCHAIN_MAX_SIGNALS 32 diff --git a/sparse-index.c b/sparse-index.c index 147a13386a..63216b3e57 100644 --- a/sparse-index.c +++ b/sparse-index.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "alloc.h" #include "repository.h" #include "sparse-index.h" #include "tree.h" diff --git a/split-index.c b/split-index.c index 5d0f04763e..95ecfa5319 100644 --- a/split-index.c +++ b/split-index.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "alloc.h" #include "split-index.h" #include "ewah/ewok.h" diff --git a/statinfo.h b/statinfo.h new file mode 100644 index 0000000000..e49e3054ea --- /dev/null +++ b/statinfo.h @@ -0,0 +1,24 @@ +#ifndef STATINFO_H +#define STATINFO_H + +/* + * The "cache_time" is just the low 32 bits of the + * time. It doesn't matter if it overflows - we only + * check it for equality in the 32 bits we save. + */ +struct cache_time { + uint32_t sec; + uint32_t nsec; +}; + +struct stat_data { + struct cache_time sd_ctime; + struct cache_time sd_mtime; + unsigned int sd_dev; + unsigned int sd_ino; + unsigned int sd_uid; + unsigned int sd_gid; + unsigned int sd_size; +}; + +#endif @@ -1,4 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" +#include "hex.h" #include "refs.h" #include "string-list.h" #include "utf8.h" diff --git a/string-list.c b/string-list.c index 42bacaec55..db473f273e 100644 --- a/string-list.c +++ b/string-list.c @@ -1,5 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" #include "string-list.h" +#include "alloc.h" void string_list_init_nodup(struct string_list *list) { @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" #include "strvec.h" +#include "alloc.h" +#include "hex.h" #include "strbuf.h" const char *empty_strvec[] = { NULL }; diff --git a/sub-process.c b/sub-process.c index 6d4232294d..1daf5a9752 100644 --- a/sub-process.c +++ b/sub-process.c @@ -1,6 +1,7 @@ /* * Generic implementation of background process infrastructure. */ +#include "git-compat-util.h" #include "sub-process.h" #include "sigchain.h" #include "pkt-line.h" diff --git a/sub-process.h b/sub-process.h index e85f21fa1a..6a61638a8a 100644 --- a/sub-process.h +++ b/sub-process.h @@ -1,7 +1,6 @@ #ifndef SUBPROCESS_H #define SUBPROCESS_H -#include "git-compat-util.h" #include "hashmap.h" #include "run-command.h" diff --git a/submodule-config.c b/submodule-config.c index 4dc61b3a78..89a7bf0a93 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -1,5 +1,7 @@ #include "cache.h" +#include "alloc.h" #include "dir.h" +#include "hex.h" #include "repository.h" #include "config.h" #include "submodule-config.h" diff --git a/submodule-config.h b/submodule-config.h index 28a8ca6bf4..c2045875bb 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -1,7 +1,6 @@ #ifndef SUBMODULE_CONFIG_CACHE_H #define SUBMODULE_CONFIG_CACHE_H -#include "cache.h" #include "config.h" #include "hashmap.h" #include "submodule.h" diff --git a/submodule.c b/submodule.c index 3a0dfc417c..2a057c35b7 100644 --- a/submodule.c +++ b/submodule.c @@ -1,5 +1,5 @@ - -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "repository.h" #include "config.h" #include "submodule-config.h" @@ -7,6 +7,7 @@ #include "dir.h" #include "diff.h" #include "commit.h" +#include "hex.h" #include "revision.h" #include "run-command.h" #include "diffcore.h" @@ -1739,7 +1740,7 @@ static int get_next_submodule(struct child_process *cp, struct strbuf *err, return 0; } -static int fetch_start_failure(struct strbuf *err, +static int fetch_start_failure(struct strbuf *err UNUSED, void *cb, void *task_cb) { struct submodule_parallel_fetch *spf = cb; @@ -1760,7 +1761,7 @@ static int commit_missing_in_sub(const struct object_id *oid, void *data) return type != OBJ_COMMIT; } -static int fetch_finish(int retvalue, struct strbuf *err, +static int fetch_finish(int retvalue, struct strbuf *err UNUSED, void *cb, void *task_cb) { struct submodule_parallel_fetch *spf = cb; diff --git a/t/helper/test-bloom.c b/t/helper/test-bloom.c index 6c900ca668..127f134a2a 100644 --- a/t/helper/test-bloom.c +++ b/t/helper/test-bloom.c @@ -1,5 +1,6 @@ -#include "git-compat-util.h" +#include "cache.h" #include "bloom.h" +#include "hex.h" #include "test-tool.h" #include "commit.h" diff --git a/t/helper/test-cache-tree.c b/t/helper/test-cache-tree.c index 9159a17301..615e648e55 100644 --- a/t/helper/test-cache-tree.c +++ b/t/helper/test-cache-tree.c @@ -1,6 +1,7 @@ #define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "cache.h" +#include "hex.h" #include "tree.h" #include "cache-tree.h" #include "parse-options.h" diff --git a/t/helper/test-crontab.c b/t/helper/test-crontab.c index e6c1b1e22b..597027a96e 100644 --- a/t/helper/test-crontab.c +++ b/t/helper/test-crontab.c @@ -1,5 +1,4 @@ #include "test-tool.h" -#include "cache.h" /* * Usage: test-tool crontab <file> -l|<input> diff --git a/t/helper/test-ctype.c b/t/helper/test-ctype.c index b21bd672d9..534ca66441 100644 --- a/t/helper/test-ctype.c +++ b/t/helper/test-ctype.c @@ -1,5 +1,4 @@ #include "test-tool.h" -#include "cache.h" static int rc; diff --git a/t/helper/test-dump-cache-tree.c b/t/helper/test-dump-cache-tree.c index 454f17b1a0..92dfc1aa8c 100644 --- a/t/helper/test-dump-cache-tree.c +++ b/t/helper/test-dump-cache-tree.c @@ -1,6 +1,7 @@ #define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "cache.h" +#include "hex.h" #include "tree.h" #include "cache-tree.h" diff --git a/t/helper/test-dump-split-index.c b/t/helper/test-dump-split-index.c index 0ea97b8407..813d0a38fa 100644 --- a/t/helper/test-dump-split-index.c +++ b/t/helper/test-dump-split-index.c @@ -1,6 +1,7 @@ #define USE_THE_INDEX_VARIABLE #include "test-tool.h" #include "cache.h" +#include "hex.h" #include "split-index.h" #include "ewah/ewok.h" diff --git a/t/helper/test-dump-untracked-cache.c b/t/helper/test-dump-untracked-cache.c index 6d53683f13..af953fabe8 100644 --- a/t/helper/test-dump-untracked-cache.c +++ b/t/helper/test-dump-untracked-cache.c @@ -2,6 +2,7 @@ #include "test-tool.h" #include "cache.h" #include "dir.h" +#include "hex.h" static int compare_untracked(const void *a_, const void *b_) { diff --git a/t/helper/test-example-decorate.c b/t/helper/test-example-decorate.c index b9d1200eb9..7c7fc8efc1 100644 --- a/t/helper/test-example-decorate.c +++ b/t/helper/test-example-decorate.c @@ -1,5 +1,5 @@ #include "test-tool.h" -#include "cache.h" +#include "git-compat-util.h" #include "object.h" #include "decorate.h" diff --git a/t/helper/test-fast-rebase.c b/t/helper/test-fast-rebase.c index efc82dd80c..b1edb92a03 100644 --- a/t/helper/test-fast-rebase.c +++ b/t/helper/test-fast-rebase.c @@ -15,6 +15,7 @@ #include "cache-tree.h" #include "commit.h" +#include "hex.h" #include "lockfile.h" #include "merge-ort.h" #include "refs.h" diff --git a/t/helper/test-hash.c b/t/helper/test-hash.c index 5860dab0ff..016248106a 100644 --- a/t/helper/test-hash.c +++ b/t/helper/test-hash.c @@ -1,5 +1,6 @@ #include "test-tool.h" #include "cache.h" +#include "hex.h" int cmd_hash_impl(int ac, const char **av, int algo) { diff --git a/t/helper/test-json-writer.c b/t/helper/test-json-writer.c index 8c3edacc00..86887f5320 100644 --- a/t/helper/test-json-writer.c +++ b/t/helper/test-json-writer.c @@ -1,5 +1,4 @@ #include "test-tool.h" -#include "cache.h" #include "json-writer.h" static const char *expect_obj1 = "{\"a\":\"abc\",\"b\":42,\"c\":true}"; diff --git a/t/helper/test-match-trees.c b/t/helper/test-match-trees.c index 4079fdee06..04bc2563f3 100644 --- a/t/helper/test-match-trees.c +++ b/t/helper/test-match-trees.c @@ -1,5 +1,6 @@ #include "test-tool.h" #include "cache.h" +#include "hex.h" #include "tree.h" int cmd__match_trees(int ac, const char **av) diff --git a/t/helper/test-oid-array.c b/t/helper/test-oid-array.c index d1324d086a..0906993ad5 100644 --- a/t/helper/test-oid-array.c +++ b/t/helper/test-oid-array.c @@ -1,5 +1,6 @@ #include "test-tool.h" #include "cache.h" +#include "hex.h" #include "oid-array.h" static int print_oid(const struct object_id *oid, void *data) diff --git a/t/helper/test-oidmap.c b/t/helper/test-oidmap.c index 0acf99931e..883d40efd4 100644 --- a/t/helper/test-oidmap.c +++ b/t/helper/test-oidmap.c @@ -1,5 +1,6 @@ #include "test-tool.h" #include "cache.h" +#include "hex.h" #include "oidmap.h" #include "strbuf.h" diff --git a/t/helper/test-oidtree.c b/t/helper/test-oidtree.c index d48a409f4e..0b82431a70 100644 --- a/t/helper/test-oidtree.c +++ b/t/helper/test-oidtree.c @@ -1,5 +1,6 @@ #include "test-tool.h" #include "cache.h" +#include "hex.h" #include "oidtree.h" static enum cb_next print_oid(const struct object_id *oid, void *data) diff --git a/t/helper/test-pack-mtimes.c b/t/helper/test-pack-mtimes.c index f7b79daf4c..f68b3761b6 100644 --- a/t/helper/test-pack-mtimes.c +++ b/t/helper/test-pack-mtimes.c @@ -1,5 +1,6 @@ #include "git-compat-util.h" #include "test-tool.h" +#include "hex.h" #include "strbuf.h" #include "object-store.h" #include "packfile.h" diff --git a/t/helper/test-partial-clone.c b/t/helper/test-partial-clone.c index 3f102cfddd..da17fd37eb 100644 --- a/t/helper/test-partial-clone.c +++ b/t/helper/test-partial-clone.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "hex.h" #include "test-tool.h" #include "repository.h" #include "object-store.h" diff --git a/t/helper/test-pcre2-config.c b/t/helper/test-pcre2-config.c index 5258fdddba..5d0b2a2e10 100644 --- a/t/helper/test-pcre2-config.c +++ b/t/helper/test-pcre2-config.c @@ -1,5 +1,4 @@ #include "test-tool.h" -#include "cache.h" #include "grep.h" int cmd__pcre2_config(int argc, const char **argv) diff --git a/t/helper/test-prio-queue.c b/t/helper/test-prio-queue.c index 133b5e6f4a..4915412e07 100644 --- a/t/helper/test-prio-queue.c +++ b/t/helper/test-prio-queue.c @@ -1,8 +1,7 @@ #include "test-tool.h" -#include "cache.h" #include "prio-queue.h" -static int intcmp(const void *va, const void *vb, void *data) +static int intcmp(const void *va, const void *vb, void *data UNUSED) { const int *a = va, *b = vb; return *a - *b; diff --git a/t/helper/test-proc-receive.c b/t/helper/test-proc-receive.c index a4b305f494..7e12d4f9aa 100644 --- a/t/helper/test-proc-receive.c +++ b/t/helper/test-proc-receive.c @@ -1,5 +1,6 @@ #include "cache.h" #include "connect.h" +#include "hex.h" #include "parse-options.h" #include "pkt-line.h" #include "sigchain.h" diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c index 2f65c7f6a5..de8f26639d 100644 --- a/t/helper/test-reach.c +++ b/t/helper/test-reach.c @@ -1,8 +1,9 @@ #include "test-tool.h" -#include "cache.h" +#include "alloc.h" #include "commit.h" #include "commit-reach.h" #include "config.h" +#include "hex.h" #include "parse-options.h" #include "ref-filter.h" #include "string-list.h" diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c index 27072ba94d..0a883cdf26 100644 --- a/t/helper/test-read-midx.c +++ b/t/helper/test-read-midx.c @@ -1,5 +1,6 @@ #include "test-tool.h" #include "cache.h" +#include "hex.h" #include "midx.h" #include "repository.h" #include "object-store.h" diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c index ae8a5648da..1745b088b7 100644 --- a/t/helper/test-ref-store.c +++ b/t/helper/test-ref-store.c @@ -1,5 +1,6 @@ #include "test-tool.h" #include "cache.h" +#include "hex.h" #include "refs.h" #include "worktree.h" #include "object-store.h" diff --git a/t/helper/test-repository.c b/t/helper/test-repository.c index 56f0e3c1be..10a6dfc216 100644 --- a/t/helper/test-repository.c +++ b/t/helper/test-repository.c @@ -3,6 +3,7 @@ #include "commit-graph.h" #include "commit.h" #include "config.h" +#include "hex.h" #include "object-store.h" #include "object.h" #include "repository.h" diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c index 3ecb830f4a..b0d041ec5f 100644 --- a/t/helper/test-run-command.c +++ b/t/helper/test-run-command.c @@ -9,8 +9,6 @@ */ #include "test-tool.h" -#include "git-compat-util.h" -#include "cache.h" #include "run-command.h" #include "strvec.h" #include "strbuf.h" @@ -24,7 +22,7 @@ static int number_callbacks; static int parallel_next(struct child_process *cp, struct strbuf *err, void *cb, - void **task_cb) + void **task_cb UNUSED) { struct child_process *d = cb; if (number_callbacks >= 4) @@ -40,10 +38,10 @@ static int parallel_next(struct child_process *cp, return 1; } -static int no_job(struct child_process *cp, +static int no_job(struct child_process *cp UNUSED, struct strbuf *err, - void *cb, - void **task_cb) + void *cb UNUSED, + void **task_cb UNUSED) { if (err) strbuf_addstr(err, "no further jobs available\n"); @@ -52,10 +50,10 @@ static int no_job(struct child_process *cp, return 0; } -static int task_finished(int result, +static int task_finished(int result UNUSED, struct strbuf *err, - void *pp_cb, - void *pp_task_cb) + void *pp_cb UNUSED, + void *pp_task_cb UNUSED) { if (err) strbuf_addstr(err, "asking for a quick stop\n"); diff --git a/t/helper/test-sigchain.c b/t/helper/test-sigchain.c index d013bccdda..d1cf7377b7 100644 --- a/t/helper/test-sigchain.c +++ b/t/helper/test-sigchain.c @@ -1,5 +1,4 @@ #include "test-tool.h" -#include "cache.h" #include "sigchain.h" #define X(f) \ diff --git a/t/helper/test-simple-ipc.c b/t/helper/test-simple-ipc.c index 28365ff85b..3d1436da59 100644 --- a/t/helper/test-simple-ipc.c +++ b/t/helper/test-simple-ipc.c @@ -3,13 +3,14 @@ */ #include "test-tool.h" -#include "cache.h" +#include "gettext.h" #include "strbuf.h" #include "simple-ipc.h" #include "parse-options.h" #include "thread-utils.h" #include "strvec.h" #include "run-command.h" +#include "trace2.h" #ifndef SUPPORTS_SIMPLE_IPC int cmd__simple_ipc(int argc, const char **argv) diff --git a/t/helper/test-submodule-nested-repo-config.c b/t/helper/test-submodule-nested-repo-config.c index dc1c14bde3..a3848a8b66 100644 --- a/t/helper/test-submodule-nested-repo-config.c +++ b/t/helper/test-submodule-nested-repo-config.c @@ -1,4 +1,5 @@ #include "test-tool.h" +#include "cache.h" #include "submodule-config.h" static void die_usage(const char **argv, const char *msg) diff --git a/t/helper/test-wildmatch.c b/t/helper/test-wildmatch.c index 2c103d1824..a95bb4da9b 100644 --- a/t/helper/test-wildmatch.c +++ b/t/helper/test-wildmatch.c @@ -1,5 +1,4 @@ #include "test-tool.h" -#include "cache.h" int cmd__wildmatch(int argc, const char **argv) { diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 059fd74adb..3e876536eb 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -142,6 +142,7 @@ prepare_httpd() { install_script error-smart-http.sh install_script error.sh install_script apply-one-time-perl.sh + install_script nph-custom-auth.sh ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules" @@ -290,11 +291,11 @@ expect_askpass() { none) ;; pass) - echo "askpass: Password for 'http://$2@$dest': " + echo "askpass: Password for '$HTTPD_PROTO://$2@$dest': " ;; both) - echo "askpass: Username for 'http://$dest': " - echo "askpass: Password for 'http://$2@$dest': " + echo "askpass: Username for '$HTTPD_PROTO://$dest': " + echo "askpass: Password for '$HTTPD_PROTO://$2@$dest': " ;; *) false diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index e31293a45f..f43a25c1f1 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -31,7 +31,7 @@ ErrorLog error.log <IfDefine HTTP2> LoadModule http2_module modules/mod_http2.so -Protocols h2c +Protocols h2 h2c </IfDefine> <IfModule !mod_auth_basic.c> @@ -141,6 +141,11 @@ Alias /auth/dumb/ www/auth/dumb/ SetEnv GIT_HTTP_EXPORT_ALL SetEnv GIT_PROTOCOL </LocationMatch> +<LocationMatch /custom_auth/> + SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH} + SetEnv GIT_HTTP_EXPORT_ALL + CGIPassAuth on +</LocationMatch> ScriptAlias /smart/incomplete_length/git-upload-pack incomplete-length-upload-pack-v2-http.sh/ ScriptAlias /smart/incomplete_body/git-upload-pack incomplete-body-upload-pack-v2-http.sh/ ScriptAlias /smart/no_report/git-receive-pack error-no-report.sh/ @@ -150,6 +155,7 @@ ScriptAlias /broken_smart/ broken-smart-http.sh/ ScriptAlias /error_smart/ error-smart-http.sh/ ScriptAlias /error/ error.sh/ ScriptAliasMatch /one_time_perl/(.*) apply-one-time-perl.sh/$1 +ScriptAliasMatch /custom_auth/(.*) nph-custom-auth.sh/$1 <Directory ${GIT_EXEC_PATH}> Options FollowSymlinks </Directory> diff --git a/t/lib-httpd/nph-custom-auth.sh b/t/lib-httpd/nph-custom-auth.sh new file mode 100644 index 0000000000..f5345e775e --- /dev/null +++ b/t/lib-httpd/nph-custom-auth.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +VALID_CREDS_FILE=custom-auth.valid +CHALLENGE_FILE=custom-auth.challenge + +# +# If $VALID_CREDS_FILE exists in $HTTPD_ROOT_PATH, consider each line as a valid +# credential for the current request. Each line in the file is considered a +# valid HTTP Authorization header value. For example: +# +# Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA== +# +# If $CHALLENGE_FILE exists in $HTTPD_ROOT_PATH, output the contents as headers +# in a 401 response if no valid authentication credentials were included in the +# request. For example: +# +# WWW-Authenticate: Bearer authorize_uri="id.example.com" p=1 q=0 +# WWW-Authenticate: Basic realm="example.com" +# + +if test -n "$HTTP_AUTHORIZATION" && \ + grep -Fqsx "${HTTP_AUTHORIZATION}" "$VALID_CREDS_FILE" +then + # Note that although git-http-backend returns a status line, it + # does so using a CGI 'Status' header. Because this script is an + # No Parsed Headers (NPH) script, we must return a real HTTP + # status line. + # This is only a test script, so we don't bother to check for + # the actual status from git-http-backend and always return 200. + echo 'HTTP/1.1 200 OK' + exec "$GIT_EXEC_PATH"/git-http-backend +fi + +echo 'HTTP/1.1 401 Authorization Required' +if test -f "$CHALLENGE_FILE" +then + cat "$CHALLENGE_FILE" +fi +echo diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index b57541356b..7ca5b918f0 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -60,7 +60,7 @@ set_fake_editor () { ">") echo >> "$1";; bad) - action="badcmd";; + action="pickled";; fakesha) test \& != "$action" || action=pick echo "$action XXXXXXX False commit" >> "$1" @@ -211,6 +211,9 @@ check_reworded_commits () { # usage: set_replace_editor <file> # # Replace the todo file with the exact contents of the given file. +# N.B. sets GIT_SEQUENCE_EDITOR rather than EDITOR so it can be +# combined with set_fake_editor to reword commits and replace the +# todo list set_replace_editor () { cat >script <<-\EOF && cat FILENAME >"$1" @@ -219,6 +222,7 @@ set_replace_editor () { cat "$1" EOF - sed -e "s/FILENAME/$1/g" <script | write_script fake-editor.sh && - test_set_editor "$(pwd)/fake-editor.sh" + sed -e "s/FILENAME/$1/g" script | + write_script fake-sequence-editor.sh && + test_set_sequence_editor "$(pwd)/fake-sequence-editor.sh" } diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index fdb886dfe4..bca46378b2 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -1023,4 +1023,34 @@ test_expect_success 'fsck error on gitattributes with excessive size' ' test_cmp expected actual ' +test_expect_success 'fsck detects problems in worktree index' ' + test_when_finished "git worktree remove -f wt" && + git worktree add wt && + + echo "this will be removed to break the worktree index" >wt/file && + git -C wt add file && + blob=$(git -C wt rev-parse :file) && + remove_object $blob && + + test_must_fail git fsck --name-objects >actual 2>&1 && + cat >expect <<-EOF && + missing blob $blob (.git/worktrees/wt/index:file) + EOF + test_cmp expect actual +' + +test_expect_success 'fsck reports problems in main index without filename' ' + test_when_finished "rm -f .git/index && git read-tree HEAD" && + echo "this object will be removed to break the main index" >file && + git add file && + blob=$(git rev-parse :file) && + remove_object $blob && + + test_must_fail git fsck --name-objects >actual 2>&1 && + cat >expect <<-EOF && + missing blob $blob (:file) + EOF + test_cmp expect actual +' + test_done diff --git a/t/t2021-checkout-overwrite.sh b/t/t2021-checkout-overwrite.sh index 713c3fa603..034f62c13c 100755 --- a/t/t2021-checkout-overwrite.sh +++ b/t/t2021-checkout-overwrite.sh @@ -50,10 +50,13 @@ test_expect_success 'checkout commit with dir must not remove untracked a/b' ' test_expect_success SYMLINKS 'the symlink remained' ' - test_when_finished "rm a/b" && test -h a/b ' +test_expect_success 'cleanup after previous symlink tests' ' + rm a/b +' + test_expect_success SYMLINKS 'checkout -f must not follow symlinks when removing entries' ' git checkout -f start && mkdir dir && @@ -66,4 +69,15 @@ test_expect_success SYMLINKS 'checkout -f must not follow symlinks when removing test_path_is_file untracked/f ' +test_expect_success 'checkout --overwrite-ignore should succeed if only ignored files in the way' ' + git checkout -b df_conflict && + test_commit contents some_dir && + git checkout start && + mkdir some_dir && + echo autogenerated information >some_dir/ignore && + echo ignore >.git/info/exclude && + git checkout --overwrite-ignore df_conflict && + ! test_path_is_dir some_dir +' + test_done diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index efeb74ad50..ff0afad63e 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1449,14 +1449,15 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = ig test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = warn' ' cat >expect <<-EOF && - error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4) + error: invalid command '\''pickled'\'' + error: invalid line 1: pickled $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4) Warning: some commits may have been dropped accidentally. Dropped commits (newer to older): - $(git rev-list --pretty=oneline --abbrev-commit -1 primary) - $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4) To avoid this message, use "drop" to explicitly remove a commit. EOF - head -n4 expect >expect.2 && + head -n5 expect >expect.2 && tail -n1 expect >>expect.2 && tail -n4 expect.2 >expect.3 && test_config rebase.missingCommitsCheck warn && @@ -1467,7 +1468,7 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = wa git rebase -i --root && cp .git/rebase-merge/git-rebase-todo.backup orig && FAKE_LINES="2 3 4" git rebase --edit-todo 2>actual.2 && - head -n6 actual.2 >actual && + head -n7 actual.2 >actual && test_cmp expect actual && cp orig .git/rebase-merge/git-rebase-todo && FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual.2 && @@ -1483,7 +1484,8 @@ test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = wa test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = error' ' cat >expect <<-EOF && - error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4) + error: invalid command '\''pickled'\'' + error: invalid line 1: pickled $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4) Warning: some commits may have been dropped accidentally. Dropped commits (newer to older): - $(git rev-list --pretty=oneline --abbrev-commit -1 primary) @@ -1583,7 +1585,7 @@ test_expect_success 'static check of bad command' ' set_fake_editor && test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \ git rebase -i --root 2>actual && - test_i18ngrep "badcmd $(git rev-list --oneline -1 primary~1)" \ + test_i18ngrep "pickled $(git rev-list --oneline -1 primary~1)" \ actual && test_i18ngrep "You can fix this with .git rebase --edit-todo.." \ actual && diff --git a/t/t3437-rebase-fixup-options.sh b/t/t3437-rebase-fixup-options.sh index 274699dadb..dd3b301fa7 100755 --- a/t/t3437-rebase-fixup-options.sh +++ b/t/t3437-rebase-fixup-options.sh @@ -51,6 +51,7 @@ test_expect_success 'setup' ' body EOF + test_commit initial && test_commit A A && test_commit B B && get_author HEAD >expected-author && @@ -209,4 +210,29 @@ test_expect_success 'fixup -C works upon --autosquash with amend!' ' actual-squash-message ' +test_expect_success 'fixup -[Cc]<commit> works' ' + test_when_finished "test_might_fail git rebase --abort" && + cat >todo <<-\EOF && + pick A + fixup -CA1 + pick B + fixup -cA2 + EOF + ( + set_replace_editor todo && + FAKE_COMMIT_MESSAGE="edited and fixed up" \ + git rebase -i initial initial + ) && + git log --pretty=format:%B initial.. >actual && + cat >expect <<-EOF && + edited and fixed up + $EMPTY + new subject + $EMPTY + new + body + EOF + test_cmp expect actual +' + test_done diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 34a1261520..dc44da9c79 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -1171,6 +1171,15 @@ test_expect_success '--no-show-forced-updates' ' ) ' +for section in fetch transfer +do + test_expect_success "$section.hideRefs affects connectivity check" ' + GIT_TRACE="$PWD"/trace git -c $section.hideRefs=refs -c \ + $section.hideRefs="!refs/tags/" fetch && + grep "git rev-list .*--exclude-hidden=fetch" trace + ' +done + setup_negotiation_tip () { SERVER="$1" URL="$2" diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh index fbad2d5ff5..d0211cd8be 100755 --- a/t/t5541-http-push-smart.sh +++ b/t/t5541-http-push-smart.sh @@ -36,28 +36,6 @@ test_expect_success 'setup remote repository' ' setup_askpass_helper -cat >exp <<EOF -GET /smart/test_repo.git/info/refs?service=git-upload-pack HTTP/1.1 200 -POST /smart/test_repo.git/git-upload-pack HTTP/1.1 200 -EOF -test_expect_success 'no empty path components' ' - # Clear the log, so that it does not affect the "used receive-pack - # service" test which reads the log too. - test_when_finished ">\"\$HTTPD_ROOT_PATH\"/access.log" && - - # In the URL, add a trailing slash, and see if git appends yet another - # slash. - cd "$ROOT_PATH" && - git clone $HTTPD_URL/smart/test_repo.git/ test_repo_clone && - - # NEEDSWORK: If the overspecification of the expected result is reduced, we - # might be able to run this test in all protocol versions. - if test "$GIT_TEST_PROTOCOL_VERSION" = 0 - then - check_access_log exp - fi -' - test_expect_success 'clone remote repository' ' rm -rf test_repo_clone && git clone $HTTPD_URL/smart/test_repo.git test_repo_clone && @@ -67,6 +45,10 @@ test_expect_success 'clone remote repository' ' ' test_expect_success 'push to remote repository (standard)' ' + # Clear the log, so that the "used receive-pack service" test below + # sees just what we did here. + >"$HTTPD_ROOT_PATH"/access.log && + cd "$ROOT_PATH"/test_repo_clone && : >path2 && git add path2 && @@ -80,6 +62,15 @@ test_expect_success 'push to remote repository (standard)' ' test $HEAD = $(git rev-parse --verify HEAD)) ' +test_expect_success 'used receive-pack service' ' + cat >exp <<-\EOF && + GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200 + POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200 + EOF + + check_access_log exp +' + test_expect_success 'push to remote repository (standard) with sending Accept-Language' ' cat >exp <<-\EOF && => Send header: Accept-Language: ko-KR, *;q=0.9 @@ -141,28 +132,6 @@ test_expect_success 'rejected update prints status' ' ' rm -f "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update" -cat >exp <<EOF -GET /smart/test_repo.git/info/refs?service=git-upload-pack HTTP/1.1 200 -POST /smart/test_repo.git/git-upload-pack HTTP/1.1 200 -GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200 -POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200 -GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200 -GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200 -POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200 -GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200 -POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200 -GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200 -POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200 -EOF -test_expect_success 'used receive-pack service' ' - # NEEDSWORK: If the overspecification of the expected result is reduced, we - # might be able to run this test in all protocol versions. - if test "$GIT_TEST_PROTOCOL_VERSION" = 0 - then - check_access_log exp - fi -' - test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \ "$ROOT_PATH"/test_repo_clone main success diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh index bc0719a4fc..0908534f25 100755 --- a/t/t5551-http-fetch-smart.sh +++ b/t/t5551-http-fetch-smart.sh @@ -1,6 +1,6 @@ #!/bin/sh -: ${HTTP_PROTO:=HTTP} +: ${HTTP_PROTO:=HTTP/1.1} test_description="test smart fetching over http via http-backend ($HTTP_PROTO)" GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME @@ -33,35 +33,71 @@ test_expect_success 'create http-accessible bare repository' ' setup_askpass_helper test_expect_success 'clone http repository' ' - cat >exp <<-\EOF && - > GET /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1 - > Accept: */* - > Accept-Encoding: ENCODINGS - > Accept-Language: ko-KR, *;q=0.9 - > Pragma: no-cache - < HTTP/1.1 200 OK - < Pragma: no-cache - < Cache-Control: no-cache, max-age=0, must-revalidate - < Content-Type: application/x-git-upload-pack-advertisement - > POST /smart/repo.git/git-upload-pack HTTP/1.1 - > Accept-Encoding: ENCODINGS - > Content-Type: application/x-git-upload-pack-request - > Accept: application/x-git-upload-pack-result - > Accept-Language: ko-KR, *;q=0.9 - > Content-Length: xxx - < HTTP/1.1 200 OK - < Pragma: no-cache - < Cache-Control: no-cache, max-age=0, must-revalidate - < Content-Type: application/x-git-upload-pack-result + if test_have_prereq HTTP2 && test "$HTTPD_PROTO" = "https" + then + # ALPN lets us immediately use HTTP/2; likewise, POSTs with + # bodies can use it because they do not need to upgrade + INITIAL_PROTO=HTTP/2 + else + # either we are not using HTTP/2, or the initial + # request is sent via HTTP/1.1 and asks for upgrade + INITIAL_PROTO=HTTP/1.1 + fi && + + cat >exp.raw <<-EOF && + > GET /smart/repo.git/info/refs?service=git-upload-pack $INITIAL_PROTO + > accept: */* + > accept-encoding: ENCODINGS + > accept-language: ko-KR, *;q=0.9 + > pragma: no-cache + {V2} > git-protocol: version=2 + < $HTTP_PROTO 200 OK + < pragma: no-cache + < cache-control: no-cache, max-age=0, must-revalidate + < content-type: application/x-git-upload-pack-advertisement + > POST /smart/repo.git/git-upload-pack $INITIAL_PROTO + > accept-encoding: ENCODINGS + > content-type: application/x-git-upload-pack-request + > accept: application/x-git-upload-pack-result + > accept-language: ko-KR, *;q=0.9 + {V2} > git-protocol: version=2 + > content-length: xxx + < $INITIAL_PROTO 200 OK + < pragma: no-cache + < cache-control: no-cache, max-age=0, must-revalidate + < content-type: application/x-git-upload-pack-result + {V2} > POST /smart/repo.git/git-upload-pack $INITIAL_PROTO + {V2} > accept-encoding: ENCODINGS + {V2} > content-type: application/x-git-upload-pack-request + {V2} > accept: application/x-git-upload-pack-result + {V2} > accept-language: ko-KR, *;q=0.9 + {V2} > git-protocol: version=2 + {V2} > content-length: xxx + {V2} < $INITIAL_PROTO 200 OK + {V2} < pragma: no-cache + {V2} < cache-control: no-cache, max-age=0, must-revalidate + {V2} < content-type: application/x-git-upload-pack-result EOF - GIT_TRACE_CURL=true GIT_TEST_PROTOCOL_VERSION=0 LANGUAGE="ko_KR.UTF-8" \ + if test "$GIT_TEST_PROTOCOL_VERSION" = 0 + then + sed "/^{V2}/d" <exp.raw >exp + else + sed "s/^{V2} //" <exp.raw >exp + fi && + + GIT_TRACE_CURL=true LANGUAGE="ko_KR.UTF-8" \ git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err && test_cmp file clone/file && tr '\''\015'\'' Q <err | + perl -pe '\'' + s/(Send|Recv) header: ([A-Za-z0-9-]+):/ + "$1 header: " . lc($2) . ":" + /e; + '\'' | sed -e " s/Q\$// - /^[*] /d + /^[^<=]/d /^== Info:/d /^=> Send header, /d /^=> Send header:$/d @@ -71,6 +107,8 @@ test_expect_success 'clone http repository' ' s/= Recv header:// /^<= Recv data/d /^=> Send data/d + /^<= Recv SSL data/d + /^=> Send SSL data/d /^$/d /^< $/d @@ -78,36 +116,35 @@ test_expect_success 'clone http repository' ' s/^/> / } - /^> User-Agent: /d - /^> Host: /d + /^< HTTP/ { + s/200$/200 OK/ + } + /^< HTTP\\/1.1 101/d + /^[><] connection: /d + /^[><] upgrade: /d + /^> http2-settings: /d + + /^> user-agent: /d + /^> host: /d /^> POST /,$ { /^> Accept: [*]\\/[*]/d } - s/^> Content-Length: .*/> Content-Length: xxx/ + s/^> content-length: .*/> content-length: xxx/ /^> 00..want /d /^> 00.*done/d - /^< Server: /d - /^< Expires: /d - /^< Date: /d - /^< Content-Length: /d - /^< Transfer-Encoding: /d + /^< server: /d + /^< expires: /d + /^< date: /d + /^< content-length: /d + /^< transfer-encoding: /d " >actual && - # NEEDSWORK: If the overspecification of the expected result is reduced, we - # might be able to run this test in all protocol versions. - if test "$GIT_TEST_PROTOCOL_VERSION" = 0 - then - sed -e "s/^> Accept-Encoding: .*/> Accept-Encoding: ENCODINGS/" \ - actual >actual.smudged && - test_cmp exp actual.smudged && - - grep "Accept-Encoding:.*gzip" actual >actual.gzip && - test_line_count = 2 actual.gzip && + sed -e "s/^> accept-encoding: .*/> accept-encoding: ENCODINGS/" \ + actual >actual.smudged && + test_cmp exp actual.smudged && - grep "Accept-Language: ko-KR, *" actual >actual.language && - test_line_count = 2 actual.language - fi + grep "accept-encoding:.*gzip" actual >actual.gzip ' test_expect_success 'fetch changes via http' ' @@ -119,19 +156,9 @@ test_expect_success 'fetch changes via http' ' ' test_expect_success 'used upload-pack service' ' - cat >exp <<-\EOF && - GET /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1 200 - POST /smart/repo.git/git-upload-pack HTTP/1.1 200 - GET /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1 200 - POST /smart/repo.git/git-upload-pack HTTP/1.1 200 - EOF - - # NEEDSWORK: If the overspecification of the expected result is reduced, we - # might be able to run this test in all protocol versions. - if test "$GIT_TEST_PROTOCOL_VERSION" = 0 - then - check_access_log exp - fi + strip_access_log >log && + grep "GET /smart/repo.git/info/refs?service=git-upload-pack HTTP/[0-9.]* 200" log && + grep "POST /smart/repo.git/git-upload-pack HTTP/[0-9.]* 200" log ' test_expect_success 'follow redirects (301)' ' @@ -280,21 +307,23 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set 127.0.0.1 FALSE /smart_cookies/ FALSE 0 othername othervalue EOF sort >expect_cookies.txt <<-\EOF && - 127.0.0.1 FALSE /smart_cookies/ FALSE 0 othername othervalue + 127.0.0.1 FALSE /smart_cookies/repo.git/ FALSE 0 name value 127.0.0.1 FALSE /smart_cookies/repo.git/info/ FALSE 0 name value EOF git config http.cookiefile cookies.txt && git config http.savecookies true && - git ls-remote $HTTPD_URL/smart_cookies/repo.git main && - # NEEDSWORK: If the overspecification of the expected result is reduced, we - # might be able to run this test in all protocol versions. - if test "$GIT_TEST_PROTOCOL_VERSION" = 0 - then - tail -3 cookies.txt | sort >cookies_tail.txt && - test_cmp expect_cookies.txt cookies_tail.txt - fi + test_when_finished " + git --git-dir=\"\$HTTPD_DOCUMENT_ROOT_PATH/repo.git\" \ + tag -d cookie-tag + " && + git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \ + tag -m "foo" cookie-tag && + git fetch $HTTPD_URL/smart_cookies/repo.git cookie-tag && + + grep "^[^#]" cookies.txt | sort >cookies_stripped.txt && + test_cmp expect_cookies.txt cookies_stripped.txt ' test_expect_success 'transfer.hiderefs works over smart-http' ' @@ -666,4 +695,13 @@ test_expect_success 'push warns or fails when using username:password' ' test_line_count -ge 1 warnings ' +test_expect_success 'no empty path components' ' + # In the URL, add a trailing slash, and see if git appends yet another + # slash. + git clone $HTTPD_URL/smart/repo.git/ clone-with-slash && + + strip_access_log >log && + ! grep "//" log +' + test_done diff --git a/t/t5559-http-fetch-smart-http2.sh b/t/t5559-http-fetch-smart-http2.sh index 9eece71c2c..54aa9d3bff 100755 --- a/t/t5559-http-fetch-smart-http2.sh +++ b/t/t5559-http-fetch-smart-http2.sh @@ -1,4 +1,5 @@ #!/bin/sh HTTP_PROTO=HTTP/2 +LIB_HTTPD_SSL=1 . ./t5551-http-fetch-smart.sh diff --git a/t/t5563-simple-http-auth.sh b/t/t5563-simple-http-auth.sh new file mode 100755 index 0000000000..ccf7e54b07 --- /dev/null +++ b/t/t5563-simple-http-auth.sh @@ -0,0 +1,325 @@ +#!/bin/sh + +test_description='test http auth header and credential helper interop' + +. ./test-lib.sh +. "$TEST_DIRECTORY"/lib-httpd.sh + +start_httpd + +test_expect_success 'setup_credential_helper' ' + mkdir "$TRASH_DIRECTORY/bin" && + PATH=$PATH:"$TRASH_DIRECTORY/bin" && + export PATH && + + CREDENTIAL_HELPER="$TRASH_DIRECTORY/bin/git-credential-test-helper" && + write_script "$CREDENTIAL_HELPER" <<-\EOF + cmd=$1 + teefile=$cmd-query.cred + catfile=$cmd-reply.cred + sed -n -e "/^$/q" -e "p" >>$teefile + if test "$cmd" = "get" + then + cat $catfile + fi + EOF +' + +set_credential_reply () { + cat >"$TRASH_DIRECTORY/$1-reply.cred" +} + +expect_credential_query () { + cat >"$TRASH_DIRECTORY/$1-expect.cred" && + test_cmp "$TRASH_DIRECTORY/$1-expect.cred" \ + "$TRASH_DIRECTORY/$1-query.cred" +} + +per_test_cleanup () { + rm -f *.cred && + rm -f "$HTTPD_ROOT_PATH"/custom-auth.valid \ + "$HTTPD_ROOT_PATH"/custom-auth.challenge +} + +test_expect_success 'setup repository' ' + test_commit foo && + git init --bare "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && + git push --mirror "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" +' + +test_expect_success 'access using basic auth' ' + test_when_finished "per_test_cleanup" && + + set_credential_reply get <<-EOF && + username=alice + password=secret-passwd + EOF + + # Basic base64(alice:secret-passwd) + cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF && + Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA== + EOF + + cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF && + WWW-Authenticate: Basic realm="example.com" + EOF + + test_config_global credential.helper test-helper && + git ls-remote "$HTTPD_URL/custom_auth/repo.git" && + + expect_credential_query get <<-EOF && + protocol=http + host=$HTTPD_DEST + wwwauth[]=Basic realm="example.com" + EOF + + expect_credential_query store <<-EOF + protocol=http + host=$HTTPD_DEST + username=alice + password=secret-passwd + EOF +' + +test_expect_success 'access using basic auth invalid credentials' ' + test_when_finished "per_test_cleanup" && + + set_credential_reply get <<-EOF && + username=baduser + password=wrong-passwd + EOF + + # Basic base64(alice:secret-passwd) + cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF && + Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA== + EOF + + cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF && + WWW-Authenticate: Basic realm="example.com" + EOF + + test_config_global credential.helper test-helper && + test_must_fail git ls-remote "$HTTPD_URL/custom_auth/repo.git" && + + expect_credential_query get <<-EOF && + protocol=http + host=$HTTPD_DEST + wwwauth[]=Basic realm="example.com" + EOF + + expect_credential_query erase <<-EOF + protocol=http + host=$HTTPD_DEST + username=baduser + password=wrong-passwd + wwwauth[]=Basic realm="example.com" + EOF +' + +test_expect_success 'access using basic auth with extra challenges' ' + test_when_finished "per_test_cleanup" && + + set_credential_reply get <<-EOF && + username=alice + password=secret-passwd + EOF + + # Basic base64(alice:secret-passwd) + cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF && + Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA== + EOF + + cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF && + WWW-Authenticate: FooBar param1="value1" param2="value2" + WWW-Authenticate: Bearer authorize_uri="id.example.com" p=1 q=0 + WWW-Authenticate: Basic realm="example.com" + EOF + + test_config_global credential.helper test-helper && + git ls-remote "$HTTPD_URL/custom_auth/repo.git" && + + expect_credential_query get <<-EOF && + protocol=http + host=$HTTPD_DEST + wwwauth[]=FooBar param1="value1" param2="value2" + wwwauth[]=Bearer authorize_uri="id.example.com" p=1 q=0 + wwwauth[]=Basic realm="example.com" + EOF + + expect_credential_query store <<-EOF + protocol=http + host=$HTTPD_DEST + username=alice + password=secret-passwd + EOF +' + +test_expect_success 'access using basic auth mixed-case wwwauth header name' ' + test_when_finished "per_test_cleanup" && + + set_credential_reply get <<-EOF && + username=alice + password=secret-passwd + EOF + + # Basic base64(alice:secret-passwd) + cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF && + Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA== + EOF + + cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF && + www-authenticate: foobar param1="value1" param2="value2" + WWW-AUTHENTICATE: BEARER authorize_uri="id.example.com" p=1 q=0 + WwW-aUtHeNtIcAtE: baSiC realm="example.com" + EOF + + test_config_global credential.helper test-helper && + git ls-remote "$HTTPD_URL/custom_auth/repo.git" && + + expect_credential_query get <<-EOF && + protocol=http + host=$HTTPD_DEST + wwwauth[]=foobar param1="value1" param2="value2" + wwwauth[]=BEARER authorize_uri="id.example.com" p=1 q=0 + wwwauth[]=baSiC realm="example.com" + EOF + + expect_credential_query store <<-EOF + protocol=http + host=$HTTPD_DEST + username=alice + password=secret-passwd + EOF +' + +test_expect_success 'access using basic auth with wwwauth header continuations' ' + test_when_finished "per_test_cleanup" && + + set_credential_reply get <<-EOF && + username=alice + password=secret-passwd + EOF + + # Basic base64(alice:secret-passwd) + cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF && + Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA== + EOF + + # Note that leading and trailing whitespace is important to correctly + # simulate a continuation/folded header. + cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF && + WWW-Authenticate: FooBar param1="value1" + param2="value2" + WWW-Authenticate: Bearer authorize_uri="id.example.com" + p=1 + q=0 + WWW-Authenticate: Basic realm="example.com" + EOF + + test_config_global credential.helper test-helper && + git ls-remote "$HTTPD_URL/custom_auth/repo.git" && + + expect_credential_query get <<-EOF && + protocol=http + host=$HTTPD_DEST + wwwauth[]=FooBar param1="value1" param2="value2" + wwwauth[]=Bearer authorize_uri="id.example.com" p=1 q=0 + wwwauth[]=Basic realm="example.com" + EOF + + expect_credential_query store <<-EOF + protocol=http + host=$HTTPD_DEST + username=alice + password=secret-passwd + EOF +' + +test_expect_success 'access using basic auth with wwwauth header empty continuations' ' + test_when_finished "per_test_cleanup" && + + set_credential_reply get <<-EOF && + username=alice + password=secret-passwd + EOF + + # Basic base64(alice:secret-passwd) + cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF && + Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA== + EOF + + CHALLENGE="$HTTPD_ROOT_PATH/custom-auth.challenge" && + + # Note that leading and trailing whitespace is important to correctly + # simulate a continuation/folded header. + printf "">$CHALLENGE && + printf "WWW-Authenticate: FooBar param1=\"value1\"\r\n" >$CHALLENGE && + printf " \r\n" >>$CHALLENGE && + printf " param2=\"value2\"\r\n" >>$CHALLENGE && + printf "WWW-Authenticate: Bearer authorize_uri=\"id.example.com\"\r\n" >>$CHALLENGE && + printf " p=1\r\n" >>$CHALLENGE && + printf " \r\n" >>$CHALLENGE && + printf " q=0\r\n" >>$CHALLENGE && + printf "WWW-Authenticate: Basic realm=\"example.com\"\r\n" >>$CHALLENGE && + + test_config_global credential.helper test-helper && + git ls-remote "$HTTPD_URL/custom_auth/repo.git" && + + expect_credential_query get <<-EOF && + protocol=http + host=$HTTPD_DEST + wwwauth[]=FooBar param1="value1" param2="value2" + wwwauth[]=Bearer authorize_uri="id.example.com" p=1 q=0 + wwwauth[]=Basic realm="example.com" + EOF + + expect_credential_query store <<-EOF + protocol=http + host=$HTTPD_DEST + username=alice + password=secret-passwd + EOF +' + +test_expect_success 'access using basic auth with wwwauth header mixed line-endings' ' + test_when_finished "per_test_cleanup" && + + set_credential_reply get <<-EOF && + username=alice + password=secret-passwd + EOF + + # Basic base64(alice:secret-passwd) + cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF && + Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA== + EOF + + CHALLENGE="$HTTPD_ROOT_PATH/custom-auth.challenge" && + + # Note that leading and trailing whitespace is important to correctly + # simulate a continuation/folded header. + printf "">$CHALLENGE && + printf "WWW-Authenticate: FooBar param1=\"value1\"\r\n" >$CHALLENGE && + printf " \r\n" >>$CHALLENGE && + printf "\tparam2=\"value2\"\r\n" >>$CHALLENGE && + printf "WWW-Authenticate: Basic realm=\"example.com\"" >>$CHALLENGE && + + test_config_global credential.helper test-helper && + git ls-remote "$HTTPD_URL/custom_auth/repo.git" && + + expect_credential_query get <<-EOF && + protocol=http + host=$HTTPD_DEST + wwwauth[]=FooBar param1="value1" param2="value2" + wwwauth[]=Basic realm="example.com" + EOF + + expect_credential_query store <<-EOF + protocol=http + host=$HTTPD_DEST + username=alice + password=secret-passwd + EOF +' + +test_done diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh index aabf590dda..67d523d405 100755 --- a/t/t6018-rev-list-glob.sh +++ b/t/t6018-rev-list-glob.sh @@ -187,7 +187,7 @@ test_expect_success 'rev-parse --exclude=ref with --remotes=glob' ' compare rev-parse "--exclude=upstream/x --remotes=upstream/*" "upstream/one upstream/two" ' -for section in receive uploadpack +for section in fetch receive uploadpack do test_expect_success "rev-parse --exclude-hidden=$section with --all" ' compare "-c transfer.hideRefs=refs/remotes/ rev-parse" "--branches --tags" "--exclude-hidden=$section --all" diff --git a/t/t6021-rev-list-exclude-hidden.sh b/t/t6021-rev-list-exclude-hidden.sh index 11c50b7c0d..1a9d37e638 100755 --- a/t/t6021-rev-list-exclude-hidden.sh +++ b/t/t6021-rev-list-exclude-hidden.sh @@ -22,7 +22,7 @@ test_expect_success 'invalid section' ' test_cmp expected err ' -for section in receive uploadpack +for section in fetch receive uploadpack do test_expect_success "$section: passed multiple times" ' echo "fatal: --exclude-hidden= passed more than once" >expected && diff --git a/t/t7031-verify-tag-signed-ssh.sh b/t/t7031-verify-tag-signed-ssh.sh index 36eb86a4b1..20913b3713 100755 --- a/t/t7031-verify-tag-signed-ssh.sh +++ b/t/t7031-verify-tag-signed-ssh.sh @@ -200,4 +200,14 @@ test_expect_success GPGSSH 'verifying a forged tag with --format should fail sil test_must_be_empty actual-forged ' +test_expect_success GPGSSH 'rev-list --format=%G' ' + test_config gpg.ssh.allowedSignersFile "${GPGSSH_ALLOWED_SIGNERS}" && + git rev-list -1 --format="%G? %H" sixth-signed >actual && + cat >expect <<-EOF && + commit $(git rev-parse sixth-signed^0) + G $(git rev-parse sixth-signed^0) + EOF + test_cmp expect actual +' + test_done diff --git a/t/t9700-perl-git.sh b/t/t9700-perl-git.sh index b105d6d9d5..ccc8212d73 100755 --- a/t/t9700-perl-git.sh +++ b/t/t9700-perl-git.sh @@ -13,37 +13,36 @@ skip_all_if_no_Test_More # set up test repository -test_expect_success \ - 'set up test repository' \ - 'echo "test file 1" > file1 && - echo "test file 2" > file2 && - mkdir directory1 && - echo "in directory1" >> directory1/file && - mkdir directory2 && - echo "in directory2" >> directory2/file && - git add . && - git commit -m "first commit" && - - echo "new file in subdir 2" > directory2/file2 && - git add . && - git commit -m "commit in directory2" && - - echo "changed file 1" > file1 && - git commit -a -m "second commit" && - - git config --add color.test.slot1 green && - git config --add test.string value && - git config --add test.dupstring value1 && - git config --add test.dupstring value2 && - git config --add test.booltrue true && - git config --add test.boolfalse no && - git config --add test.boolother other && - git config --add test.int 2k && - git config --add test.path "~/foo" && - git config --add test.pathexpanded "$HOME/foo" && - git config --add test.pathmulti foo && - git config --add test.pathmulti bar - ' +test_expect_success 'set up test repository' ' + echo "test file 1" >file1 && + echo "test file 2" >file2 && + mkdir directory1 && + echo "in directory1" >>directory1/file && + mkdir directory2 && + echo "in directory2" >>directory2/file && + git add . && + git commit -m "first commit" && + + echo "new file in subdir 2" >directory2/file2 && + git add . && + git commit -m "commit in directory2" && + + echo "changed file 1" >file1 && + git commit -a -m "second commit" && + + git config --add color.test.slot1 green && + git config --add test.string value && + git config --add test.dupstring value1 && + git config --add test.dupstring value2 && + git config --add test.booltrue true && + git config --add test.boolfalse no && + git config --add test.boolother other && + git config --add test.int 2k && + git config --add test.path "~/foo" && + git config --add test.pathexpanded "$HOME/foo" && + git config --add test.pathmulti foo && + git config --add test.pathmulti bar +' test_expect_success 'set up bare repository' ' git init --bare bare.git diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 58cfd2f1fd..999d46fafe 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -32,6 +32,14 @@ test_set_editor () { export EDITOR } +# Like test_set_editor but sets GIT_SEQUENCE_EDITOR instead of EDITOR +test_set_sequence_editor () { + FAKE_SEQUENCE_EDITOR="$1" + export FAKE_SEQUENCE_EDITOR + GIT_SEQUENCE_EDITOR='"$FAKE_SEQUENCE_EDITOR"' + export GIT_SEQUENCE_EDITOR +} + test_decode_color () { awk ' function name(n) { diff --git a/t/test-lib.sh b/t/test-lib.sh index d272cca008..62136caee5 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -645,12 +645,6 @@ u200c=$(printf '\342\200\214') export _x05 _x35 LF u200c EMPTY_TREE EMPTY_BLOB ZERO_OID OID_REGEX -# Each test should start with something like this, after copyright notices: -# -# test_description='Description of this test... -# This test checks if command xyzzy does the right thing... -# ' -# . ./test-lib.sh test "x$TERM" != "xdumb" && ( test -t 1 && tput bold >/dev/null 2>&1 && @@ -6,6 +6,7 @@ #include "blob.h" #include "alloc.h" #include "gpg-interface.h" +#include "hex.h" #include "packfile.h" const char *tag_type = "tag"; diff --git a/thread-utils.c b/thread-utils.c index 5329845691..1f89ffab4c 100644 --- a/thread-utils.c +++ b/thread-utils.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "thread-utils.h" #if defined(hpux) || defined(__hpux) || defined(_hpux) @@ -1,7 +1,6 @@ #ifndef TRACE_H #define TRACE_H -#include "git-compat-util.h" #include "strbuf.h" /** @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "json-writer.h" #include "quote.h" @@ -6,6 +6,7 @@ #include "sigchain.h" #include "thread-utils.h" #include "version.h" +#include "trace.h" #include "trace2/tr2_cfg.h" #include "trace2/tr2_cmd_name.h" #include "trace2/tr2_ctr.h" diff --git a/trace2/tr2_ctr.c b/trace2/tr2_ctr.c index 483ca7c308..b342d3b1a3 100644 --- a/trace2/tr2_ctr.c +++ b/trace2/tr2_ctr.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "thread-utils.h" #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" diff --git a/trace2/tr2_sid.c b/trace2/tr2_sid.c index dc6e75ef13..5f1ce6f85c 100644 --- a/trace2/tr2_sid.c +++ b/trace2/tr2_sid.c @@ -1,4 +1,5 @@ #include "cache.h" +#include "hex.h" #include "trace2/tr2_tbuf.h" #include "trace2/tr2_sid.h" diff --git a/trace2/tr2_sysenv.c b/trace2/tr2_sysenv.c index a380dcf910..069786cb92 100644 --- a/trace2/tr2_sysenv.c +++ b/trace2/tr2_sysenv.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "dir.h" #include "tr2_sysenv.h" diff --git a/trace2/tr2_tbuf.c b/trace2/tr2_tbuf.c index 2498482d9a..c3b3822ed7 100644 --- a/trace2/tr2_tbuf.c +++ b/trace2/tr2_tbuf.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "tr2_tbuf.h" void tr2_tbuf_local_time(struct tr2_tbuf *tb) diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c index 16f6332755..9e7aab6d51 100644 --- a/trace2/tr2_tgt_event.c +++ b/trace2/tr2_tgt_event.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "json-writer.h" #include "run-command.h" diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c index fbbef68dfc..8672c2c2d0 100644 --- a/trace2/tr2_tgt_normal.c +++ b/trace2/tr2_tgt_normal.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "run-command.h" #include "quote.h" diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c index adae803263..3f2b2d5311 100644 --- a/trace2/tr2_tgt_perf.c +++ b/trace2/tr2_tgt_perf.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" #include "run-command.h" #include "quote.h" diff --git a/trace2/tr2_tls.c b/trace2/tr2_tls.c index 04900bb4c3..9f46ae12f5 100644 --- a/trace2/tr2_tls.c +++ b/trace2/tr2_tls.c @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "thread-utils.h" +#include "trace.h" #include "trace2/tr2_tls.h" /* diff --git a/trace2/tr2_tmr.c b/trace2/tr2_tmr.c index 786762dfd2..31d0e4d1bd 100644 --- a/trace2/tr2_tmr.c +++ b/trace2/tr2_tmr.c @@ -1,8 +1,9 @@ -#include "cache.h" +#include "git-compat-util.h" #include "thread-utils.h" #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" #include "trace2/tr2_tmr.h" +#include "trace.h" #define MY_MAX(a, b) ((a) > (b) ? (a) : (b)) #define MY_MIN(a, b) ((a) < (b) ? (a) : (b)) @@ -1,4 +1,5 @@ #include "cache.h" +#include "alloc.h" #include "config.h" #include "string-list.h" #include "run-command.h" diff --git a/transport-helper.c b/transport-helper.c index 3ea7c2bb5a..82ac63e260 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -4,6 +4,7 @@ #include "run-command.h" #include "commit.h" #include "diff.h" +#include "hex.h" #include "revision.h" #include "remote.h" #include "string-list.h" diff --git a/transport.c b/transport.c index 77a61a9d7b..906dbad5a0 100644 --- a/transport.c +++ b/transport.c @@ -1,5 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" +#include "hex.h" #include "transport.h" #include "hook.h" #include "pkt-line.h" @@ -10,6 +12,7 @@ #include "walker.h" #include "bundle.h" #include "dir.h" +#include "gettext.h" #include "refs.h" #include "refspec.h" #include "branch.h" diff --git a/tree-walk.c b/tree-walk.c index 74f4d710e8..0e2f5ceb71 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -1,6 +1,8 @@ #include "cache.h" #include "tree-walk.h" +#include "alloc.h" #include "dir.h" +#include "hex.h" #include "object-store.h" #include "tree.h" #include "pathspec.h" diff --git a/tree-walk.h b/tree-walk.h index 6305d53150..25fe27e352 100644 --- a/tree-walk.h +++ b/tree-walk.h @@ -1,7 +1,9 @@ #ifndef TREE_WALK_H #define TREE_WALK_H -#include "cache.h" +#include "hash.h" + +struct index_state; #define MAX_TRAVERSE_TREES 8 @@ -1,5 +1,6 @@ #include "cache.h" #include "cache-tree.h" +#include "hex.h" #include "tree.h" #include "object-store.h" #include "blob.h" diff --git a/unix-socket.c b/unix-socket.c index e0be1badb5..79800d8063 100644 --- a/unix-socket.c +++ b/unix-socket.c @@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "strbuf.h" #include "unix-socket.h" #define DEFAULT_UNIX_STREAM_LISTEN_BACKLOG (5) diff --git a/unix-stream-server.c b/unix-stream-server.c index efa2a207ab..22ac2373e0 100644 --- a/unix-stream-server.c +++ b/unix-stream-server.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "lockfile.h" #include "unix-socket.h" #include "unix-stream-server.h" diff --git a/unpack-trees.c b/unpack-trees.c index 3d05e45a27..a75fb9f05b 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -3,6 +3,7 @@ #include "repository.h" #include "config.h" #include "dir.h" +#include "hex.h" #include "tree.h" #include "tree-walk.h" #include "cache-tree.h" @@ -66,8 +67,8 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = { }; #define ERRORMSG(o,type) \ - ( ((o) && (o)->msgs[(type)]) \ - ? ((o)->msgs[(type)]) \ + ( ((o) && (o)->internal.msgs[(type)]) \ + ? ((o)->internal.msgs[(type)]) \ : (unpack_plumbing_errors[(type)]) ) static const char *super_prefixed(const char *path, const char *super_prefix) @@ -108,10 +109,10 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, const char *cmd) { int i; - const char **msgs = opts->msgs; + const char **msgs = opts->internal.msgs; const char *msg; - strvec_init(&opts->msgs_to_free); + strvec_init(&opts->internal.msgs_to_free); if (!strcmp(cmd, "checkout")) msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) @@ -129,7 +130,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, "Please commit your changes or stash them before you %s.") : _("Your local changes to the following files would be overwritten by %s:\n%%s"); msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = - strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd); + strvec_pushf(&opts->internal.msgs_to_free, msg, cmd, cmd); msgs[ERROR_NOT_UPTODATE_DIR] = _("Updating the following directories would lose untracked files in them:\n%s"); @@ -153,7 +154,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, "Please move or remove them before you %s.") : _("The following untracked working tree files would be removed by %s:\n%%s"); msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = - strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd); + strvec_pushf(&opts->internal.msgs_to_free, msg, cmd, cmd); if (!strcmp(cmd, "checkout")) msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) @@ -171,7 +172,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, "Please move or remove them before you %s.") : _("The following untracked working tree files would be overwritten by %s:\n%%s"); msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = - strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd); + strvec_pushf(&opts->internal.msgs_to_free, msg, cmd, cmd); /* * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we @@ -189,16 +190,16 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, msgs[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN] = _("The following paths were already present and thus not updated despite sparse patterns:\n%s"); - opts->show_all_errors = 1; + opts->internal.show_all_errors = 1; /* rejected paths may not have a static buffer */ - for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++) - opts->unpack_rejects[i].strdup_strings = 1; + for (i = 0; i < ARRAY_SIZE(opts->internal.unpack_rejects); i++) + opts->internal.unpack_rejects[i].strdup_strings = 1; } void clear_unpack_trees_porcelain(struct unpack_trees_options *opts) { - strvec_clear(&opts->msgs_to_free); - memset(opts->msgs, 0, sizeof(opts->msgs)); + strvec_clear(&opts->internal.msgs_to_free); + memset(opts->internal.msgs, 0, sizeof(opts->internal.msgs)); } static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce, @@ -210,7 +211,7 @@ static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce, set |= CE_WT_REMOVE; ce->ce_flags = (ce->ce_flags & ~clear) | set; - return add_index_entry(&o->result, ce, + return add_index_entry(&o->internal.result, ce, ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); } @@ -218,7 +219,7 @@ static void add_entry(struct unpack_trees_options *o, const struct cache_entry *ce, unsigned int set, unsigned int clear) { - do_add_entry(o, dup_cache_entry(ce, &o->result), set, clear); + do_add_entry(o, dup_cache_entry(ce, &o->internal.result), set, clear); } /* @@ -233,7 +234,7 @@ static int add_rejected_path(struct unpack_trees_options *o, if (o->quiet) return -1; - if (!o->show_all_errors) + if (!o->internal.show_all_errors) return error(ERRORMSG(o, e), super_prefixed(path, o->super_prefix)); @@ -241,7 +242,7 @@ static int add_rejected_path(struct unpack_trees_options *o, * Otherwise, insert in a list for future display by * display_(error|warning)_msgs() */ - string_list_append(&o->unpack_rejects[e], path); + string_list_append(&o->internal.unpack_rejects[e], path); return -1; } @@ -253,7 +254,7 @@ static void display_error_msgs(struct unpack_trees_options *o) int e; unsigned error_displayed = 0; for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { - struct string_list *rejects = &o->unpack_rejects[e]; + struct string_list *rejects = &o->internal.unpack_rejects[e]; if (rejects->nr > 0) { int i; @@ -281,7 +282,7 @@ static void display_warning_msgs(struct unpack_trees_options *o) unsigned warning_displayed = 0; for (e = NB_UNPACK_TREES_ERROR_TYPES + 1; e < NB_UNPACK_TREES_WARNING_TYPES; e++) { - struct string_list *rejects = &o->unpack_rejects[e]; + struct string_list *rejects = &o->internal.unpack_rejects[e]; if (rejects->nr > 0) { int i; @@ -600,13 +601,14 @@ static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o) { ce->ce_flags |= CE_UNPACKED; - if (o->cache_bottom < o->src_index->cache_nr && - o->src_index->cache[o->cache_bottom] == ce) { - int bottom = o->cache_bottom; + if (o->internal.cache_bottom < o->src_index->cache_nr && + o->src_index->cache[o->internal.cache_bottom] == ce) { + int bottom = o->internal.cache_bottom; + while (bottom < o->src_index->cache_nr && o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) bottom++; - o->cache_bottom = bottom; + o->internal.cache_bottom = bottom; } } @@ -652,7 +654,7 @@ static void mark_ce_used_same_name(struct cache_entry *ce, static struct cache_entry *next_cache_entry(struct unpack_trees_options *o) { const struct index_state *index = o->src_index; - int pos = o->cache_bottom; + int pos = o->internal.cache_bottom; while (pos < index->cache_nr) { struct cache_entry *ce = index->cache[pos]; @@ -711,7 +713,7 @@ static void restore_cache_bottom(struct traverse_info *info, int bottom) if (o->diff_index_cached) return; - o->cache_bottom = bottom; + o->internal.cache_bottom = bottom; } static int switch_cache_bottom(struct traverse_info *info) @@ -721,13 +723,13 @@ static int switch_cache_bottom(struct traverse_info *info) if (o->diff_index_cached) return 0; - ret = o->cache_bottom; + ret = o->internal.cache_bottom; pos = find_cache_pos(info->prev, info->name, info->namelen); if (pos < -1) - o->cache_bottom = -2 - pos; + o->internal.cache_bottom = -2 - pos; else if (pos < 0) - o->cache_bottom = o->src_index->cache_nr; + o->internal.cache_bottom = o->src_index->cache_nr; return ret; } @@ -838,7 +840,7 @@ static int traverse_by_cache_tree(int pos, int nr_entries, int nr_names, mark_ce_used(src[0], o); } free(tree_ce); - if (o->debug_unpack) + if (o->internal.debug_unpack) printf("Unpacked %d entries from %s to %s using cache-tree\n", nr_entries, o->src_index->cache[pos]->name, @@ -873,9 +875,9 @@ static int traverse_trees_recursive(int n, unsigned long dirmask, * save and restore cache_bottom anyway to not miss * unprocessed entries before 'pos'. */ - bottom = o->cache_bottom; + bottom = o->internal.cache_bottom; ret = traverse_by_cache_tree(pos, nr_entries, n, info); - o->cache_bottom = bottom; + o->internal.cache_bottom = bottom; return ret; } @@ -1212,8 +1214,8 @@ static int unpack_single_entry(int n, unsigned long mask, * cache entry from the index aware logic. */ src[i + o->merge] = create_ce_entry(info, names + i, stage, - &o->result, o->merge, - bit & dirmask); + &o->internal.result, + o->merge, bit & dirmask); } if (o->merge) { @@ -1237,7 +1239,7 @@ static int unpack_single_entry(int n, unsigned long mask, static int unpack_failed(struct unpack_trees_options *o, const char *message) { - discard_index(&o->result); + discard_index(&o->internal.result); if (!o->quiet && !o->exiting_early) { if (message) return error("%s", message); @@ -1260,7 +1262,7 @@ static int find_cache_pos(struct traverse_info *info, struct index_state *index = o->src_index; int pfxlen = info->pathlen; - for (pos = o->cache_bottom; pos < index->cache_nr; pos++) { + for (pos = o->internal.cache_bottom; pos < index->cache_nr; pos++) { const struct cache_entry *ce = index->cache[pos]; const char *ce_name, *ce_slash; int cmp, ce_len; @@ -1271,8 +1273,8 @@ static int find_cache_pos(struct traverse_info *info, * we can never match it; don't check it * again. */ - if (pos == o->cache_bottom) - ++o->cache_bottom; + if (pos == o->internal.cache_bottom) + ++o->internal.cache_bottom; continue; } if (!ce_in_traverse_path(ce, info)) { @@ -1450,7 +1452,7 @@ static int unpack_sparse_callback(int n, unsigned long mask, unsigned long dirma */ if (!is_null_oid(&names[0].oid)) { src[0] = create_ce_entry(info, &names[0], 0, - &o->result, 1, + &o->internal.result, 1, dirmask & (1ul << 0)); src[0]->ce_flags |= (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE); } @@ -1487,7 +1489,7 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str while (!p->mode) p++; - if (o->debug_unpack) + if (o->internal.debug_unpack) debug_unpack_callback(n, mask, dirmask, names, info); /* Are we supposed to look at the index too? */ @@ -1560,7 +1562,7 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str * in 'mark_ce_used()' */ if (!src[0] || !S_ISSPARSEDIR(src[0]->ce_mode)) - o->cache_bottom += matches; + o->internal.cache_bottom += matches; return mask; } } @@ -1809,7 +1811,7 @@ static void populate_from_existing_patterns(struct unpack_trees_options *o, if (get_sparse_checkout_patterns(pl) < 0) o->skip_sparse_checkout = 1; else - o->pl = pl; + o->internal.pl = pl; } static void update_sparsity_for_prefix(const char *prefix, @@ -1871,8 +1873,12 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options if (len > MAX_UNPACK_TREES) die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES); - if (o->dir) - BUG("o->dir is for internal use only"); + if (o->internal.dir) + BUG("o->internal.dir is for internal use only"); + if (o->internal.pl) + BUG("o->internal.pl is for internal use only"); + if (o->df_conflict_entry) + BUG("o->df_conflict_entry is an output only field"); trace_performance_enter(); trace2_region_enter("unpack_trees", "unpack_trees", the_repository); @@ -1889,9 +1895,9 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options BUG("UNPACK_RESET_OVERWRITE_UNTRACKED incompatible with preserved ignored files"); if (!o->preserve_ignored) { - o->dir = &dir; - o->dir->flags |= DIR_SHOW_IGNORED; - setup_standard_excludes(o->dir); + o->internal.dir = &dir; + o->internal.dir->flags |= DIR_SHOW_IGNORED; + setup_standard_excludes(o->internal.dir); } if (o->prefix) @@ -1899,49 +1905,50 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options if (!core_apply_sparse_checkout || !o->update) o->skip_sparse_checkout = 1; - if (!o->skip_sparse_checkout && !o->pl) { + if (!o->skip_sparse_checkout) { memset(&pl, 0, sizeof(pl)); free_pattern_list = 1; populate_from_existing_patterns(o, &pl); } - index_state_init(&o->result, o->src_index->repo); - o->result.initialized = 1; - o->result.timestamp.sec = o->src_index->timestamp.sec; - o->result.timestamp.nsec = o->src_index->timestamp.nsec; - o->result.version = o->src_index->version; + index_state_init(&o->internal.result, o->src_index->repo); + o->internal.result.initialized = 1; + o->internal.result.timestamp.sec = o->src_index->timestamp.sec; + o->internal.result.timestamp.nsec = o->src_index->timestamp.nsec; + o->internal.result.version = o->src_index->version; if (!o->src_index->split_index) { - o->result.split_index = NULL; + o->internal.result.split_index = NULL; } else if (o->src_index == o->dst_index) { /* * o->dst_index (and thus o->src_index) will be discarded - * and overwritten with o->result at the end of this function, - * so just use src_index's split_index to avoid having to - * create a new one. + * and overwritten with o->internal.result at the end of + * this function, so just use src_index's split_index to + * avoid having to create a new one. */ - o->result.split_index = o->src_index->split_index; - o->result.split_index->refcount++; + o->internal.result.split_index = o->src_index->split_index; + o->internal.result.split_index->refcount++; } else { - o->result.split_index = init_split_index(&o->result); + o->internal.result.split_index = + init_split_index(&o->internal.result); } - oidcpy(&o->result.oid, &o->src_index->oid); - o->merge_size = len; + oidcpy(&o->internal.result.oid, &o->src_index->oid); + o->internal.merge_size = len; mark_all_ce_unused(o->src_index); - o->result.fsmonitor_last_update = + o->internal.result.fsmonitor_last_update = xstrdup_or_null(o->src_index->fsmonitor_last_update); - o->result.fsmonitor_has_run_once = o->src_index->fsmonitor_has_run_once; + o->internal.result.fsmonitor_has_run_once = o->src_index->fsmonitor_has_run_once; if (!o->src_index->initialized && !repo->settings.command_requires_full_index && - is_sparse_index_allowed(&o->result, 0)) - o->result.sparse_index = 1; + is_sparse_index_allowed(&o->internal.result, 0)) + o->internal.result.sparse_index = 1; /* * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries */ if (!o->skip_sparse_checkout) - mark_new_skip_worktree(o->pl, o->src_index, 0, + mark_new_skip_worktree(o->internal.pl, o->src_index, 0, CE_NEW_SKIP_WORKTREE, o->verbose_update); if (!dfc) @@ -1955,7 +1962,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options setup_traverse_info(&info, prefix); info.fn = unpack_callback; info.data = o; - info.show_all_errors = o->show_all_errors; + info.show_all_errors = o->internal.show_all_errors; info.pathspec = o->pathspec; if (o->prefix) { @@ -1996,7 +2003,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options } mark_all_ce_unused(o->src_index); - if (o->trivial_merges_only && o->nontrivial_merge) { + if (o->trivial_merges_only && o->internal.nontrivial_merge) { ret = unpack_failed(o, "Merge requires file-level merging"); goto done; } @@ -2007,13 +2014,13 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options * If they will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE * so apply_sparse_checkout() won't attempt to remove it from worktree */ - mark_new_skip_worktree(o->pl, &o->result, + mark_new_skip_worktree(o->internal.pl, &o->internal.result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE, o->verbose_update); ret = 0; - for (i = 0; i < o->result.cache_nr; i++) { - struct cache_entry *ce = o->result.cache[i]; + for (i = 0; i < o->internal.result.cache_nr; i++) { + struct cache_entry *ce = o->internal.result.cache[i]; /* * Entries marked with CE_ADDED in merged_entry() do not have @@ -2027,7 +2034,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options verify_absent(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o)) ret = 1; - if (apply_sparse_checkout(&o->result, ce, o)) + if (apply_sparse_checkout(&o->internal.result, ce, o)) ret = 1; } if (ret == 1) { @@ -2035,46 +2042,47 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options * Inability to sparsify or de-sparsify individual * paths is not an error, but just a warning. */ - if (o->show_all_errors) + if (o->internal.show_all_errors) display_warning_msgs(o); ret = 0; } } - ret = check_updates(o, &o->result) ? (-2) : 0; + ret = check_updates(o, &o->internal.result) ? (-2) : 0; if (o->dst_index) { - move_index_extensions(&o->result, o->src_index); + move_index_extensions(&o->internal.result, o->src_index); if (!ret) { if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0)) - cache_tree_verify(the_repository, &o->result); + cache_tree_verify(the_repository, + &o->internal.result); if (!o->skip_cache_tree_update && - !cache_tree_fully_valid(o->result.cache_tree)) - cache_tree_update(&o->result, + !cache_tree_fully_valid(o->internal.result.cache_tree)) + cache_tree_update(&o->internal.result, WRITE_TREE_SILENT | WRITE_TREE_REPAIR); } - o->result.updated_workdir = 1; + o->internal.result.updated_workdir = 1; discard_index(o->dst_index); - *o->dst_index = o->result; + *o->dst_index = o->internal.result; } else { - discard_index(&o->result); + discard_index(&o->internal.result); } o->src_index = NULL; done: if (free_pattern_list) clear_pattern_list(&pl); - if (o->dir) { - dir_clear(o->dir); - o->dir = NULL; + if (o->internal.dir) { + dir_clear(o->internal.dir); + o->internal.dir = NULL; } trace2_region_leave("unpack_trees", "unpack_trees", the_repository); trace_performance_leave("unpack_trees"); return ret; return_failed: - if (o->show_all_errors) + if (o->internal.show_all_errors) display_error_msgs(o); mark_all_ce_unused(o->src_index); ret = unpack_failed(o, NULL); @@ -2089,16 +2097,17 @@ return_failed: * * CE_NEW_SKIP_WORKTREE is used internally. */ -enum update_sparsity_result update_sparsity(struct unpack_trees_options *o) +enum update_sparsity_result update_sparsity(struct unpack_trees_options *o, + struct pattern_list *pl) { enum update_sparsity_result ret = UPDATE_SPARSITY_SUCCESS; - struct pattern_list pl; int i; unsigned old_show_all_errors; int free_pattern_list = 0; - old_show_all_errors = o->show_all_errors; - o->show_all_errors = 1; + old_show_all_errors = o->internal.show_all_errors; + o->internal.show_all_errors = 1; + index_state_init(&o->internal.result, o->src_index->repo); /* Sanity checks */ if (!o->update || o->index_only || o->skip_sparse_checkout) @@ -2109,20 +2118,19 @@ enum update_sparsity_result update_sparsity(struct unpack_trees_options *o) trace_performance_enter(); /* If we weren't given patterns, use the recorded ones */ - if (!o->pl) { - memset(&pl, 0, sizeof(pl)); + if (!pl) { free_pattern_list = 1; - populate_from_existing_patterns(o, &pl); - if (o->skip_sparse_checkout) - goto skip_sparse_checkout; + pl = xcalloc(1, sizeof(*pl)); + populate_from_existing_patterns(o, pl); } + o->internal.pl = pl; /* Expand sparse directories as needed */ - expand_index(o->src_index, o->pl); + expand_index(o->src_index, o->internal.pl); /* Set NEW_SKIP_WORKTREE on existing entries. */ mark_all_ce_unused(o->src_index); - mark_new_skip_worktree(o->pl, o->src_index, 0, + mark_new_skip_worktree(o->internal.pl, o->src_index, 0, CE_NEW_SKIP_WORKTREE, o->verbose_update); /* Then loop over entries and update/remove as needed */ @@ -2142,14 +2150,16 @@ enum update_sparsity_result update_sparsity(struct unpack_trees_options *o) ret = UPDATE_SPARSITY_WARNINGS; } -skip_sparse_checkout: if (check_updates(o, o->src_index)) ret = UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES; display_warning_msgs(o); - o->show_all_errors = old_show_all_errors; - if (free_pattern_list) - clear_pattern_list(&pl); + o->internal.show_all_errors = old_show_all_errors; + if (free_pattern_list) { + clear_pattern_list(pl); + free(pl); + o->internal.pl = NULL; + } trace_performance_leave("update_sparsity"); return ret; } @@ -2244,15 +2254,15 @@ static int verify_uptodate_sparse(const struct cache_entry *ce, } /* - * TODO: We should actually invalidate o->result, not src_index [1]. + * TODO: We should actually invalidate o->internal.result, not src_index [1]. * But since cache tree and untracked cache both are not copied to - * o->result until unpacking is complete, we invalidate them on + * o->internal.result until unpacking is complete, we invalidate them on * src_index instead with the assumption that they will be copied to * dst_index at the end. * * [1] src_index->cache_tree is also used in unpack_callback() so if - * we invalidate o->result, we need to update it to use - * o->result.cache_tree as well. + * we invalidate o->internal.result, we need to update it to use + * o->internal.result.cache_tree as well. */ static void invalidate_ce_path(const struct cache_entry *ce, struct unpack_trees_options *o) @@ -2336,8 +2346,8 @@ static int verify_clean_subdirectory(const struct cache_entry *ce, pathbuf = xstrfmt("%.*s/", namelen, ce->name); memset(&d, 0, sizeof(d)); - if (o->dir) - d.exclude_per_dir = o->dir->exclude_per_dir; + if (o->internal.dir) + setup_standard_excludes(&d); i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL); dir_clear(&d); free(pathbuf); @@ -2391,8 +2401,8 @@ static int check_ok_to_remove(const char *name, int len, int dtype, if (ignore_case && icase_exists(o, name, len, st)) return 0; - if (o->dir && - is_excluded(o->dir, o->src_index, name, &dtype)) + if (o->internal.dir && + is_excluded(o->internal.dir, o->src_index, name, &dtype)) /* * ce->name is explicitly excluded, so it is Ok to * overwrite it. @@ -2420,7 +2430,7 @@ static int check_ok_to_remove(const char *name, int len, int dtype, * delete this path, which is in a subdirectory that * is being replaced with a blob. */ - result = index_file_exists(&o->result, name, len, 0); + result = index_file_exists(&o->internal.result, name, len, 0); if (result) { if (result->ce_flags & CE_REMOVE) return 0; @@ -2521,7 +2531,7 @@ static int merged_entry(const struct cache_entry *ce, struct unpack_trees_options *o) { int update = CE_UPDATE; - struct cache_entry *merge = dup_cache_entry(ce, &o->result); + struct cache_entry *merge = dup_cache_entry(ce, &o->internal.result); if (!old) { /* @@ -2616,7 +2626,7 @@ static int merged_sparse_dir(const struct cache_entry * const *src, int n, setup_traverse_info(&info, src[0]->name); info.fn = unpack_sparse_callback; info.data = o; - info.show_all_errors = o->show_all_errors; + info.show_all_errors = o->internal.show_all_errors; info.pathspec = o->pathspec; /* Get the tree descriptors of the sparse directory in each of the merging trees */ @@ -2834,7 +2844,7 @@ int threeway_merge(const struct cache_entry * const *stages, return -1; } - o->nontrivial_merge = 1; + o->internal.nontrivial_merge = 1; /* #2, #3, #4, #6, #7, #9, #10, #11. */ count = 0; @@ -2875,9 +2885,9 @@ int twoway_merge(const struct cache_entry * const *src, const struct cache_entry *oldtree = src[1]; const struct cache_entry *newtree = src[2]; - if (o->merge_size != 2) + if (o->internal.merge_size != 2) return error("Cannot do a twoway merge of %d trees", - o->merge_size); + o->internal.merge_size); if (oldtree == o->df_conflict_entry) oldtree = NULL; @@ -2957,9 +2967,9 @@ int bind_merge(const struct cache_entry * const *src, const struct cache_entry *old = src[0]; const struct cache_entry *a = src[1]; - if (o->merge_size != 1) + if (o->internal.merge_size != 1) return error("Cannot do a bind merge of %d trees", - o->merge_size); + o->internal.merge_size); if (a && old) return o->quiet ? -1 : error(ERRORMSG(o, ERROR_BIND_OVERLAP), @@ -2983,9 +2993,9 @@ int oneway_merge(const struct cache_entry * const *src, const struct cache_entry *old = src[0]; const struct cache_entry *a = src[1]; - if (o->merge_size != 1) + if (o->internal.merge_size != 1) return error("Cannot do a oneway merge of %d trees", - o->merge_size); + o->internal.merge_size); if (!a || a == o->df_conflict_entry) return deleted_entry(old, old, o); @@ -3020,8 +3030,8 @@ int stash_worktree_untracked_merge(const struct cache_entry * const *src, const struct cache_entry *worktree = src[1]; const struct cache_entry *untracked = src[2]; - if (o->merge_size != 2) - BUG("invalid merge_size: %d", o->merge_size); + if (o->internal.merge_size != 2) + BUG("invalid merge_size: %d", o->internal.merge_size); if (worktree && untracked) return error(_("worktree and untracked commit have duplicate entries: %s"), diff --git a/unpack-trees.h b/unpack-trees.h index 3a7b3e5f00..61c06eb7c5 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -59,47 +59,54 @@ struct unpack_trees_options { preserve_ignored, clone, index_only, - nontrivial_merge, trivial_merges_only, verbose_update, aggressive, skip_unmerged, initial_checkout, diff_index_cached, - debug_unpack, skip_sparse_checkout, quiet, exiting_early, - show_all_errors, dry_run, skip_cache_tree_update; enum unpack_trees_reset_type reset; const char *prefix; const char *super_prefix; - int cache_bottom; struct pathspec *pathspec; merge_fn_t fn; - const char *msgs[NB_UNPACK_TREES_WARNING_TYPES]; - struct strvec msgs_to_free; - /* - * Store error messages in an array, each case - * corresponding to a error message type - */ - struct string_list unpack_rejects[NB_UNPACK_TREES_WARNING_TYPES]; int head_idx; - int merge_size; - struct cache_entry *df_conflict_entry; + struct cache_entry *df_conflict_entry; /* output only */ void *unpack_data; struct index_state *dst_index; struct index_state *src_index; - struct index_state result; - struct pattern_list *pl; /* for internal use */ - struct dir_struct *dir; /* for internal use only */ struct checkout_metadata meta; + + struct unpack_trees_options_internal { + unsigned int nontrivial_merge, + show_all_errors, + debug_unpack; /* used by read-tree debugging */ + + int merge_size; /* used by read-tree debugging */ + int cache_bottom; + const char *msgs[NB_UNPACK_TREES_WARNING_TYPES]; + struct strvec msgs_to_free; + + /* + * Store error messages in an array, each case + * corresponding to a error message type + */ + struct string_list unpack_rejects[NB_UNPACK_TREES_WARNING_TYPES]; + + struct index_state result; + + struct pattern_list *pl; + struct dir_struct *dir; + } internal; }; int unpack_trees(unsigned n, struct tree_desc *t, @@ -112,7 +119,8 @@ enum update_sparsity_result { UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES = -2 }; -enum update_sparsity_result update_sparsity(struct unpack_trees_options *options); +enum update_sparsity_result update_sparsity(struct unpack_trees_options *options, + struct pattern_list *pl); int verify_uptodate(const struct cache_entry *ce, struct unpack_trees_options *o); diff --git a/upload-pack.c b/upload-pack.c index 551f22ffa5..41b9362cf1 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -1,5 +1,6 @@ #include "cache.h" #include "config.h" +#include "hex.h" #include "refs.h" #include "pkt-line.h" #include "sideband.h" @@ -1699,7 +1700,7 @@ enum fetch_state { FETCH_DONE, }; -int upload_pack_v2(struct repository *r, struct packet_reader *request) +int upload_pack_v2(struct repository *r UNUSED, struct packet_reader *request) { enum fetch_state state = FETCH_PROCESS_ARGS; struct upload_pack_data data; @@ -1775,26 +1776,26 @@ int upload_pack_advertise(struct repository *r, strbuf_addstr(value, "shallow wait-for-done"); - if (!repo_config_get_bool(the_repository, + if (!repo_config_get_bool(r, "uploadpack.allowfilter", &allow_filter_value) && allow_filter_value) strbuf_addstr(value, " filter"); - if (!repo_config_get_bool(the_repository, + if (!repo_config_get_bool(r, "uploadpack.allowrefinwant", &allow_ref_in_want) && allow_ref_in_want) strbuf_addstr(value, " ref-in-want"); if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) || - (!repo_config_get_bool(the_repository, + (!repo_config_get_bool(r, "uploadpack.allowsidebandall", &allow_sideband_all_value) && allow_sideband_all_value)) strbuf_addstr(value, " sideband-all"); - if (!repo_config_get_string(the_repository, + if (!repo_config_get_string(r, "uploadpack.blobpackfileuri", &str) && str) { @@ -1,4 +1,6 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "hex.h" +#include "strbuf.h" #include "url.h" int is_urlschemechar(int first_flag, int ch) diff --git a/urlmatch.c b/urlmatch.c index 620a648efc..eba0bdd77f 100644 --- a/urlmatch.c +++ b/urlmatch.c @@ -1,4 +1,7 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "gettext.h" +#include "hex.h" +#include "strbuf.h" #include "urlmatch.h" #define URL_ALPHA "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" diff --git a/userdiff.c b/userdiff.c index 58a3d59ef8..09203fbc35 100644 --- a/userdiff.c +++ b/userdiff.c @@ -1,7 +1,9 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "config.h" #include "userdiff.h" #include "attr.h" +#include "strbuf.h" static struct userdiff_driver *drivers; static int ndrivers; @@ -1,4 +1,5 @@ #include "cache.h" +#include "hex.h" #include "walker.h" #include "repository.h" #include "object-store.h" diff --git a/wildmatch.c b/wildmatch.c index 7e5a7ea1ea..42e38e3459 100644 --- a/wildmatch.c +++ b/wildmatch.c @@ -9,7 +9,7 @@ ** work differently than '*', and to fix the character-class code. */ -#include "cache.h" +#include "git-compat-util.h" #include "wildmatch.h" typedef unsigned char uchar; diff --git a/worktree.c b/worktree.c index aa43c64119..c99939a4d1 100644 --- a/worktree.c +++ b/worktree.c @@ -1,4 +1,5 @@ -#include "cache.h" +#include "git-compat-util.h" +#include "alloc.h" #include "repository.h" #include "refs.h" #include "strbuf.h" diff --git a/worktree.h b/worktree.h index 9dcea6fc8c..2baeca2a8a 100644 --- a/worktree.h +++ b/worktree.h @@ -1,7 +1,6 @@ #ifndef WORKTREE_H #define WORKTREE_H -#include "cache.h" #include "refs.h" struct strbuf; diff --git a/wt-status.c b/wt-status.c index 3162241a57..90525bd26f 100644 --- a/wt-status.c +++ b/wt-status.c @@ -4,6 +4,7 @@ #include "dir.h" #include "commit.h" #include "diff.h" +#include "hex.h" #include "revision.h" #include "diffcore.h" #include "quote.h" diff --git a/xdiff-interface.c b/xdiff-interface.c index e87950de32..5baf6ceb94 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -1,5 +1,6 @@ #include "cache.h" #include "config.h" +#include "hex.h" #include "object-store.h" #include "xdiff-interface.h" #include "xdiff/xtypes.h" diff --git a/xdiff-interface.h b/xdiff-interface.h index 4301a7eef2..3750794afe 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -1,7 +1,7 @@ #ifndef XDIFF_INTERFACE_H #define XDIFF_INTERFACE_H -#include "cache.h" +#include "hash.h" #include "xdiff/xdiff.h" /* |