Skip to main content

Browse the archive

Revision b91a13bbdca0095b1dc9ffb06bcb5caf4aab56b6 authored by Junio C Hamano on 12 March 2012, 22:43:06 UTC, committed by Junio C Hamano on 12 March 2012, 22:43:15 UTC 
Merge branch 'jc/am-3-nonstandard-popt' into maint
 
The code to synthesize the fake ancestor tree used by 3-way merge
fallback in "git am" was not prepared to read a patch created with
a non-standard -p<num> value.

* jc/am-3-nonstandard-popt:
  test: "am -3" can accept non-standard -p<num>
  am -3: allow nonstandard -p<num> option
2 parent s 0dbe659 + a61ba26
Raw File
test-scrap-cache-tree.c 
#include "cache.h"
#include "tree.h"
#include "cache-tree.h"

static struct lock_file index_lock;

int main(int ac, char **av)
{
	int fd = hold_locked_index(&index_lock, 1);
	if (read_cache() < 0)
		die("unable to read index file");
	active_cache_tree = NULL;
	if (write_cache(fd, active_cache, active_nr)
	    || commit_lock_file(&index_lock))
		die("unable to write index file");
	return 0;
}
back to top