Staging
v0.8.1
v0.8.1
Revision 90d0ed96b76ee51f8ae6f32923b92e7b20ba73c0 authored by Junio C Hamano on 28 February 2008, 21:09:30 UTC, committed by Junio C Hamano on 03 March 2008, 07:15:06 UTC
When we expect a git command to notice and signal errors, we carelessly wrote in our tests: test_expect_success 'reject bogus request' ' do something && do something else && ! git command ' but a non-zero exit could come from the "git command" segfaulting. A new helper function "tset_must_fail" is introduced and it is meant to be used to make sure the command gracefully fails (iow, dying and exiting with non zero status is counted as a failure to "gracefully fail"). The above example should be written as: test_expect_success 'reject bogus request' ' do something && do something else && test_must_fail git command ' Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent fcbcfe7
builtin-merge-ours.c
/*
* Implementation of git-merge-ours.sh as builtin
*
* Copyright (c) 2007 Thomas Harning Jr
* Original:
* Original Copyright (c) 2005 Junio C Hamano
*
* Pretend we resolved the heads, but declare our tree trumps everybody else.
*/
#include "git-compat-util.h"
#include "builtin.h"
static const char *diff_index_args[] = {
"diff-index", "--quiet", "--cached", "HEAD", "--", NULL
};
#define NARGS (ARRAY_SIZE(diff_index_args) - 1)
int cmd_merge_ours(int argc, const char **argv, const char *prefix)
{
/*
* We need to exit with 2 if the index does not match our HEAD tree,
* because the current index is what we will be committing as the
* merge result.
*/
if (cmd_diff_index(NARGS, diff_index_args, prefix))
exit(2);
exit(0);
}
Computing file changes ...