From: Beat Bolli Date: Wed, 13 Mar 2024 18:08:18 GMT Subject: Re: [PATCH 0/1] log: make the --oneline option work with -L Message-ID: In-Reply-To: On 13.03.24 18:31, Junio C Hamano wrote: > James Liu writes: > >> git-log accepts the --oneline option to display the short commit SHA and >> title only. This is a convenient option when searching through Git >> history, as it gives a rough idea of the changes introduced in each >> commit. git-log also accepts the -L flag, which lets us provide a line >> range for a given file. This is handy for limiting the search to a given >> area of interest. >> >> However, when --oneline is used in combination with -L, Git actually >> outputs the single line commit information _as well_ as the full diff. >> For example: >> >> git log --oneline -L 660:Documentation/MyFirstObjectWalk.txt >> >> will incorrectly display the diffs too. > > Why is it incorrect? > > * "git log" takes options to tweak formatting of the commit log, > options to tweak what commits are chosen, and options to tweak > how the diff are shown. > > * "--oneline" tweaks how the log message gets shown. Others in the > family are --pretty=fuller, --format='%h %s', etc. > > * "-L" tweaks how the diff gets shown (e.g. limits which part of > the diff is shown) and what commits are shown (e.g. limits to > commits that touch the specified area). > > So, just like "git log -L :" shows the commit log for > each commit that touches the specified area of the file, followed by > the diff that shows how the commit modified the range, it is natural > to expect "git log --oneline -L :" to show the same diff > after showing the commit log for these commits in the specified format, > namely, with just a one-line description. > > It is not limited to "-L"; "git log --oneline -p" is expected to > show the patch after a one-line description for the commit. > There's also "--no-patch" to suppress the patch. It combines well with "--oneline". -- Cheers, Beat