Internal usage of patch-id in rebase / cherry-pick doesn't persist patch-ids, so there's no need to specifically invoke the unstable variant. This allows the unstable logic to be cleaned up. In the process, fixed a bug in the combination of --stable with binary files and header-only, and expanded the test to cover both binary and non-binary files. Signed-off-by: Jerry Zhang jerry@xxxxxxxxxx Jerry Zhang (2): patch-id: fix stable patch id for binary / header-only patch-id: use stable patch-id for rebases builtin/log.c | 2 +- diff.c | 44 ++++++++++++++++---------------------- diff.h | 2 +- patch-ids.c | 10 ++++----- patch-ids.h | 2 +- t/t3419-rebase-patch-id.sh | 19 ++++++++++------ 6 files changed, 39 insertions(+), 40 deletions(-) base-commit: e188ec3a735ae52a0d0d3c22f9df6b29fa613b1e Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1359%2Fjerry-skydio%2Fjerry%2Frevup%2Fmaster%2Fpatch_ids-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1359/jerry-skydio/jerry/revup/master/patch_ids-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/1359 Range-diff vs v1: 1: 82fe77c1ce0 ! 1: 945508df7b6 patch-id: fix stable patch id for binary / header-only @@ diff.c: static int diff_get_patch_id(struct diff_options *options, struct object - - if (diff_filespec_is_binary(options->repo, p->one) || + if (diff_header_only) { -+ // Don't do anything since we're only populating header info ++ /* don't do anything since we're only populating header info */ + } else if (diff_filespec_is_binary(options->repo, p->one) || diff_filespec_is_binary(options->repo, p->two)) { the_hash_algo->update_fn(&ctx, oid_to_hex(&p->one->oid), 2: 6abb1ced1bd = 2: 30ec43cd129 patch-id: use stable patch-id for rebases -- gitgitgadget
