Re: git-rerere observations and feature suggestions
From: Miklos Vajna <hidden>
Date: 2016-06-15 22:44:47
On Wed, Jun 18, 2008 at 12:57:31PM +0200, Ingo Molnar [off-list ref] wrote:
just to demonstrate it, i tried today to do an octopus merge of 87 topic branches: git-merge build checkme core/checkme core/debugobjects core/futex-64bit core/iter-div core/kill-the-BKL core/locking core/misc core/percpu core/printk core/rcu core/rodata core/softirq core/softlockup core/stacktrace core/topology core/urgent cpus4096 genirq kmemcheck kmemcheck2 mm/xen out-of-tree pci-for-jesse safe-poison-pointers sched sched-devel scratch stackprotector timers/clockevents timers/hpet timers/hrtimers timers/nohz timers/posixtimers tip tracing/ftrace tracing/ftrace-mergefixups tracing/immediates tracing/markers tracing/mmiotrace tracing/mmiotrace-mergefixups tracing/nmisafe tracing/sched_markers tracing/stopmachine-allcpus tracing/sysprof tracing/textedit x86/apic x86/apm x86/bitops x86/build x86/checkme x86/cleanups x86/cpa x86/cpu x86/defconfig x86/delay x86/gart x86/i8259 x86/idle x86/intel x86/irq x86/irqstats x86/kconfig x86/ldt x86/mce x86/memtest x86/mmio x86/mpparse x86/nmi x86/numa x86/numa-fixes x86/pat x86/pebs x86/ptemask x86/resumetrace x86/scratch x86/setup x86/smpboot x86/threadinfo x86/timers x86/urgent x86/urgent-undo-ioapic x86/uv x86/vdso x86/xen x86/xsave it failed miserably: warning: ignoring 066519068ad2fbe98c7f45552b1f592903a9c8c8; cannot handle more than 25 refs
The upcoming builtin-merge won't have this problem. I have added a testcase for this in my working branch: http://repo.or.cz/w/git/vmiklos.git?a=commit;h=7eef40b3cd772692c6eb7520686300533f35f10c
Attachments
- (unnamed) [application/pgp-signature] 197 bytes