Re: [PATCH 1/4] git-gui: provide question helper for retry fallback on Windows

2019-09-29 Thread Pratyush Yadav
resent a yes/no question > to the the user which will currently be used by the windows compat layer > to let the user retry a failed file operation. I can't find any documentation related to this environment variable. A Google search does not yield any promising results. I don't see this

[PATCH 1/4] git-gui: provide question helper for retry fallback on Windows

2019-09-26 Thread Heiko Voigt via GitGitGadget
From: Heiko Voigt Make use of the new environment variable GIT_ASK_YESNO to support the recently implemented fallback in case unlink, rename or rmdir fail for files in use on Windows. The added dialog will present a yes/no question to the the user which will currently be used by the windows

Question of intent: stash push --include-untracked

2019-08-27 Thread Randall S. Becker
I'm a bit perplexed about what is intended follow a git stash push --include-untracked. Suppose I have files a,b,c,known modified, but only known is in the index. After the stash, stash show only displays known. A subsequent pop will restore a,b,c. So functionally push and pop are fine, but show ap

Re: [Question] clone performance

2019-08-26 Thread Elijah Newren
; Hi All, > > > > > > > > I'm trying to answer a question for a customer on clone performance. > > > > They are doing at least 2-3 clones a day, of repositories with about > > > > 2500 files and 10Gb of content. This is stressing the file system. >

Re: [Question] clone performance

2019-08-26 Thread Jeff King
On Mon, Aug 26, 2019 at 10:16:48AM -0400, randall.s.bec...@rogers.com wrote: > On August 24, 2019 5:00 PM, Bryan Turner wrote: > > On Fri, Aug 23, 2019 at 6:59 PM wrote: > > > > > > Hi All, > > > > > > I'm trying to answer a question for a cust

RE: [Question] clone performance

2019-08-26 Thread randall.s.becker
On August 24, 2019 5:00 PM, Bryan Turner wrote: > On Fri, Aug 23, 2019 at 6:59 PM wrote: > > > > Hi All, > > > > I'm trying to answer a question for a customer on clone performance. > > They are doing at least 2-3 clones a day, of repositories with about &g

Re: [Question] clone performance

2019-08-24 Thread Bryan Turner
On Fri, Aug 23, 2019 at 6:59 PM wrote: > > Hi All, > > I'm trying to answer a question for a customer on clone performance. They > are doing at least 2-3 clones a day, of repositories with about 2500 files > and 10Gb of content. This is stressing the file system. Can

[Question] clone performance

2019-08-23 Thread randall.s.becker
Hi All, I'm trying to answer a question for a customer on clone performance. They are doing at least 2-3 clones a day, of repositories with about 2500 files and 10Gb of content. This is stressing the file system. I have tried to convince them that their process is not reasonable and should

[Question] git checkout lifespan

2019-08-06 Thread Randall S. Becker
Hi All, I don't recall when this was previously discussed, but the timing is relevant at 2.23.0. With switch and restore commands coming in this release, I was wondering how long checkout will be provided for compatibility - or if it will be deprecated at all. I assume that enhancements should onl

Re: [Question] Diff text filters and git add

2019-07-11 Thread Jakub Narebski
"Randall S. Becker" writes: > On July 9, 2019 5:51 PM, Peff wrote: [...] >> No, textconv only applies when generating a diff to output, and will never >> impact what's stored in Git. >> >> It sounds like you might want a clean filter instead, to sanitize the file >> contents as they come into Git

RE: [Question] Diff text filters and git add

2019-07-10 Thread Randall S. Becker
On July 9, 2019 5:51 PM, Peff wrote: > To: Randall S. Becker > Cc: git@vger.kernel.org > Subject: Re: [Question] Diff text filters and git add > > On Tue, Jul 09, 2019 at 05:43:05PM -0400, Randall S. Becker wrote: > > > I am trying to do something a bit strange and wonde

Re: [Question] Diff text filters and git add

2019-07-09 Thread Jeff King
On Tue, Jul 09, 2019 at 05:43:05PM -0400, Randall S. Becker wrote: > I am trying to do something a bit strange and wonder about the best way to > go. I have a text filter that presents content of very special binary file > formats using textconv. What I am wondering is whether using the textconv >

[Question] Diff text filters and git add

2019-07-09 Thread Randall S. Becker
Hi all, I am trying to do something a bit strange and wonder about the best way to go. I have a text filter that presents content of very special binary file formats using textconv. What I am wondering is whether using the textconv mechanism is sufficient to have git calculate the file signature o

Re: [QUESTION] Git fails to detect merge conflict?

