diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:41 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:41 -0400 |
| commit | 160314e62537274d88c939bed957f623cda13da4 (patch) | |
| tree | a5d8240095a1968922c9dbe4336915547b91754a /builtin/log.c | |
| parent | The eighth batch (diff) | |
| parent | builtin: patch-id: remove unused diff-tree prefix (diff) | |
| download | git-160314e62537274d88c939bed957f623cda13da4.tar.gz git-160314e62537274d88c939bed957f623cda13da4.zip | |
Merge branch 'jz/patch-id'
A new "--include-whitespace" option is added to "git patch-id", and
existing bugs in the internal patch-id logic that did not match
what "git patch-id" produces have been corrected.
* jz/patch-id:
builtin: patch-id: remove unused diff-tree prefix
builtin: patch-id: add --verbatim as a command mode
patch-id: fix patch-id for mode changes
builtin: patch-id: fix patch-id with binary diffs
patch-id: use stable patch-id for rebases
patch-id: fix stable patch id for binary / header-only
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index ee19dc5d45..e72869afb3 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1763,7 +1763,7 @@ static void prepare_bases(struct base_tree_info *bases, struct object_id *patch_id; if (*commit_base_at(&commit_base, commit)) continue; - if (commit_patch_id(commit, &diffopt, &oid, 0, 1)) + if (commit_patch_id(commit, &diffopt, &oid, 0)) die(_("cannot get patch id")); ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id); patch_id = bases->patch_id + bases->nr_patch_id; |