Git development
 help / color / mirror / Atom feed
From: "Philip Oakley" <philipoakley@iee.org>
To: "Git List" <git@vger.kernel.org>
Subject: avoid duplicate patches from git log ?
Date: Tue, 3 May 2016 21:11:55 +0100	[thread overview]
Message-ID: <712E44CFAD1A41A982AEF1540C1F9F80@PhilipOakley> (raw)

I was trying to search the Git for Windows (G4W) history for commits that 
touched MSVC.

I've used 'git log -SMSVC --pretty='tformat:%h (%s, 
%ad)' --date=short --reverse' to get a nice list of those commits.

However, as the G4W project (https://github.com/git-for-windows/git/) 
follows the main git repo and its releases, it needs to rebase it's fixup 
patches, while retaining their original series, so has repeated copies of 
those fix patches on the second parent path (a technique Dscho called 
rebasing merges).

for example:
> bf1a7ff (MinGW: disable CRT command line globbing, 2011-01-07)
> a05e9a8 (MinGW: disable CRT command line globbing, 2011-01-07)
> 45cfa35 (MinGW: disable CRT command line globbing, 2011-01-07)
> 1d35390 (MinGW: disable CRT command line globbing, 2011-01-07)
> 022e029 (MinGW: disable CRT command line globbing, 2011-01-07)


How can I filter out all the duplicate patches which are identical other 
than the commit date?

The --left --right and --cherry don't appear to do what I'd expect/hope. Any 
suggestions?
--
Philip

             reply	other threads:[~2016-05-03 20:12 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-03 20:11 Philip Oakley [this message]
2016-05-03 22:00 ` avoid duplicate patches from git log ? Jeff King
2016-05-03 22:12   ` Junio C Hamano
2016-05-03 22:36     ` Philip Oakley
2016-05-04 11:58       ` Johannes Schindelin
2016-05-04 19:15         ` Junio C Hamano
2016-05-04 11:44 ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=712E44CFAD1A41A982AEF1540C1F9F80@PhilipOakley \
    --to=philipoakley@iee.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox