mirror of
https://github.com/git/git.git
synced 2024-06-06 20:46:13 +02:00
338abb0f04
Change various cmd_* functions that claim to return an "int" to use
"return" instead of exit() to indicate an exit code. These were not
marked with NORETURN, and by directly exit()-ing we'll skip the
cleanup git.c would otherwise do (e.g. closing fd's, erroring if we
can't). See run_builtin() in git.c.
In the case of shell.c and sh-i18n--envsubst.c this was the result of
an incomplete migration to using a cmd_main() in 3f2e2297b9 (add an
extra level of indirection to main(), 2016-07-01).
This was spotted by SunCC 12.5 on Solaris 10 (gcc210 on the gccfarm).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
28 lines
667 B
C
28 lines
667 B
C
#include "test-tool.h"
|
|
#include "cache.h"
|
|
#include "tree.h"
|
|
|
|
int cmd__match_trees(int ac, const char **av)
|
|
{
|
|
struct object_id hash1, hash2, shifted;
|
|
struct tree *one, *two;
|
|
|
|
setup_git_directory();
|
|
|
|
if (get_oid(av[1], &hash1))
|
|
die("cannot parse %s as an object name", av[1]);
|
|
if (get_oid(av[2], &hash2))
|
|
die("cannot parse %s as an object name", av[2]);
|
|
one = parse_tree_indirect(&hash1);
|
|
if (!one)
|
|
die("not a tree-ish %s", av[1]);
|
|
two = parse_tree_indirect(&hash2);
|
|
if (!two)
|
|
die("not a tree-ish %s", av[2]);
|
|
|
|
shift_tree(the_repository, &one->object.oid, &two->object.oid, &shifted, -1);
|
|
printf("shifted: %s\n", oid_to_hex(&shifted));
|
|
|
|
return 0;
|
|
}
|