https://github.com/git/git
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
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
merge-blobs.h
#ifndef MERGE_BLOBS_H
#define MERGE_BLOBS_H

struct blob;
struct index_state;

void *merge_blobs(struct index_state *, const char *,
		  struct blob *, struct blob *,
		  struct blob *, unsigned long *);

#endif /* MERGE_BLOBS_H */
back to top