Skip to main content

Browse the archive

Revision 4056afbcf2d3ee3e9df2788656f3197cc363a2ee authored by Junio C Hamano on 23 February 2012, 05:55:06 UTC, committed by Junio C Hamano on 23 February 2012, 05:55:06 UTC 
am -3: allow nonstandard -p<num> option
 
When falling back to 3-way merge, we run "git apply" to synthesize the
fake ancestor tree by parsing the incoming patch, and another "git apply"
to apply the patch to the fake ancestor tree.  Both invocation need to
be aware of the custom -p<num> setting to parse patches that were prepared
with non-standard src/dst prefix.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent d0482e8
Raw File
notes-cache.h 
#ifndef NOTES_CACHE_H
#define NOTES_CACHE_H

#include "notes.h"

struct notes_cache {
	struct notes_tree tree;
	char *validity;
};

void notes_cache_init(struct notes_cache *c, const char *name,
		     const char *validity);
int notes_cache_write(struct notes_cache *c);

char *notes_cache_get(struct notes_cache *c, unsigned char sha1[20], size_t
		      *outsize);
int notes_cache_put(struct notes_cache *c, unsigned char sha1[20],
		    const char *data, size_t size);

#endif /* NOTES_CACHE_H */
back to top