Skip to main content

Browse the archive

Revision 57b76d3379ade86d72cc9db83141e6ec084e6c8c authored by Junio C Hamano on 26 May 2016, 20:17:19 UTC, committed by Junio C Hamano on 26 May 2016, 20:17:19 UTC 
Merge branch 'bn/config-doc-tt-varnames' into maint
 
Doc formatting fixes.

* bn/config-doc-tt-varnames:
  config: consistently format $variables in monospaced font
  config: describe 'pathname' value type
2 parent s 4e327bb + f212dcc
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;

	setup_git_directory();

	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 tree-ish %s", av[1]);
	two = parse_tree_indirect(hash2);
	if (!two)
		die("not a tree-ish %s", av[2]);

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

	exit(0);
}
back to top