Hello, On Sat 29 Jun 2019 at 03:36PM +01, Ian Jackson wrote:
> Sean Whitton writes ("Re: Bug#930922: dgit: combination of -wgf and
> --include-dirty nukes untracked files"):
>> On Mon 24 Jun 2019 at 12:02pm +0100, Ian Jackson wrote:
>> >> A possible alternative would be to actually add --include-all-dirty, but
>> >> the problem in #914317 suggests that might not be a great idea.
>> >
>> > Your --include-all-dirty is roughly equivalent to -wn or -wdd ?
>>
>> If -wn and -wdd imply not building in a playtree (I can't recall what we
>> decided there), I think that's right, yes.
>
> No, they don't. I meant "--include-all-dirty = --include-dirty -wn"
> or som such, and --include-dirty means not playtree.
Yes, this is what I meant. --include-all-dirty would be
`--include-dirty -wn`. But given the #914317 issue I'm not sure whether
that should be added.
>> I'd suggest just updating my patch to say "you can use --clean=none or
>> --clean=dpkg-source[-d] in addition to --include-dirty".
>
> OK, can you fold that in for me ? Thanks.
Sure. Attached.
>> > Should --include-dirty --quilt={linear,smash} be treated as
>> > --quilt=nofix ?
>>
>> Is what you have in mind, here, helping the user avoid hitting the
>> #914317 problem?
>
> Yes.
Seems like a good idea.
--
Sean Whitton
From 9a47823b9f17d024ef271616a6d51e8dff1e406a Mon Sep 17 00:00:00 2001 From: Sean Whitton <spwhit...@spwhitton.name> Date: Sat, 22 Jun 2019 18:35:09 +0100 Subject: [PATCH] dgit(1): expand on description of behaviour of --include-dirty See #930922. Signed-off-by: Sean Whitton <spwhit...@spwhitton.name> --- dgit.1 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dgit.1 b/dgit.1 index 81588bc3..ecc4bdb1 100644 --- a/dgit.1 +++ b/dgit.1 @@ -642,6 +642,16 @@ include the changes from your working tree. This can be useful with build, if you plan to commit later. (dgit push will still ensure that the .dsc you upload and the git tree you push are identical, so this option won't make broken pushes.) + +Note that this does +.BR not +prevent dgit from cleaning your tree, so if the changes in your +working tree are in the form of untracked files, those might still be +deleted, especially with --clean=git. If you want to include +untracked files in the build, you can use --clean=none or +--clean=dpkg-source[-d] in addition to --include-dirty. Note that this +combination can fail if the untracked files are under +\fIdebian/patches/\fR. .TP .BR --ignore-dirty Deprecated alias for --include-dirty. -- 2.20.1
signature.asc
Description: PGP signature
