git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: "J. Paul Reed" <preed@sigkill.com>
To: Pratyush Yadav <me@yadavpratyush.com>
Cc: "Kerry, Richard" <richard.kerry@atos.net>,
	"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: git-gui patch staging errors
Date: Sun, 26 Jul 2020 15:15:08 -0700	[thread overview]
Message-ID: <20200726221508.GA8735@sigkill.com> (raw)
In-Reply-To: <20200525130807.4ydporgaeva27del@yadavpratyush.com>


Hey Pratyush,

Apologies for the late reply myself! Oof... been a long couple of months.

See further responses inline:

later,
preed
-- 
J. Paul Reed
https://jpaulreed.com
PGP: 0xDF8708F8

On 25 May 2020 at 18:38:07, Pratyush Yadav arranged the bits on my disk to say:

> Hi,
> 
> Sorry for the late reply.
> 
> On 12/05/20 01:42PM, J. Paul Reed wrote:
> > 
> > Hey Richard,
> 
> You replied to the wrong person ;-)

Sorry about that!

> I suspect it is some encoding mismatch. Can you apply this patch below 
> and send what the output is?
> 
> -- 8< --
> diff --git a/lib/diff.tcl b/lib/diff.tcl
> index 871ad48..6226a89 100644
> --- a/lib/diff.tcl
> +++ b/lib/diff.tcl
> @@ -851,8 +851,13 @@ proc apply_or_revert_range_or_line {x y revert} {
>  		set first_l [$ui_diff index "$next_l + 1 lines"]
>  	}
>  
> +	puts "Diff we will send to git-apply:"
> +	puts -nonewline "$current_diff_header"
> +	puts -nonewline "$wholepatch"
> +
>  	if {[catch {
>  		set enc [get_path_encoding $current_diff_path]
> +		puts "\nEncoding: $enc"
>  		set p [eval git_write $apply_cmd]
>  		fconfigure $p -translation binary -encoding $enc
>  		puts -nonewline $p $current_diff_header
> -- >8 --

Here ya go:

[preed@underworld aws-glacier-multipart-upload]$ ~/checkouts/git-gui/git-gui.sh 
Diff we will send to git-apply:
diff --git a/glacierupload.sh b/glacierupload.sh
index 3b956c7..c83150c 100755
--- a/glacierupload.sh
+++ b/glacierupload.sh
@@ -58,15 +58,14 @@
 # count the number of files that begin with "$prefix"
 fileCount=$(ls -1 | grep "^$prefix" | wc -l)
 echo "ð¦ Glacier Upload with $AWS_PROFILE"
 echo "Total parts to upload: " $fileCount
 
 # get the list of part files to upload.  Edit this if you chose a
 # different prefix in the split command
 files=$(ls | grep "^$prefix")
 
 # initiate multipart upload connection to glacier
-echo aws glacier initiate-multipart-upload --profile $AWS_PROFILE
--account-id - --part-size $byteSize --vault-name $vaultName
--archive-description "$description"
 init=$(aws glacier initiate-multipart-upload --profile $AWS_PROFILE
--account-id - --part-size $byteSize --vault-name $vaultName
--archive-description "$description")
 
 echo "---------------------------------------"
 # xargs trims off the quotes
 # jq pulls out the json element titled uploadId

Encoding: utf-8

This is probably expected, but to be clear: with this patch, I do still get
the error popup in the gui ("Failed to stage selected line; error: patch
failed: glacierupload:58 error: glacierupload.sh patch does not apply"

      reply	other threads:[~2020-07-26 22:15 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-12  1:07 J. Paul Reed
2020-05-12 12:15 ` Pratyush Yadav
2020-05-12 14:27   ` Kerry, Richard
2020-05-12 19:00     ` Pratyush Yadav
2020-05-12 20:42     ` J. Paul Reed
2020-05-25 13:08       ` Pratyush Yadav
2020-07-26 22:15         ` J. Paul Reed [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200726221508.GA8735@sigkill.com \
    --to=preed@sigkill.com \
    --cc=git@vger.kernel.org \
    --cc=me@yadavpratyush.com \
    --cc=richard.kerry@atos.net \
    --subject='Re: git-gui patch staging errors' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).