Skip to main content

Browse the archive

Revision 59f5ced65b46370a121916593cce7fcd210a15df authored by Björn Gustavsson on 06 March 2010, 14:31:17 UTC, committed by Junio C Hamano on 07 March 2010, 07:53:00 UTC 
t3417: Add test cases for "rebase --whitespace=fix"
 
The command "git rebase --whitespace=fix HEAD~<N>" is supposed to
only clean up trailing whitespace, and the expectation is that it
cannot fail.

Unfortunately, if one commit adds a blank line at the end of a file
and a subsequent commit adds more non-blank lines after the blank
line, "git apply" (used indirectly by "git rebase") will fail to apply
the patch of the second commit.

Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent c1376c1
Raw File
test-match-trees.c 
#include "cache.h"
#include "tree.h"

int main(int ac, char **av)
{
	unsigned char hash1[20], hash2[20], shifted[20];
	struct tree *one, *two;

	if (get_sha1(av[1], hash1))
		die("cannot parse %s as an object name", av[1]);
	if (get_sha1(av[2], hash2))
		die("cannot parse %s as an object name", av[2]);
	one = parse_tree_indirect(hash1);
	if (!one)
		die("not a treeish %s", av[1]);
	two = parse_tree_indirect(hash2);
	if (!two)
		die("not a treeish %s", av[2]);

	shift_tree(one->object.sha1, two->object.sha1, shifted, -1);
	printf("shifted: %s\n", sha1_to_hex(shifted));

	exit(0);
}
back to top