git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [GUILT 1/6] Refuse to push corrupt patches

From
JSJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Date
Sep 30, 2011, 17:15 UTC
Message-ID
<20110930171502.GE18364@poseidon.cudanet.local>
In-Reply-To
<1317219324-10319-1-git-send-email-alan.christopher.jenkins@googlemail.com>

Thanks for the patches. I looked them over and they look good. I'll give them another thorough reading once I have a bit of time to apply them.

Jeff.
On Wed, Sep 28, 2011 at 03:15:19PM +0100, Alan Jenkins wrote:
Show 29 quoted lines
> "guilt push" would treat corrupt patches as empty,
> because "git apply --numstat" prints nothing on stdout.
> 
> (You do get an error message on stderr,
>  but then guilt says "Patch applied" etc,
>  and I didn't notice the earlier error message
>  for quite some time.)
> 
> Signed-off-by: Alan Jenkins <alan.christopher.jenkins@googlemail.com>
> ---
>  guilt |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/guilt b/guilt
> index d1e17d4..51532f9 100755
> --- a/guilt
> +++ b/guilt
> @@ -611,7 +611,7 @@ push_patch()
>  		cd_to_toplevel
>  
>  		# apply the patch if and only if there is something to apply
> -		if [ `git apply --numstat "$p" | wc -l` -gt 0 ]; then
> +		if [ `do_get_patch "$p" | wc -l` -gt 0 ]; then
>  			if [ "$bail_action" = abort ]; then
>  				reject=""
>  			fi
> -- 
> 1.7.4.1
> 
-- 
Hegh QaQ law'
quvHa'ghach QaQ puS
Previous: Alan Jenkins
Message 7 of 7 in “[GUILT 1/6] Refuse to push corrupt patches”
  1. Alan JenkinsSep 28, 2011
  2. 2/6 guilt-header: fix patch corruptionAlan Jenkins, Sep 28, 2011
  3. 3/6 Handle paths that contain spacesAlan Jenkins, Sep 28, 2011
  4. 4/6 Run regression tests in a directory which contains spacesAlan Jenkins, Sep 28, 2011
  5. 5/6 Allow guilt scripts to be run from a directory which contains spacesAlan Jenkins, Sep 28, 2011
  6. 6/6 Allow the regression tests to be run from a directory with spaces inAlan Jenkins, Sep 28, 2011
  7. Josef 'Jeff' SipekSep 30, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.