Re: Incorrect diff-parseopt conversion?

2019-05-25 Thread Duy Nguyen
On Fri, May 24, 2019 at 5:08 PM Ævar Arnfjörð Bjarmason wrote: > >> OK, I just had a look at the code in parse-options.c. > >> Hmm, somewhat ugly! :-D > > > > Yeah it's a bit hackish. The problem is parse-options (and also config > > parser) does not allow passing user data to the callback. Changi

Re: Incorrect diff-parseopt conversion?

2019-05-24 Thread Ævar Arnfjörð Bjarmason
On Fri, May 24 2019, Duy Nguyen wrote: > On Wed, May 22, 2019 at 7:35 AM Ramsay Jones > wrote: >> >> >> >> On 22/05/2019 01:11, Duy Nguyen wrote: >> > On Wed, May 22, 2019 at 2:56 AM Ramsay Jones >> > wrote: >> >> >> >> Hi Duy, >> >> >> >> I am in the middle of rebasing a long running branch o

Re: Incorrect diff-parseopt conversion?

2019-05-24 Thread Duy Nguyen
On Wed, May 22, 2019 at 7:35 AM Ramsay Jones wrote: > > > > On 22/05/2019 01:11, Duy Nguyen wrote: > > On Wed, May 22, 2019 at 2:56 AM Ramsay Jones > > wrote: > >> > >> Hi Duy, > >> > >> I am in the middle of rebasing a long running branch onto > >> current master (v2.22.0-rc1) and noticed someth

Re: Incorrect diff-parseopt conversion?

2019-05-21 Thread Ramsay Jones
On 22/05/2019 01:11, Duy Nguyen wrote: > On Wed, May 22, 2019 at 2:56 AM Ramsay Jones > wrote: >> >> Hi Duy, >> >> I am in the middle of rebasing a long running branch onto >> current master (v2.22.0-rc1) and noticed something odd with >> commit af2f368091 ("diff-parseopt: convert --output-*",

Re: Incorrect diff-parseopt conversion?

2019-05-21 Thread Duy Nguyen
On Wed, May 22, 2019 at 2:56 AM Ramsay Jones wrote: > > Hi Duy, > > I am in the middle of rebasing a long running branch onto > current master (v2.22.0-rc1) and noticed something odd with > commit af2f368091 ("diff-parseopt: convert --output-*", > 2019-02-21). > > As part of the branch I am rebasi

Incorrect diff-parseopt conversion?

2019-05-21 Thread Ramsay Jones
Hi Duy, I am in the middle of rebasing a long running branch onto current master (v2.22.0-rc1) and noticed something odd with commit af2f368091 ("diff-parseopt: convert --output-*", 2019-02-21). As part of the branch I am rebasing, I have defined a new OPT_LL_CALLBACK() macro[1], which I had inte

Re: git commit --verbose shows incorrect diff when pre-commit hook is used to modify files

2019-03-02 Thread Junio C Hamano
Fernando Chorney writes: > Hmm looks like I forgot to send my reply to this back to the mailing list. > > "Hmm, so I currently have it set to run vim as my commit editor, and > enter the message in there most of the time. I can definitely see > output from the hook into the shell before my vim ed

Re: git commit --verbose shows incorrect diff when pre-commit hook is used to modify files

2019-02-26 Thread Fernando Chorney
Hmm looks like I forgot to send my reply to this back to the mailing list. "Hmm, so I currently have it set to run vim as my commit editor, and enter the message in there most of the time. I can definitely see output from the hook into the shell before my vim editor loads up that shows me the diff

Fwd: git commit --verbose shows incorrect diff when pre-commit hook is used to modify files

2019-02-11 Thread Sergey Lukashev
Пересылаемое сообщение 12.02.2019, 01:54, "Sergey Lukashev" : Indeed. Sorry, this was how I thought it works. So the hook runs even if the commit is cancelled. A bit odd. Then let's have someone else from git list to answer your question. 12.02.2019, 01:11, "Fernando Chorne

Re: git commit --verbose shows incorrect diff when pre-commit hook is used to modify files

2019-02-11 Thread Sergey Lukashev
At the time you see the diff the committing of changes has not yet been initiated. It's only after you type in the message that the ACTUAL committing starts and the hook runs. You can print the diff of what your hook has changed by running "git diff" in it before adding changes. 12.02.2019, 00

git commit --verbose shows incorrect diff when pre-commit hook is used to modify files

2019-02-11 Thread Fernando Chorney
Hi, I am trying to use a pre-commit hook to modify files before they are to be committed. The problem I am running into is that if I use "git commit --verbose", which I often do so that I can see the diff, the diff it displays in the editor is the diff before the pre-commit hook was run rather tha

Re: Incorrect Diff!

2017-06-01 Thread Junio C Hamano
Pulkit Goyal <7895pul...@gmail.com> writes: > I was working on a Django project when I got the following diff which > is very much confusing. > > The diff is pasted at https://bpaste.net/show/c2cb00728ff0. > > As you can see on bpaste that in line number 9,10 I have changed > "class activationview

Incorrect Diff!

2017-06-01 Thread Pulkit Goyal
Hey folks! I was working on a Django project when I got the following diff which is very much confusing. The diff is pasted at https://bpaste.net/show/c2cb00728ff0. As you can see on bpaste that in line number 9,10 I have changed "class activationview" to "class activateuser", but in line number