Skip to main content

Browse the archive

Revision 7b3b7e37581fb5266a260687c21af1571b4ade81 authored by Junio C Hamano on 21 December 2010, 18:35:53 UTC, committed by Junio C Hamano on 21 December 2010, 19:16:28 UTC 
am --abort: keep unrelated commits since the last failure and warn
 
After making commits (either by pulling or doing their own work) after a
failed "am", the user will be reminded by next "am" invocation that there
was a failed "am" that the user needs to decide to resolve or to get rid
of the old "am" attempt.  The "am --abort" option was meant to help the
latter.  However, it rewinded the HEAD back to the beginning of the failed
"am" attempt, discarding commits made (perhaps by mistake) since.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 05bb5a2
Raw File
test-string-pool.c 
/*
 * test-string-pool.c: code to exercise the svn importer's string pool
 */

#include "git-compat-util.h"
#include "vcs-svn/string_pool.h"

int main(int argc, char *argv[])
{
	const uint32_t unequal = pool_intern("does not equal");
	const uint32_t equal = pool_intern("equals");
	uint32_t buf[3];
	uint32_t n;

	if (argc != 2)
		usage("test-string-pool <string>,<string>");

	n = pool_tok_seq(3, buf, ",-", argv[1]);
	if (n >= 3)
		die("too many strings");
	if (n <= 1)
		die("too few strings");

	buf[2] = buf[1];
	buf[1] = (buf[0] == buf[2]) ? equal : unequal;
	pool_print_seq(3, buf, ' ', stdout);
	fputc('\n', stdout);

	pool_reset();
	return 0;
}
back to top