8000 Merge pull request #6842 from anatol/main · libgit2/libgit2@d58db64 · GitHub
[go: up one dir, main page]

Skip to content 8000

Commit d58db64

Browse files
authored
Merge pull request #6842 from anatol/main
Headers cleanup
2 parents 53c5cdb + 1f83c46 commit d58db64

File tree

6 files changed

+5
-27
lines changed

6 files changed

+5
-27
lines changed

include/git2/email.h

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -84,30 +84,6 @@ typedef struct {
8484
GIT_DIFF_FIND_OPTIONS_INIT \
8585
}
8686

87-
/**
88-
* Create a diff for a commit in mbox format for sending via email.
89-
*
90-
* @param out buffer to store the e-mail patch in
91-
* @param diff the changes to include in the email
92-
* @param patch_idx the patch index
93-
* @param patch_count the total number of patches that will be included
94-
* @param commit_id the commit id for this change
95-
* @param summary the commit message for this change
96-
* @param body optional text to include above the diffstat
97-
* @param author the person who authored this commit
98-
* @param opts email creation options
99-
*/
100-
GIT_EXTERN(int) git_email_create_from_diff(
101-
git_buf *out,
102-
git_diff *diff,
103-
size_t patch_idx,
104-
size_t patch_count,
105-
const git_oid *commit_id,
106-
const char *summary,
107-
const char *body,
108-
const git_signature *author,
109-
const git_email_create_options *opts);
110-
11187
/**
11288
* Create a diff for a commit in mbox format for sending via email.
11389
* The commit must not be a merge commit.

include/git2/odb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ GIT_EXTERN(int) git_odb_expand_ids(
286286
* @param db database to refresh
287287
* @return 0 on success, error code otherwise
288288
*/
289-
GIT_EXTERN(int) git_odb_refresh(struct git_odb *db);
289+
GIT_EXTERN(int) git_odb_refresh(git_odb *db);
290290

291291
/**
292292
* List all objects available in the database

src/libgit2/diff.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "diff_generate.h"
1717

1818
#include "git2/version.h"
19-
#include "git2/email.h"
19+
#include "git2/sys/email.h"
2020

2121
struct patch_id_args {
2222
git_diff *diff;

src/libgit2/email.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "git2/email.h"
1818
#include "git2/patch.h"
19+
#include "git2/sys/email.h"
1920
#include "git2/version.h"
2021

2122
/*

src/libgit2/odb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1923,7 +1923,7 @@ void git_odb_backend_data_free(git_odb_backend *backend, void *data)
19231923
git__free(data);
19241924
}
19251925

1926-
int git_odb_refresh(struct git_odb *db)
1926+
int git_odb_refresh(git_odb *db)
19271927
{
19281928
size_t i;
19291929
int error;

tests/libgit2/email/create.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "clar.h"
22
#include "clar_libgit2.h"
3+
#include "git2/sys/email.h"
34

45
#include "diff_generate.h"
56

0 commit comments

Comments
 (0)
0