Package: git-core Version: 1:1.7.0-1 Severity: normal git-rebase -i will complain and halt if it ever finds itself producing an empty commit when squashing. I encountered this when attempting to fix a branch full of "do X, do Y, undo X, undo Y, do Z instead" junk.
Here's a simple demonstration: $ git init $ echo foo > foo $ git add foo $ git commit -m foo $ echo bar >> foo $ git commit -a -m bar # This undoes the previous commit $ echo foo > foo $ git commit -a -m foo2 $ echo baz >> foo $ git commit -a -m baz $ git rebase -i HEAD~3 # Squash all three commits into one Could not apply 06c1a34... foo2 -- System Information: Debian Release: squeeze/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: i386 (i686) Kernel: Linux 2.6.29.6 (SMP w/1 CPU core) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages git-core depends on: ii libc6 2.10.2-5 Embedded GNU C Library: Shared lib ii libcurl3-gnutls 7.19.7-1 Multi-protocol file transfer libra ii libdigest-sha1-perl 2.12-1 NIST SHA-1 message digest algorith ii liberror-perl 0.17-1 Perl module for error/exception ha ii libexpat1 2.0.1-7 XML parsing C library - runtime li ii perl-modules 5.10.1-11 Core Perl modules ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime Versions of packages git-core recommends: ii less 436-1 pager program similar to more ii openssh-client [ssh-client] 1:5.3p1-1 secure shell (SSH) client, for sec ii patch 2.6-2 Apply a diff file to an original ii rsync 3.0.7-2 fast remote file copy program (lik Versions of packages git-core suggests: pn git-arch <none> (no description available) ii git-cvs 1:1.7.0-1 fast, scalable, distributed revisi pn git-daemon-run <none> (no description available) pn git-doc <none> (no description available) ii git-email 1:1.7.0-1 fast, scalable, distributed revisi pn git-gui <none> (no description available) ii git-svn 1:1.7.0-1 fast, scalable, distributed revisi ii gitk 1:1.7.0-1 fast, scalable, distributed revisi pn gitweb <none> (no description available) -- no debconf information -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
