Re: stg pop/push -a nitpick: not handling deleted files

From: Catalin Marinas <catalin.marinas@arm.com>
Date: Sep 15, 2006, 21:41 UTC
Message-ID: <tnxzmd03j0q.fsf@arm.com>
In-Reply-To: <450AE0AC.7060806@intel.com>

Auke Kok <auke-jan.h.kok@intel.com> wrote:

> minor nitpick when working with a patch that deletes a file: stg does
> not handle the 'abandoned' file when popping all patches off -
> essentially it would have to put the file back over an abandoned file.

[...]

Show 5 quoted lines

> $ stg pop -a
> Popping "all_git_versions.patch" - "all_copyright_update.patch"
> patches...fatal: Untracked working tree file
> 'drivers/net/e1000/LICENSE' would be overwritten by merge.
> stg pop: git-read-tree failed (local changes maybe?)

I don't think it's an StGIT-specific issue, git-read-tree failed to switch the working tree from one commit to another because a file would be overwritten. It is probably safer to fail in this situation.

-- 
Catalin