Revision c7cb333f60db9b8313da75c2075a3619202e905d authored by Junio C Hamano on 12 March 2014, 20:43:51 UTC, committed by Junio C Hamano on 12 March 2014, 21:08:05 UTC
When we show unmerged paths, we had an artificial 20 columns floor
for the width of labels (e.g. "both deleted:") shown next to the
pathnames.  Depending on the locale, this may result in a label that
is too wide when all the label strings are way shorter than 20
columns, or no-op when a label string is longer than 20 columns.

Just drop the artificial floor.  The screen real estate is better
utilized this way when all the strings are shorter.

Adjust the tests to this change.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 8f17f5b
Raw File
gpg-interface.h
#ifndef GPG_INTERFACE_H
#define GPG_INTERFACE_H

struct signature_check {
	char *gpg_output;
	char *gpg_status;
	char result; /* 0 (not checked),
		      * N (checked but no further result),
		      * U (untrusted good),
		      * G (good)
		      * B (bad) */
	char *signer;
	char *key;
};

extern int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key);
extern int verify_signed_buffer(const char *payload, size_t payload_size, const char *signature, size_t signature_size, struct strbuf *gpg_output, struct strbuf *gpg_status);
extern int git_gpg_config(const char *, const char *, void *);
extern void set_signing_key(const char *);
extern const char *get_signing_key(void);

#endif
back to top