diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 22:18:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 22:18:46 +0200 |
| commit | 8202d12fca5d482640a51c663d4d556c46dbc6b8 (patch) | |
| tree | f5440c439b27b06e00f5d0a5229e42bf7131c20e /diff.h | |
| parent | Merge branch 'nd/init-relative-template-fix' (diff) | |
| parent | format-patch: make --base patch-id output stable (diff) | |
| download | git-8202d12fca5d482640a51c663d4d556c46dbc6b8.tar.xz git-8202d12fca5d482640a51c663d4d556c46dbc6b8.zip | |
Merge branch 'sb/format-patch-base-patch-id-fix'
The "--base" option of "format-patch" computed the patch-ids for
prerequisite patches in an unstable way, which has been updated to
compute in a way that is compatible with "git patch-id --stable".
* sb/format-patch-base-patch-id-fix:
format-patch: make --base patch-id output stable
format-patch: inform user that patch-id generation is unstable
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -436,7 +436,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option); int run_diff_index(struct rev_info *revs, int cached); int do_diff_cache(const struct object_id *, struct diff_options *); -int diff_flush_patch_id(struct diff_options *, struct object_id *, int); +int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int); +void flush_one_hunk(struct object_id *, git_SHA_CTX *); int diff_result_code(struct diff_options *, int); |