mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'es/format-patch-interdiff-cleanup'

Browse Source 
"format-patch --range-diff=<prev> <origin>..HEAD" has been taught
not to ignore <origin> when <prev> is a single version.

* es/format-patch-interdiff-cleanup:
  format-patch: use 'origin' as start of current-series-range when known
  diff-lib: tighten show_interdiff()'s interface
  diff: move show_interdiff() from its own file to diff-lib
This commit is contained in:
Junio C Hamano
2020-09-22 12:36:28 -07:00
parent bcb68bff80 07a7f8debf
commit 634e0084fa
7 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
builtin/log.c
View File

@ -33,7 +33,6 @@
#include "commit-slab.h"
#include "repository.h"
#include "commit-reach.h"
#include "interdiff.h"
#include "range-diff.h"
#define MAIL_DEFAULT_WRAP 72
@ -1207,7 +1206,8 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
if (rev->idiff_oid1) {
fprintf_ln(rev->diffopt.file, "%s", rev->idiff_title);
show_interdiff(rev, 0);
show_interdiff(rev->idiff_oid1, rev->idiff_oid2, 0,
&rev->diffopt);
}
if (rev->rdiff1) {
@ -1595,16 +1595,20 @@ static void infer_range_diff_ranges(struct strbuf *r1,
struct commit *head)
{
const char *head_oid = oid_to_hex(&head->object.oid);
int prev_is_range = !!strstr(prev, "..");
if (!strstr(prev, "..")) {
strbuf_addf(r1, "%s..%s", head_oid, prev);
strbuf_addf(r2, "%s..%s", prev, head_oid);
} else if (!origin) {
die(_("failed to infer range-diff ranges"));
} else {
if (prev_is_range)
strbuf_addstr(r1, prev);
strbuf_addf(r2, "%s..%s",
oid_to_hex(&origin->object.oid), head_oid);
else
strbuf_addf(r1, "%s..%s", head_oid, prev);
if (origin)
strbuf_addf(r2, "%s..%s", oid_to_hex(&origin->object.oid), head_oid);
else if (prev_is_range)
die(_("failed to infer range-diff origin of current series"));
else {
warning(_("using '%s' as range-diff origin of current series"), prev);
strbuf_addf(r2, "%s..%s", prev, head_oid);
}
}