Re: [PATCH] GIT commit statistics.

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Nov 15, 2005, 10:04 UTC
Message-ID: <b0943d9e0511150204h25417993l@mail.gmail.com>
In-Reply-To: <20051112125331.GB30496@pasky.or.cz>

On 12/11/05, Petr Baudis <pasky@suse.cz> wrote:

> On the same note, I would like StGIT to drop functionality not really
> belonging to patch stack manager (stg add, stg rm, stg status, ...) so
> that its commandset gets smaller and more focused

This was the case with the first StGIT implementations but I slowly began to want to only use StGIT and not switch to something else for trivial SCM operations. I eventually added 'stg commit' which stores the patches permanently into the base of the stack to enable some kind of maintainer mode for StGIT. My main use for this was to import patches directly into the main branch and not keep a separate one and pull between them.

> - but before I would
> suggest dropping stg status, cg-status must be able to do conflicts
> tracking, so I will dedicate another mail to this sometime in the
> future, with a more detailed proposal.

The gitmergeonefile.py script in StGIT adds every conflict to the .git/conflicts file which is read by 'stg status'. My goal is not to leave any unmerged entried in the index even if there are conflicts. Maybe this could be changed and .git/conflicts file avoided entirely.

Anyway, while I'll try not to add more SCM functionality to StGIT, I don't think I should remove the existing add/rm/status functionality. It's just handy not to use a different command when you want a new file added to a patch.

-- Catalin