Re: Improving git branch

2014-12-17 Thread John Tapsell
I don't fully understand - if I did that, then what difference would an average user actually see? On 17 December 2014 at 11:28, Michael J Gruber wrote: > John Tapsell schrieb am 17.12.2014 um 12:10: >> Hi all, >> >> I'm interested in putting in some tim

Improving git branch

2014-12-17 Thread John Tapsell
follow the coloring in the current git branch. Before I start making patches etc, what do people think? Would I have a chance of getting this in? Should I change some aspects etc? Thanks, John Tapsell -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a mess

Re: git reflog --date

2014-10-21 Thread John Tapsell
Great - now I just need to persuade someone very nice nicely.. :-) On 21 October 2014 19:06, Junio C Hamano wrote: > John Tapsell writes: > >> For me, writing "git reflog @{now}" is a lot less intuitive than "git >> reflog --date" >> >> Current

Re: git reflog --date

2014-10-21 Thread John Tapsell
7;t mention "@{now}" at all. My opinion: 1. Add --date as an option to reflog. Perhaps using the log.date format as the default. 2. Document --date in the man page for "git reflog" 3. Document @{now} in the man page for "git reflog" Sound good? John On 21 Oc

git reflog --date

2014-10-21 Thread John Tapsell
Hi all, Could we add a default to "--date" so that: git reflog --date just works? (Currently you need to do: git reflog --date=iso) It should probably obey the default in log.date? Also, could we add this "--date" option to the man page please? It's an extremely useful option to know. A

Re: Code changes in merge commits

2014-09-29 Thread John Tapsell
> What I'd love to see with "git log -p" is the diff between a trivial > merge (possibly including conflict markers) and the actual merge commit. > That would imply that "git log" would redo the merge before computing > the diff (rather heavyweight :-( ), but an empty diff would mean "no > change o

Re: Code changes in merge commits

2014-09-29 Thread John Tapsell
hing along these lines? Ideally I'd like to see all the code changes to a code base just with "git log -p". Any thoughts? Thanks, John Tapsell -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Code changes in merge commits

2014-09-29 Thread John Tapsell
Hi, Our team just struggled with this problem, and I've created a simple, 3 commit large, example git repository to demonstrate the problem: https://github.com/johnflux/ExampleEvilness2 The code: Adds a file, adds a security fix commit, then removes the fix during a merge. This happened by

Re: git log -p unexpected behaviour

2013-05-01 Thread John Tapsell
On 30 April 2013 21:38, Junio C Hamano wrote: > John Tapsell writes: > >> On 30 April 2013 20:44, Junio C Hamano wrote: >>> John Tapsell writes: >>> >>>> Is there no way to fix --cc to work even in the edge cases? >>> >>> Can y

Re: git log -p unexpected behaviour

2013-04-30 Thread John Tapsell
On 30 April 2013 20:44, Junio C Hamano wrote: > John Tapsell writes: > >> Is there no way to fix --cc to work even in the edge cases? > > Can you clarify what you mean by "fix" and "edge cases"? My understanding is that even with -cc there will be changes t

Re: git log -p unexpected behaviour - security risk?

2013-04-30 Thread John Tapsell
On 30 April 2013 18:58, John Szakmeister wrote: > On Tue, Apr 30, 2013 at 1:05 PM, Matthieu Moy > wrote: >> Junio C Hamano writes: >> >>> By the way, these options are _not_ about "showing merge commits >>> that introduce code", and they do not help your kind of "security". >>> As I repeatedly s

Re: git log -p unexpected behaviour - security risk?

2013-04-21 Thread John Tapsell
On 21 April 2013 11:21, Jonathan Nieder wrote: > John Tapsell wrote: > >> I'm concerned that noone is taking this security risk seriously. > > If anyone relies on "git log -p" or "git log -p --cc" output to make > sure that the untrusted code they u

Re: git log -p unexpected behaviour - security risk?

2013-04-21 Thread John Tapsell
On 21 April 2013 08:26, Junio C Hamano wrote: > Simon Ruderich writes: > >> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt >> index 104579d..cd35ec7 100644 >> --- a/Documentation/diff-options.txt >> +++ b/Documentation/diff-options.txt >> @@ -24,6 +24,10 @@ ifndef::g

git log -p unexpected behaviour - security risk?

2013-04-11 Thread John Tapsell
Hi, I noticed that code that you put in merge will not be visible by default. This seems like a pretty horrible security problem, no? I made the following test tree, with just 3 commits: https://github.com/johnflux/ExampleEvilness.git Doing "git log -p" shows all very innocent commits. Com

Re: RFC: Very useful script to SVG graph the git commits from a file orientated view

2013-04-04 Thread John Tapsell
Opps, somehow I forgot to actually attach it. It's now attached graph_git.pl Description: Binary data

RFC: Very useful script to SVG graph the git commits from a file orientated view

2013-04-04 Thread John Tapsell
Hi, I made this script to help me see the logical connections between commits. It produces a .svg graph showing the commits that affected a file. For example, say you have the commits: commit1 - modify hello.c commit2 - modify goodbye.c commit3 - modify hello.c and goodbye.c It will draw a gr