mirror of
https://github.com/git/git
synced 2024-07-17 11:07:55 +00:00
99370863e2
Add a trivial rule for "write_cache_as_tree" to
"index-compatibility.cocci", and apply it. This was left out of the
rules added in 0e6550a2c6 (cocci: add a
index-compatibility.pending.cocci, 2022-11-19) because this
compatibility wrapper lived in "cache-tree.h", not "cache.h"
But it's like the other "USE_THE_INDEX_COMPATIBILITY_MACROS", so let's
migrate it too.
The replacement of "USE_THE_INDEX_COMPATIBILITY_MACROS" here with
"USE_THE_INDEX_VARIABLE" is a manual change on top, now that these
files only use "&the_index", and don't need any compatibility
macros (or functions).
The wrapping of some argument lists is likewise manual, as coccinelle
would otherwise give us overly long argument lists.
The reason for putting the "O" in the cocci rule on the "-" and "+"
lines is because I couldn't get correct whitespacing otherwise,
i.e. I'd end up with "oid,&the_index", not "oid, &the_index".
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
59 lines
1.5 KiB
C
59 lines
1.5 KiB
C
/*
|
|
* GIT - The information manager from hell
|
|
*
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
*/
|
|
#define USE_THE_INDEX_VARIABLE
|
|
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "config.h"
|
|
#include "tree.h"
|
|
#include "cache-tree.h"
|
|
#include "parse-options.h"
|
|
|
|
static const char * const write_tree_usage[] = {
|
|
N_("git write-tree [--missing-ok] [--prefix=<prefix>/]"),
|
|
NULL
|
|
};
|
|
|
|
int cmd_write_tree(int argc, const char **argv, const char *cmd_prefix)
|
|
{
|
|
int flags = 0, ret;
|
|
const char *tree_prefix = NULL;
|
|
struct object_id oid;
|
|
const char *me = "git-write-tree";
|
|
struct option write_tree_options[] = {
|
|
OPT_BIT(0, "missing-ok", &flags, N_("allow missing objects"),
|
|
WRITE_TREE_MISSING_OK),
|
|
OPT_STRING(0, "prefix", &tree_prefix, N_("<prefix>/"),
|
|
N_("write tree object for a subdirectory <prefix>")),
|
|
{ OPTION_BIT, 0, "ignore-cache-tree", &flags, NULL,
|
|
N_("only useful for debugging"),
|
|
PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, NULL,
|
|
WRITE_TREE_IGNORE_CACHE_TREE },
|
|
OPT_END()
|
|
};
|
|
|
|
git_config(git_default_config, NULL);
|
|
argc = parse_options(argc, argv, cmd_prefix, write_tree_options,
|
|
write_tree_usage, 0);
|
|
|
|
ret = write_index_as_tree(&oid, &the_index, get_index_file(), flags,
|
|
tree_prefix);
|
|
switch (ret) {
|
|
case 0:
|
|
printf("%s\n", oid_to_hex(&oid));
|
|
break;
|
|
case WRITE_TREE_UNREADABLE_INDEX:
|
|
die("%s: error reading the index", me);
|
|
break;
|
|
case WRITE_TREE_UNMERGED_INDEX:
|
|
die("%s: error building trees", me);
|
|
break;
|
|
case WRITE_TREE_PREFIX_ERROR:
|
|
die("%s: prefix %s not found", me, tree_prefix);
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|