Skip to main content

Browse the archive

https://github.com/git/git
31 May 2024, 23:06:24 UTC
Revision 3c7896e36202c09a5f124730b40f243ae94ffa62 authored by Junio C Hamano on 20 January 2023, 23:36:21 UTC, committed by Johannes Schindelin on 22 March 2023, 17:00:36 UTC 
Merge branch 'backport/jk/curl-avoid-deprecated-api' into maint-2.30
 
Deal with a few deprecation warning from cURL library.

* jk/curl-avoid-deprecated-api:
  http: support CURLOPT_PROTOCOLS_STR
  http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
  http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
2 parent s 6f5ff3a + 07f91e5
Raw File
Tip revision: 3c7896e36202c09a5f124730b40f243ae94ffa62 authored by Junio C Hamano on 20 January 2023, 23:36:21 UTC
Merge branch 'backport/jk/curl-avoid-deprecated-api' into maint-2.30
Tip revision: 3c7896e
fmt-merge-msg.h 
#ifndef FMT_MERGE_MSG_H
#define FMT_MERGE_MSG_H

#include "strbuf.h"

#define DEFAULT_MERGE_LOG_LEN 20

struct fmt_merge_msg_opts {
	unsigned add_title:1,
		credit_people:1;
	int shortlog_len;
};

extern int merge_log_config;
int fmt_merge_msg_config(const char *key, const char *value, void *cb);
int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
		  struct fmt_merge_msg_opts *);


#endif /* FMT_MERGE_MSG_H */
back to top