2019-07-04 Thread Anton Ermolenko
Hello! Thanks for you answer. The original content of the file: --- START --- LINE 1 LINE 2 LINE 3 --- END — Branch “change-a” modifies it to become: --- START --- LINE 1 LINE 2 LINE 3 LINE 4 LINE 5 LINE 6 LINE 7 LINE 8 LINE 9 --- END — While branch “change-b”

Re: [QUESTION] Git fails to detect merge conflict?

2019-07-01 Thread Jonathan Nieder
Anton Ermolenko wrote: > My understanding is that recursive merge here won't consider that situation to > be a merge conflict as the changes have been introduced in different spots in > the file. Yes, that seems right to me. Do you have more details about the context? What do these files look l

[QUESTION] Git fails to detect merge conflict?

2019-07-01 Thread Anton Ermolenko
Hello folks, I'm writing on behalf of a customer and I wonder if you could help me to clarify if the following test case should be considered a bug or if it is expected behavior. # create repository git init # add initial content cat << EOF > example.txt --- START --- LINE 1 LINE 2

Re: [PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-13 Thread Todd Zullinger
SZEDER Gábor wrote: > On Sat, Feb 09, 2019 at 06:05:53PM -0500, Todd Zullinger wrote: >> SZEDER Gábor wrote: >>> Just curious: how did you noticed the missing GPGSM prereq? >> >> I just grep the build output for '# SKIP|skipped:' and then >> filter out those which I expect (thing like MINGW and >>

Tailoring branch use case question

2019-02-13 Thread Jason Wenger
So I've got a use case that is cumbersome, and I'm wondering if it's a common one, or if anyone has found a better way to manage it. I have a repo that I work in where I make a set of changes to adapt it to my environment -- some config file changes and a couple code changes that help with debuggi

Re: [PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-11 Thread SZEDER Gábor
On Mon, Feb 11, 2019 at 07:44:33PM -0500, Jeff King wrote: > On Sat, Feb 09, 2019 at 03:06:05PM +0100, SZEDER Gábor wrote: > > > On Thu, Feb 07, 2019 at 10:17:44PM -0500, Todd Zullinger wrote: > > > Looking through the build logs for the fedora git packages, I noticed it > > > was missing the GPGS

Re: [PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-11 Thread Junio C Hamano
Jeff King writes: > But it looks from the output like it just mentions every prereq that > wasn't satisfied. I don't think that's particularly useful to show for > all users, since most of them are platform things that cannot be changed > (and you'd never get the list to zero, since some of them

Re: [PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-11 Thread Jeff King
On Sat, Feb 09, 2019 at 03:06:05PM +0100, SZEDER Gábor wrote: > On Thu, Feb 07, 2019 at 10:17:44PM -0500, Todd Zullinger wrote: > > Looking through the build logs for the fedora git packages, I noticed it > > was missing the GPGSM prereq. > > Just curious: how did you noticed the missing GPGSM pr

Re: [PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-11 Thread SZEDER Gábor
On Sat, Feb 09, 2019 at 06:05:53PM -0500, Todd Zullinger wrote: > SZEDER Gábor wrote: > > Just curious: how did you noticed the missing GPGSM prereq? > > I just grep the build output for '# SKIP|skipped:' and then > filter out those which I expect (thing like MINGW and > NATIVE_CRLF that aren't li

Re: [PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-09 Thread Todd Zullinger
SZEDER Gábor wrote: > On Thu, Feb 07, 2019 at 10:17:44PM -0500, Todd Zullinger wrote: >> Looking through the build logs for the fedora git packages, I noticed it >> was missing the GPGSM prereq. > > Just curious: how did you noticed the missing GPGSM prereq? I just grep the build output for '# SK

Re: [PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-09 Thread SZEDER Gábor
On Thu, Feb 07, 2019 at 10:17:44PM -0500, Todd Zullinger wrote: > Looking through the build logs for the fedora git packages, I noticed it > was missing the GPGSM prereq. Just curious: how did you noticed the missing GPGSM prereq? I'm asking because I use a patch for a good couple of months now t

Re: [PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-08 Thread Junio C Hamano
Henning Schild writes: > both patches look good to me. Killing the agent once should be enough, > i remember manually killing it many times as i was looking for a way to > generate certs and trust (configure gpgsm for the test). That is > probably why i copied it over in the first place. Thanks,

Re: [PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-08 Thread Henning Schild
Hi, both patches look good to me. Killing the agent once should be enough, i remember manually killing it many times as i was looking for a way to generate certs and trust (configure gpgsm for the test). That is probably why i copied it over in the first place. Henning Am Thu, 7 Feb 2019 22:17:4

[PATCH 0/2] t/lib-gpg: a gpgsm fix, a minor improvement, and a question

2019-02-07 Thread Todd Zullinger
Hi, Looking through the build logs for the fedora git packages, I noticed it was missing the GPGSM prereq. I added the necessary package to the build requirements but GPGSM was still failing to be set. This turned out to be due to a use of ${GNUPGHOME} without quoting, which leads to a non-zero

Re: A quick question about donation and partnership

2019-01-09 Thread Jonathan Nieder
Hi Petko, Petko Yanev wrote: > I'm writing to you because git-scm.com is a great project and I want to help > out. > > I'd love to contribute with a donation or in another manner you consider > acceptable. > > In exchange, all I expect is a do-follow backlink to one of our sites. > > Do let me kn

A quick question about donation and partnership

2019-01-09 Thread Petko Yanev
Hello, My name is Petko and I am managing the marketing of few sports betting and casino review websites. I'm writing to you because git-scm.com is a great project and I want to help out. I'd love to contribute with a donation or in another manner you consider acceptable. In exchange, al

Re: pack file object size question

2018-12-17 Thread Jeff King
On Sun, Dec 16, 2018 at 04:52:13PM -0500, Farhan Khan wrote: > It seems that there is a 12 byte header (signature, version, number of > objects), then it immediately jumps into each individual object. The > object consists of the object header, then the zlib deflated object, > followed by a SHA1 o

Re: pack file object size question

2018-12-17 Thread Duy Nguyen
On Sun, Dec 16, 2018 at 04:14:46PM -0800, Jonathan Nieder wrote: > Hi, > > Farhan Khan wrote: > >> Farhan Khan wrote: > > >>> I am having trouble figuring out the boundary between two objects in > >>> the pack file. > [...] > > I think the issue is, the compressed object has a fixed

Re: pack file object size question

2018-12-16 Thread Jonathan Nieder
Hi, Farhan Khan wrote: >> Farhan Khan wrote: >>> I am having trouble figuring out the boundary between two objects in >>> the pack file. [...] > I think the issue is, the compressed object has a fixed > size and git inflates it, then moves on to the next object. I am > trying to figu

Re: pack file object size question

2018-12-16 Thread Farhan Khan
On Sun, Dec 16, 2018 at 5:15 PM Jonathan Nieder wrote: > > Hi, > > Farhan Khan wrote: > > > I am trying to write an implementation of "git index-pack" and having > > a bit of trouble with understanding the ".pack" format. Specifically, > > I am having trouble figuring out the boundary between two

Re: pack file object size question

2018-12-16 Thread Jonathan Nieder
Hi, Farhan Khan wrote: > I am trying to write an implementation of "git index-pack" and having > a bit of trouble with understanding the ".pack" format. Specifically, > I am having trouble figuring out the boundary between two objects in > the pack file. Have you seen Documentation/technical/pac

pack file object size question

2018-12-16 Thread Farhan Khan
Hi all, I am trying to write an implementation of "git index-pack" and having a bit of trouble with understanding the ".pack" format. Specifically, I am having trouble figuring out the boundary between two objects in the pack file. It seems that there is a 12 byte header (signature, version, numb

Re: [Question] Complex textconv text

2018-12-14 Thread Jeff King
On Fri, Dec 14, 2018 at 12:12:01PM +0900, Junio C Hamano wrote: > > I have a strange situation and need help with resolving funky characters in > > .git/config. My situation is this: > > > > [diff "*.dat"] > > textconv = enscribe-conv > > --format=-a1\(A=-a1,-a16,-a32\|P=-a1,-a32,-a16\|=-a1,-d

Re: [Question] Complex textconv text

2018-12-13 Thread Junio C Hamano
"Randall S. Becker" writes: > Hi all, > > I have a strange situation and need help with resolving funky characters in > .git/config. My situation is this: > > [diff "*.dat"] > textconv = enscribe-conv > --format=-a1\(A=-a1,-a16,-a32\|P=-a1,-a32,-a16\|=-a1,-d,a14\),-a224 > > Basically this i

RE: [Question] Complex textconv text

2018-12-13 Thread Randall S. Becker
On December 13, 2018 10:08, I wrote: > I have a strange situation and need help with resolving funky characters in > .git/config. My situation is this: > > [diff "*.dat"] > textconv = enscribe-conv > --format=-a1\(A=-a1,-a16,-a32\|P=-a1,-a32,-a16\|=-a1,-d,a14\),-a224 > > Basically this is

[Question] Complex textconv text

2018-12-13 Thread Randall S. Becker
Hi all, I have a strange situation and need help with resolving funky characters in .git/config. My situation is this: [diff "*.dat"] textconv = enscribe-conv --format=-a1\(A=-a1,-a16,-a32\|P=-a1,-a32,-a16\|=-a1,-d,a14\),-a224 Basically this is a formatter for diff so that I can show str

Re: [Question] builtin/branch.c

2018-10-15 Thread Jeff King
On Sun, Oct 14, 2018 at 12:19:35PM +0200, Ævar Arnfjörð Bjarmason wrote: > On Sat, Oct 13, 2018 at 10:12 AM Tao Qingyun wrote: > > Hi, I am learning `builtin/branch.c`. I find that it will call `branch_get` > > before create and [un]set upstream, and die with "no such branch" if failed. > > but `

Re: [Question] builtin/branch.c

2018-10-14 Thread Ævar Arnfjörð Bjarmason
On Sat, Oct 13, 2018 at 10:12 AM Tao Qingyun wrote: > Hi, I am learning `builtin/branch.c`. I find that it will call `branch_get` > before create and [un]set upstream, and die with "no such branch" if failed. > but `branch_get` seems never fail, it is a get_or_create. Also, it was > confused that

[Question] builtin/branch.c

2018-10-13 Thread Tao Qingyun
Hi, I am learning `builtin/branch.c`. I find that it will call `branch_get` before create and [un]set upstream, and die with "no such branch" if failed. but `branch_get` seems never fail, it is a get_or_create. Also, it was confused that getting a branch before it has created. builtin/branch.c #81

Re: git-remote-helper list command question

2018-10-03 Thread Jonathan Nieder
Hi, Jeff King wrote: > On Tue, Oct 02, 2018 at 11:43:50AM +0200, Stanisław Drozd wrote: >> I'm trying to write a fast-import-based git remote helper, but I'm not >> sure what the output of the `list` command should look like. How can I >> find an example of the format in action? > > There's some

Re: git-remote-helper list command question

2018-10-02 Thread Jeff King
On Tue, Oct 02, 2018 at 11:43:50AM +0200, Stanisław Drozd wrote: > I'm trying to write a fast-import-based git remote helper, but I'm not > sure what the output of the `list` command should look like. How can I > find an example of the format in action? There's some documentation in "git help rem

git-remote-helper list command question

2018-10-02 Thread Stanisław Drozd
I'm trying to write a fast-import-based git remote helper, but I'm not sure what the output of the `list` command should look like. How can I find an example of the format in action? Thanks, Stan

Subtree question and possible issue

2018-09-25 Thread Strain, Roger L.
tered a problem pushing commits back to the subtree repo which generated a question and maybe exposed an issue, though the issue could be with our repo for all I know. [first attempt 2.16.0 (windows), retried with same results 2.19.0 (windows)] Easier one first. Repo is set up to include code fr

RE: [Question] Alternative to git-lfs under go

2018-09-17 Thread Randall S. Becker
On September 17, 2018 6:02 PM, Jonathan Nieder wrote: > Randall S. Becker wrote: > > On September 17, 2018 3:28 PM, Jonathan Nieder wrote: > >> Randall S. Becker wrote: > > >>> Does anyone know whether it is practical to rework git-lfs under a > >>> language other than "go"? GCC is not even close

RE: [Question] Alternative to git-lfs under go

2018-09-17 Thread Randall S. Becker
On September 17, 2018 6:01 PM, Taylor Blau wrote: > On Mon, Sep 17, 2018 at 05:55:55PM -0400, Randall S. Becker wrote: > > On September 17, 2018 3:28 PM, Jonathan Nieder wrote: > > > Randall S. Becker wrote: > > > > > > > Does anyone know whether it is practical to rework git-lfs under a > > > > la

Re: [Question] Alternative to git-lfs under go

2018-09-17 Thread Jonathan Nieder
(+cc: Taylor Blau, git-lfs expert) Randall S. Becker wrote: > On September 17, 2018 3:28 PM, Jonathan Nieder wrote: >> Randall S. Becker wrote: >>> Does anyone know whether it is practical to rework git-lfs under a >>> language other than "go"? GCC is not even close to being possible to >>> port t

Re: [Question] Alternative to git-lfs under go

2018-09-17 Thread Taylor Blau
Hi Randall, On Mon, Sep 17, 2018 at 05:55:55PM -0400, Randall S. Becker wrote: > On September 17, 2018 3:28 PM, Jonathan Nieder wrote: > > Randall S. Becker wrote: > > > > > Does anyone know whether it is practical to rework git-lfs under a > > > language other than "go"? GCC is not even close to

RE: [Question] Alternative to git-lfs under go

2018-09-17 Thread Randall S. Becker
On September 17, 2018 3:28 PM, Jonathan Nieder wrote: > Randall S. Becker wrote: > > > Does anyone know whether it is practical to rework git-lfs under a > > language other than "go"? GCC is not even close to being possible to > > port to my NonStop platform (may have tried, some have died - joke

Re: [Question] Alternative to git-lfs under go

2018-09-17 Thread Jonathan Nieder
Hi, Randall S. Becker wrote: > Does anyone know whether it is practical to rework git-lfs under a language > other than "go"? GCC is not even close to being possible to port to my > NonStop platform (may have tried, some have died - joke - trying). I would > like to convert this directly to C or

[Question] Alternative to git-lfs under go

2018-09-17 Thread Randall S. Becker
Hi All, Does anyone know whether it is practical to rework git-lfs under a language other than "go"? GCC is not even close to being possible to port to my NonStop platform (may have tried, some have died - joke - trying). I would like to convert this directly to C or something more widely portabl

Re: Question - no space in smtp-server-option

2018-09-17 Thread Chris Coutinho
On Sep-16-18, Jonathan Nieder wrote: On Mon, Sep 17, 2018 at 03:27:21AM +0200, Chris Coutinho wrote: On Sep-16-18, Jonathan Nieder wrote: Chris Coutinho wrote: Currently my gitconfig contains the following line: sendemail.smtpserveroption=-a Whereas, the following results in an 'ac

Re: Question - no space in smtp-server-option

2018-09-17 Thread Chris Coutinho
On Sep-16-18, Jonathan Nieder wrote: On Mon, Sep 17, 2018 at 03:27:21AM +0200, Chris Coutinho wrote: On Sep-16-18, Jonathan Nieder wrote: Chris Coutinho wrote: Currently my gitconfig contains the following line: sendemail.smtpserveroption=-a Whereas, the following results in an 'ac

Re: Question - no space in smtp-server-option

2018-09-16 Thread Jonathan Nieder
On Mon, Sep 17, 2018 at 03:27:21AM +0200, Chris Coutinho wrote: > On Sep-16-18, Jonathan Nieder wrote: >> Chris Coutinho wrote: >>> Currently my gitconfig contains the following line: >>> >>> sendemail.smtpserveroption=-a >>> >>> Whereas, the following results in an 'account' not found error:

Re: Question - no space in smtp-server-option

2018-09-16 Thread Chris Coutinho
e exact line in my gitconfig file, which correctly mails using the non-default account I'm after - I'm assuming you're noticing the lack of camelCase? To be honest, that came from zsh autosuggestions, which are all lower-case for some reason. My question is just regarding the sy

Re: Question - no space in smtp-server-option

2018-09-16 Thread Jonathan Nieder
Hi, Chris Coutinho wrote: > Currently my gitconfig contains the following line: > > sendemail.smtpserveroption=-a > > Whereas, the following results in an 'account' not found error: > > sendemail.smtpserveroption=-a Do you mean that your ~/.gitconfig literally contains that exact li

Question - no space in smtp-server-option

2018-09-16 Thread Chris Coutinho
Hello Git community, To send a formatted git patch as an email using git I use `git send-email`. Using another email address than my default one requires the 'smtp-server-option' to be set, and currently this flag doesn't care much for spaces. Is this desired? Currently my gitconfig contains

RE: [Question] Signature calculation ignoring parts of binary files

2018-09-13 Thread Randall S. Becker
On September 13, 2018 1:52 PM, Junio C Hamano wrote: > Junio C Hamano writes: > > > "Randall S. Becker" writes: > > > >> The scenario is slightly different. > >> 1. Person A gives me a new binary file-1 with fingerprint A1. This > >> goes into git unchanged. > >> 2. Person B gives me binary file

Re: [Question] Signature calculation ignoring parts of binary files

2018-09-13 Thread Junio C Hamano
Junio C Hamano writes: > "Randall S. Becker" writes: > >> The scenario is slightly different. >> 1. Person A gives me a new binary file-1 with fingerprint A1. This goes into >> git unchanged. >> 2. Person B gives me binary file-2 with fingerprint B2. This does not go >> into git yet. >> 3. We at

RE: [Question] Signature calculation ignoring parts of binary files

2018-09-13 Thread Randall S. Becker
On September 13, 2018 11:03 AM, Junio C Hamano wrote: > "Randall S. Becker" writes: > > > The scenario is slightly different. > > 1. Person A gives me a new binary file-1 with fingerprint A1. This > > goes into git unchanged. > > 2. Person B gives me binary file-2 with fingerprint B2. This does n

Re: [Question] Signature calculation ignoring parts of binary files

2018-09-13 Thread Junio C Hamano
"Randall S. Becker" writes: > The scenario is slightly different. > 1. Person A gives me a new binary file-1 with fingerprint A1. This goes into > git unchanged. > 2. Person B gives me binary file-2 with fingerprint B2. This does not go > into git yet. > 3. We attempt a git diff between the commi

RE: [Question] Signature calculation ignoring parts of binary files

2018-09-13 Thread Randall S. Becker
On September 12, 2018 7:00 PM, Junio C Hamano wrote: > "Randall S. Becker" writes: > > >> author is important to our process. My objective is to keep the > >> original file 100% exact as supplied and then ignore any changes to > >> the metadata that I don't care about (like Creator) if the remain

Re: [Question] Signature calculation ignoring parts of binary files

2018-09-12 Thread Junio C Hamano
"Randall S. Becker" writes: >> author is important to our process. My objective is to keep the original file >> 100% exact as supplied and then ignore any changes to the metadata that I >> don't care about (like Creator) if the remainder of the file is the same. That will *not* work. If person

RE: [Question] Signature calculation ignoring parts of binary files

2018-09-12 Thread Randall S. Becker
On September 12, 2018 4:54 PM, I wrote: > On September 12, 2018 4:48 PM, Johannes Sixt wrote: > > Am 12.09.18 um 21:16 schrieb Randall S. Becker: > > > I feel really bad asking this, and I should know the answer, and yet. > > > > > > I have a binary file that needs to go into a repo intact (unchang

RE: [Question] Signature calculation ignoring parts of binary files

2018-09-12 Thread Randall S. Becker
> -Original Message- > From: git-ow...@vger.kernel.org On Behalf > Of Johannes Sixt > Sent: September 12, 2018 4:48 PM > To: Randall S. Becker > Cc: git@vger.kernel.org > Subject: Re: [Question] Signature calculation ignoring parts of binary files > > A

Re: [Question] Signature calculation ignoring parts of binary files

2018-09-12 Thread Johannes Sixt
Am 12.09.18 um 21:16 schrieb Randall S. Becker: I feel really bad asking this, and I should know the answer, and yet. I have a binary file that needs to go into a repo intact (unchanged). I also have a program that interprets the contents, like a textconv, that can output the relevant portions o

[Question] Signature calculation ignoring parts of binary files

2018-09-12 Thread Randall S. Becker
I feel really bad asking this, and I should know the answer, and yet. I have a binary file that needs to go into a repo intact (unchanged). I also have a program that interprets the contents, like a textconv, that can output the relevant portions of the file in whatever format I like - used for di

Re: Question regarding quarantine environments

2018-08-03 Thread Jeff King
On Fri, Aug 03, 2018 at 03:25:08PM +0200, Ævar Arnfjörð Bjarmason wrote: > > I'd be a bit careful with that, though, as the definition of "new" is > > vague there. > > > > For example, completing a thin pack may mean that the receiver creates a > > copy of a base object found in the main repo. Tha

Re: Question regarding quarantine environments

2018-08-03 Thread Ævar Arnfjörð Bjarmason
On Fri, Aug 03 2018, Jeff King wrote: > On Fri, Aug 03, 2018 at 02:56:11PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> > Any Git commands you run should therefore find objects from either >> > location, but any writes would go to the quarantine (most notably, Git's >> > own index-pack/unpack-obje

Re: Question regarding quarantine environments

2018-08-03 Thread Jeff King
On Fri, Aug 03, 2018 at 02:56:11PM +0200, Ævar Arnfjörð Bjarmason wrote: > > Any Git commands you run should therefore find objects from either > > location, but any writes would go to the quarantine (most notably, Git's > > own index-pack/unpack-objects processes, which is the point of the > > qu

Re: Question regarding quarantine environments

2018-08-03 Thread Ævar Arnfjörð Bjarmason
On Thu, Aug 02 2018, Jeff King wrote: > On Thu, Aug 02, 2018 at 12:58:52PM -0500, Liam Decker wrote: > >> I've been working on a git hook in golang recently. However, the library I >> was using did not support a possible quarantine directory, which I would >> use for my hook. >> >> I have been t

Re: Question regarding quarantine environments

2018-08-02 Thread Jonathan Nieder
Hi, Jeff King wrote: > On Thu, Aug 02, 2018 at 12:58:52PM -0500, Liam Decker wrote: >> The solution that I implemented was to check the objects directory for the >> object, and if it was not there, to look for a quarantine directory and try >> there. However, that feels fairly inefficient. > > Th

Re: Question regarding quarantine environments

2018-08-02 Thread Jeff King
On Thu, Aug 02, 2018 at 12:58:52PM -0500, Liam Decker wrote: > I've been working on a git hook in golang recently. However, the library I > was using did not support a possible quarantine directory, which I would > use for my hook. > > I have been trying to find out how git finds this incoming di

Question regarding quarantine environments

2018-08-02 Thread Liam Decker
is a pretty specific question The solution that I implemented was to check the objects directory for the object, and if it was not there, to look for a quarantine directory and try there. However, that feels fairly inefficient. For the curious, the library and solution I attempted are both here [5]

Re: Question on range-diff and notes.displayref

2018-07-31 Thread Junio C Hamano
Elijah Newren writes: > Should git notes show up in a range-diff? I happened to have > notes.displayref=refs/notes/amlog > set in my git.git repo, and saw the below in my range-diff: > > On Tue, Jul 31, 2018 at 10:12 AM, Elijah Newren wrote: >> 1: 4a1c9c3368 ! 1: 00f94a8b41 t1015: demonst

Question on range-diff and notes.displayref

2018-07-31 Thread Elijah Newren
Should git notes show up in a range-diff? I happened to have notes.displayref=refs/notes/amlog set in my git.git repo, and saw the below in my range-diff: On Tue, Jul 31, 2018 at 10:12 AM, Elijah Newren wrote: > 1: 4a1c9c3368 ! 1: 00f94a8b41 t1015: demonstrate directory/file conflict > re

RE: git question from a newbie

2018-06-07 Thread Heinz, Steve
5-2581 | F 516-873-2211 she...@aaanortheast.com | AAA.com It Pays to Belong. -Original Message- From: Bryan Turner Sent: Tuesday, June 05, 2018 6:29 PM To: Heinz, Steve Cc: Git Users Subject: Re: git question from a newbie On Tue, Jun 5, 2018 at 2:33 PM Heinz, Steve wrote: >

RE: git question from a newbie

2018-06-07 Thread Heinz, Steve
; git@vger.kernel.org Subject: RE: git question from a newbie On June 5, 2018 5:24 PM, Steve Heinz wrote: > I am new to Git and have read quite a few articles on it. > I am planning on setting up a remote repository on a windows 2012 R2 server > and will access it via HTTPS. > I am s

Re: git question from a newbie

2018-06-05 Thread Bryan Turner
On Tue, Jun 5, 2018 at 2:33 PM Heinz, Steve wrote: > > Hi. > > I am new to Git and have read quite a few articles on it. > I am planning on setting up a remote repository on a windows 2012 R2 server > and will access it via HTTPS. > I am setting up a local repository on my desk top (others in my

RE: git question from a newbie

2018-06-05 Thread Randall S. Becker
On June 5, 2018 5:24 PM, Steve Heinz wrote: > I am new to Git and have read quite a few articles on it. > I am planning on setting up a remote repository on a windows 2012 R2 server > and will access it via HTTPS. > I am setting up a local repository on my desk top (others in my group will do > the

git question from a newbie

2018-06-05 Thread Heinz, Steve
Hi. I am new to Git and have read quite a few articles on it. I am planning on setting up a remote repository on a windows 2012 R2 server and will access it via HTTPS. I am setting up a local repository on my desk top (others in my group will do the same). On "server1": I install Git and create

RE: Branch deletion question / possible bug?

2018-04-30 Thread Tang (US), Pik S
al Message- From: Johannes Schindelin [mailto:johannes.schinde...@gmx.de] Sent: Saturday, April 28, 2018 5:44 AM To: Philip Oakley Cc: Jacob Keller ; Tang (US), Pik S ; Git List Subject: Re: Branch deletion question / possible bug? Hi, On Sat, 28 Apr 2018, Philip Oakley wrote: > From:

Re: Branch deletion question / possible bug?

2018-04-28 Thread Johannes Schindelin
Hi, On Sat, 28 Apr 2018, Philip Oakley wrote: > From: "Jacob Keller" > > On Fri, Apr 27, 2018 at 5:29 PM, Tang (US), Pik S > > wrote: > > > Hi, > > > > > > I discovered that I was able to delete the feature branch I was in, due > > > to some fat fingering on my part and case insensitivity. I n

Re: Branch deletion question / possible bug?

2018-04-28 Thread Philip Oakley
From: "Jacob Keller" On Fri, Apr 27, 2018 at 5:29 PM, Tang (US), Pik S wrote: Hi, I discovered that I was able to delete the feature branch I was in, due to some fat fingering on my part and case insensitivity. I never realized this could be done before. A quick google search did not give m

Re: Branch deletion question / possible bug?

2018-04-28 Thread Jacob Keller
On Fri, Apr 27, 2018 at 5:29 PM, Tang (US), Pik S wrote: > Hi, > > I discovered that I was able to delete the feature branch I was in, due to > some fat fingering on my part and case insensitivity. I never realized this > could be done before. A quick google search did not give me a whole lot

Branch deletion question / possible bug?

2018-04-27 Thread Tang (US), Pik S
Hi, I discovered that I was able to delete the feature branch I was in, due to some fat fingering on my part and case insensitivity. I never realized this could be done before. A quick google search did not give me a whole lot to work with... Steps to reproduce: 1. Create a feature branch,

Re: git-lfs question

2018-04-10 Thread Taylor Blau
On Wed, Apr 11, 2018 at 01:16:42AM +, John Sullivan wrote: > Hello - I've seen instructions that say after installing git to also install > git-lfs. > > But today when installing git I noticed that in the install options > there was a default selected options stating "Git LFS (Large File > Sup

git-lfs question

2018-04-10 Thread John Sullivan
Hello - I've seen instructions that say after installing git to also install git-lfs. But today when installing git I noticed that in the install options there was a default selected options stating "Git LFS (Large File Support)". Does this mean git is automatically adding git-LFS or just adding

Re: Git Question

2018-03-31 Thread Taylor Blau
On Sat, Mar 31, 2018 at 09:06:53PM -0500, Mark Wartman wrote: > I saw this pretty exhaustive .gitignore list that a GitHub Help page > linked to: 9257657 . Are > these configurations from the list something one should install on the > User/global level, or

Re: Git Question

2018-03-28 Thread Taylor Blau
On Wed, Mar 28, 2018 at 08:49:19PM -0500, Mark Wartman wrote: > I am following this tutorial and I expected to only see user.name & > user.email, so what are the filters.lfs’s and the credential.helper? > Should I ignore them, or try to get rid of them? Please advise. The `filter.lfs` configurati

Git Question

2018-03-28 Thread Mark Wartman
Hello, I am currently running git version 2.10.1 (Apple Git-78). When I run git config —list: it returns credential.helper-osxkeychain filter.lfs.clean=git=lfs clean — %f filter.lfs.smudge=git-lfs smudge — %f filter.lfs.process=git-lfs filter-process filter.lfs.required=true user.name=markwart

Re: Question about get_cached_commit_buffer()

2018-02-21 Thread Junio C Hamano
Jeff King writes: > Out of curiosity, do you actually use --show-all for anything? Absolutely not. I'd actually love it if I could say "not anymore" instead, but I haven't had an opportunity to debug the revision traversal code for quite some time so I do not even remember when was the last tim

Re: Question about get_cached_commit_buffer()

2018-02-21 Thread Jeff King
On Wed, Feb 21, 2018 at 02:22:05PM -0800, Junio C Hamano wrote: > > I think that repeating the oid is intentional; the point is to dump how > > the traversal code is hitting the endpoints, even if we do so multiple > > times. > > > > The --oneline behavior just looks like a bug. I think --format i

Re: Question about get_cached_commit_buffer()

2018-02-21 Thread Junio C Hamano
Jeff King writes: > I think that repeating the oid is intentional; the point is to dump how > the traversal code is hitting the endpoints, even if we do so multiple > times. > > The --oneline behavior just looks like a bug. I think --format is broken > with --show-all, too (it does not show anyth

Re: Question about get_cached_commit_buffer()

2018-02-21 Thread Jeff King
On Wed, Feb 21, 2018 at 09:13:22AM -0500, Derrick Stolee wrote: > > So there it is. It does show commits multiple times, but suppresses the > > verbose header after the first showing. If we do something like this: > > > >git rev-list --show-all --pretty --boundary c93150cfb0^- > > > > you'll

Re: Question about get_cached_commit_buffer()

2018-02-21 Thread Jeff King
On Wed, Feb 21, 2018 at 01:48:11PM -0500, Jeff King wrote: > > What confuses me about this behavior is that the OID is still shown on the > > repeat (and in the case of `git log --oneline` will not actually have a line > > break between two short-OIDs). I don't believe this behavior is something t

Re: Question about get_cached_commit_buffer()

2018-02-21 Thread Derrick Stolee
On 2/20/2018 5:57 PM, Jeff King wrote: On Tue, Feb 20, 2018 at 05:12:50PM -0500, Derrick Stolee wrote: In rev-list, the "--header" option outputs a value and expects the buffer to be cached. It outputs the header info only if get_cached_commit_buffer() returns a non-null buffer, giving incorrec

Re: Question about get_cached_commit_buffer()

2018-02-20 Thread Jeff King
On Tue, Feb 20, 2018 at 05:12:50PM -0500, Derrick Stolee wrote: > In rev-list, the "--header" option outputs a value and expects the buffer to > be cached. It outputs the header info only if get_cached_commit_buffer() > returns a non-null buffer, giving incorrect output. If it called > get_commit_

  1   2   3   4   5   6   >