Skip to content

Commit

Permalink
format-patch: show patch text for the root commit
Browse files Browse the repository at this point in the history
Even without --root specified, if the range given on the command line
happens to include a root commit, we should include its patch text in the
output.

This fix deliberately ignores log.showroot configuration variable because
"format-patch" and "log -p" can and should behave differently in this
case, as the former is about exporting a part of your history in a form
that is replayable elsewhere and just giving the commit log message
without the patch text does not make any sense for that purpose.

Noticed and fix originally attempted by Nathan W. Panike; credit goes to
Alexander Potashev for injecting sanity to my initial (broken) fix that
used the value from log.showroot configuration, which was misguided.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Jan 11, 2009
1 parent 141201d commit 68c2ec7
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions builtin-log.c
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
* get_revision() to do the usual traversal.
*/
}

/*
* We cannot move this anywhere earlier because we do want to
* know if --root was given explicitly from the comand line.
*/
rev.show_root_diff = 1;

if (cover_letter) {
/* remember the range */
int i;
Expand Down

0 comments on commit 68c2ec7

Please sign in to comment.