All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Cc: Andrew Morton <akpm@osdl.org>
Subject: Re: git-bisect problem
Date: Mon, 13 Feb 2006 16:33:05 -0800	[thread overview]
Message-ID: <7v3bimzsn2.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: 20060213015146.26e6c09d.akpm@osdl.org

Andrew Morton <akpm@osdl.org> writes:

> git-format-patch -o ~/a 386093ef9a6c88576d8b418bf1c8616d5e410a20 git-netdev-all
>
> and that chewed 10 minutes CPU time and produced no output, so I killed it.

A single commit is either:

	git format-patch -o ~/a 386093^ 386093
	git show 386093

But if you _did_ want to get everything that builds on top of
386093 (and Linus counted 1000+ commits if I recall),
format-patch could be optimized.  It currently does a lot more
than just format 1000+ commits, to handle case where "his" and
"mine" are not linear history and may have the same change
acquired by applying the same patch:

          1---2---3 mine
         /
     ---4---5---6 his

In this picture, it does not just format 1 2 3.  It first checks
1 2 3 5 6, and if each of 1 2 3 introduces the same change as
either 5 or 6 introduces to omit it from the output.  If 2 and 5
are the same change from 1 and 4 respectively, the final result
has 1 and 3.  This is OK and useful for smaller branch, but
clearly expensive for long branches.

This is omitted when the ancestry graph would look like this:
	
          1---2---3 mine
         /
     ---4 his

but that would not have helped in this case anyway.

Maybe we could have --no-omit-common flag or something to
disable this check.

  parent reply	other threads:[~2006-02-14  0:33 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-13  8:25 git-bisect problem Andrew Morton
2006-02-13  9:11 ` Junio C Hamano
2006-02-13  9:32   ` Andrew Morton
2006-02-13  9:39     ` Ryan Anderson
2006-02-13  9:51       ` Andrew Morton
2006-02-13  9:58         ` Fernando J. Pereda
2006-02-13 10:22           ` Luben Tuikov
2006-02-13 10:23           ` Luben Tuikov
2006-02-13 12:21           ` cat-file (was Re: git-bisect problem) Joshua N Pritikin
2006-02-13 10:14         ` git-bisect problem Ryan Anderson
2006-02-13 10:25           ` Andrew Morton
2006-02-13 16:44             ` Linus Torvalds
2006-02-13 10:40           ` Luben Tuikov
2006-02-13 10:44             ` Andrew Morton
2006-02-14  0:33         ` Junio C Hamano [this message]
2006-02-13 10:08     ` Junio C Hamano
2006-02-13 10:19       ` Andrew Morton
2006-02-14  0:32         ` Junio C Hamano
2006-02-14  0:56           ` Andrew Morton
2006-02-14  1:14             ` Linus Torvalds
2006-02-14  1:15             ` Petr Baudis
2006-02-14  1:27               ` Petr Baudis
2006-02-14  1:52             ` Junio C Hamano

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=7v3bimzsn2.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=akpm@osdl.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.