[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: dgit and git-dpm

On 3 November 2014 21:32, Bernhard R. Link <brlink@debian.org> wrote:
> * Ian Jackson <ijackson@chiark.greenend.org.uk> [141103 19:13]:
>> The point is that the dgit user probably will have done git diff
>> before dgit build / push.  git diff provides a more convenient diffing
>> tool than debdiff, and eyeballing the same thing twice is makework.
> git diff is a nice tool. But it has it limits. Try detecting the adding
> or removel of an empty file with git diff for example.

I'm failing to see how this is a valid example. v1.0 diff and patch[1]
tool, and the classical debdiff cannot track this, where as git diff /
git format-patch / git am, actually can:

$ git diff --cached
diff --git a/bar b/bar
new file mode 100644
index 0000000..e69de29
diff --git a/foo b/foo
deleted file mode 100644
index e69de29..0000000

The point of using $ git diff, together with dgit is to make sure that
valid uploads made with dgit, also generate valid debdiffs as
generally accepted by dak/dpkg-source without requiring extra work by
the user, irrespective of the source format versions used.

dpkg-source alone does not guarantee that today, and there plenty of
examples in the archive where running ./debian/rules clean will
generate auxilary and unepected source packages changes, which would
then leak into debdiff and the NMU itself.

[1] some support git extended patch syntax are getting added to gnu
patch, but this is not yet universally available.



Reply to: