Re: git rebase is confused about commits w/o textual changes (e.g. chmod's)

From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Oct 4, 2013, 20:28 UTC
Message-ID: <20131004202853.GB4165@vauxhall.crustytoothpaste.net>
In-Reply-To: <20130928023244.1ce16dc5@x34f>

On Sat, Sep 28, 2013 at 02:32:44AM +0300, Paul Sokolovsky wrote:

Show 11 quoted lines

> $ git --version
> git version 1.8.4
> 
> Specifically from Ubuntu PPA:
> http://ppa.launchpad.net/git-core/ppa/ubuntu
> 
> 
> Script to reproduce the issue is:
> https://gist.github.com/pfalcon/6736632 , based on a real-world case of
> merging histories of a fork created from a flat tree snapshot with
> the original project it was created from.

Okay, as I suspected, the rebase would have resulted in an empty commit. In this particular case, the commit being rebased changed the permissions on the files, but those permissions are already correct, so the commit really is empty, even considering permissions. It looks like git is doing the right thing here.

-- 
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187