On Fri, Jun 16, 2017 at 10:48:25AM -0400, J William Piggott wrote: > > This seems unusual, two identical commits: > > --- patch.1 2017-06-15 14:07:08.316861600 -0400 > +++ patch.2 2017-06-15 14:07:25.964305209 -0400 > @@ -1,4 +1,4 @@ > -commit b1557fe98120132e6671924af4ed69f4e21d3de4 > +commit 3a5ce6e7efe62e1f583c090f907bf8518ce2f4ba > Author: Sami Kerola <kerolasa@xxxxxx> > Date: Tue May 16 09:18:24 2017 +0100 > > @@ -35,7 +35,7 @@ > FILE *stream = status ? stderr : stdout; > > diff --git a/login-utils/last.c b/login-utils/last.c > -index c90b574..50451b2 100644 > +index f93ec7f..d230deb 100644 This can happen if you rebase a commit, and the files you touch have changed in the meantime, but your original hunks still apply without any conflicts or changes in the context. In this case, the surrounding history looks like: $ git log --graph --topo-order --oneline --decorate e228735 | head -n9 * e228735 Merge branch 'master' of ra.kernel.org:/pub/scm/utils/util-linux/util-linux |\ | * 2a38433 Merge branch 'sami-fallthrough' of https://github.com/rudimeier/util-linux | |\ | | * 3a5ce6e misc: fix ggc-7 fallthrough warnings * | | 098a75a wall: fix OSX getgrouplist, gid_t* vs int* * | | bda2676 misc: POSIX usage dd, regarding unit suffixes * | | 5abaf5b tests: add more tests for line(1) * | | b1557fe misc: fix ggc-7 fallthrough warnings So 2a38433, for whatever reason, decided to pull in the 3a5ce6e version of that commit, while the first-parent branch decided to pull in the b1557fe version. It ends up being a bit redundant, but shouldn't cause problems. Cheers, Trevor -- This email may be signed or encrypted with GnuPG (http://www.gnupg.org). For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
Attachment:
signature.asc
Description: OpenPGP digital signature
