From: Johannes Schindelin Date: Thu, 15 May 2008 01:09:22 GMT Subject: Re: [PATCH 1/3] diff options: Introduce --ignore-submodules Message-ID: In-Reply-To: <7vod78k022.fsf@gitster.siamese.dyndns.org> Hi, On Wed, 14 May 2008, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Wed, 14 May 2008, Junio C Hamano wrote: > > > >> Johannes Schindelin writes: > >> > >> > The point is: for the sake of a script (which wants to ignore > >> > submodules) asking if there is a diff, I think it makes sense to > >> > not ignore those changes. IOW I think my patch is enough for the > >> > purpose of getting stash/rebase to behave. > >> > >> But the patch is not about stash/rebase but affects all diff users, > >> doesn't it? > > > > Does it? I thought I hid all that special handling behind the > > --ignore-submodules options. > > That's exactly the point. The option reads "ignore submodules", not > "special option for use only by stash and rebase". But it also does not read "ignore submodules and those blobs/trees that happen to replace (or be replaced by) submodules". I think it is not a bad thing to call it "ignore submodules", but show the submodules when something else than a submodule is involved, too. I see where you are heading with the "split diff into removal of submodule / addition of a blob", but I think that would be overly clever, and not helpful. I know that I would want to have that marked as a problem when rebasing. Ciao, Dscho