Re: q: faster way to integrate/merge lots of topic branches?

3 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: q: faster way to integrate/merge lots of topic branches?

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:00

Ingo Molnar [off-list ref] writes:
hm, it's very slow:

  $ time git branch --no-merged
  [...]

  real    0m9.177s
  user    0m9.027s
  sys     0m0.129s

when running it on tip/master:

  http://people.redhat.com/mingo/tip.git/README
Hmmm, does not reproduce for me with a copy of that repository.

$ time git branch -a --no-merged mingo/master
  linus/master
  mingo/acpi-for-len
  mingo/auto-cpus4096-next
  mingo/auto-kmemcheck-next
  mingo/auto-test
  mingo/auto-test-fixes
  mingo/core/futex-64bit
  mingo/core/kill-the-BKL
  mingo/core/percpu-zerobased
  mingo/cpus4096-for-linus
  mingo/kmemcheck-for-linus
  mingo/stackprotector-for-linus
  mingo/timers/for-linus
  mingo/tip
  mingo/tracing/ftrace
  mingo/tracing/immediates
  mingo/tracing/markers
  mingo/tracing/stopmachine-allcpus
  mingo/tracing/textedit
  mingo/x86/acpi-rename-acpi_nmi
  mingo/x86/audit-speedup
  mingo/x86/crashdump
  mingo/x86/header-guards
  mingo/x86/prototypes
  mingo/x86/sparse-fixes
  mingo/x86/unify-mce
  mingo/x86/x2apic

real    0m1.442s
user    0m1.360s
sys     0m0.084s

With the patch I posted earlier, the time becomes:

real    0m0.600s
user    0m0.560s
sys     0m0.040s

Re: q: faster way to integrate/merge lots of topic branches?

From: Ingo Molnar <hidden>
Date: 2016-06-15 22:45:00

* Junio C Hamano [off-list ref] wrote:
Ingo Molnar [off-list ref] writes:
quoted
hm, it's very slow:

  $ time git branch --no-merged
  [...]

  real    0m9.177s
  user    0m9.027s
  sys     0m0.129s

when running it on tip/master:

  http://people.redhat.com/mingo/tip.git/README
Hmmm, does not reproduce for me with a copy of that repository.
perhaps you need to run tip-create-local-branches.sh to create all the 
local branches? You can find it in:

  tip/tip .tip/bin/tip-create-local-branches.sh

(does/should the presence of local branches matter?)

	Ingo

Re: q: faster way to integrate/merge lots of topic branches?

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:02

Ingo Molnar [off-list ref] writes:
perhaps you need to run tip-create-local-branches.sh to create all the 
local branches? You can find it in:

  tip/tip .tip/bin/tip-create-local-branches.sh

(does/should the presence of local branches matter?)
My refs/remotes/mingo/ hierarchy has as many branches as you do in your
repository as local branches, and I presume you do not have these tracking
branches as I do because you are the upstream of this repository, so
overall we have about the same number of refs.  In the experiment, I did
"branch -a --no-merged" (notice -a), so I do not think the difference
should have mattered.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help