tag 521173 + confirmed
thanks
Hello,
On Wed, Mar 25, 2009 at 02:12:18PM +0100, Thomas Koch wrote:
> Package: topgit
> Version: 0.7-1
> Severity: normal
>
> I made a topgit handled patch to a debian source package, which only
> deletes some files. The resulting quilt patch file looks like:
Take this
$ wget -O file http://www.debian.org/Pics/debian.png
...
$ quilt new binpatch
Patch binpatch is now on top
$ quilt add file
File file added to patch binpatch
$ rm file
$ quilt refresh
Refreshed patch binpatch
$ quilt pop
Removing patch binpatch
Restoring file
No patches applied
$ quilt push
Applying patch binpatch
patch: **** Only garbage was found in the patch input.
Patch binpatch does not apply (enforce with -f)
BTW, doing the same after
export QUILT_DIFF_OPTS=-a
works.
mmh, we could add -a to git-diff in tg-patch.
diff --git a/tg-patch.sh b/tg-patch.sh
index d701c54..203ef27 100644
--- a/tg-patch.sh
+++ b/tg-patch.sh
@@ -56,7 +56,7 @@ git diff --name-only $diff_opts "$base_rev"
${diff_committed_only:+"$name"} -- |
fgrep -vx ".topdeps" |
fgrep -vx ".topmsg" >"$git_is_stupid" || : # fgrep likes to fail
randomly?
if [ -s "$git_is_stupid" ]; then
- cat "$git_is_stupid" | xargs git diff --patch-with-stat $diff_opts
"$base_rev" ${diff_committed_only:+"$name"} --
+ cat "$git_is_stupid" | xargs git diff -a --patch-with-stat $diff_opts
"$base_rev" ${diff_committed_only:+"$name"} --
else
echo "No changes."
fi
This seems to solve the issue. I'm not sure that it's a good idea to do
this unconditionally, though.
Best regards
Uwe
[1] http://thread.gmane.org/gmane.comp.version-control.git/113990/
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
