Skip to main content

Browse the archive

Revision 3adab6f3a7793253b22a4a7aae34221d19e0236a authored by Junio C Hamano on 09 February 2012, 21:30:52 UTC, committed by Junio C Hamano on 09 February 2012, 21:30:52 UTC 
merge: do not launch an editor on "--no-edit $tag"
 
When the user explicitly asked us not to, don't launch an editor.

But do everything else the same way as the "edit" case, i.e. leave the
comment with verification result in the log template and record the
mergesig in the resulting merge commit for later inspection.

Based on initiail analysis by Jonathan Nieder.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent b5c9f1c
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