RE: [External] Re: gitk -m ?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Neither of those two work for me.  They don't limit the view to the single file of interest.  

Also, I tried "additional arguments to git log", using "-m --follow".  I filled in the single file of interest in the 'Enter files' section.  The error message was:

	Can't parse git log output:  {commit 9cc8be... faab99... }

-----Original Message-----
From: Uxío Prego [mailto:uprego@xxxxxxxxxx] 
Sent: Monday, August 14, 2017 12:47
To: Burkhardt, Glenn B UTAS
Cc: git@xxxxxxxxxxxxxxx
Subject: Re: [External] Re: gitk -m ?

I do not know if you can do what you want, mostly if you can do what you want as simply as you might be wanting that you want it, but I guess you could use this gitk boot command as a _simple_ work around somehow aliased within your command line configuration:

    $ gitk (--all)? $(git log -m --follow --pretty=format:%h PATHSPEC)

Alternatively, there is a _view configuration_ menu (_new view_, _edit view_) where there is a text box labeled _Command to generate more commits to include_. If you type here:

    git log -m --follow --pretty=format:%h PATHSPEC

I do not know what will happen and I can not test that now (I eventually will), but chances are it could do what you wanted. Maybe you can even use custom aliases in there that text box.

I guess you are receiving a more authorized answer soonish, in the meanwhile, hope that helped.

Regards,


On 14 Aug 2017, at 15:20, Burkhardt, Glenn B UTAS <Glenn.Burkhardt@xxxxxxxxxxxx> wrote:

They don't.  In particular, information about commits that are parts of merges is missing.

Here's an example.  There are only two entries listed in 'gitk --all'
for a particular file (sorry, I'd prefer to include a screen sho, but the mailing list doesn't allow HTML messages).

gitk --all MANIFEST.MF

Parent: f7462684ae78720aac05c929256d770118cf01fa (initial clone from Clearcase integ3 branch)
Branches: master, remotes/origin/master, remotes/origin/ww, ww
Follows:
Precedes:

   require java 1.8

Child:  240f151d61fd4fd06f377bc52970b3574e5f9031 (require java 1.8)
Branches: master, remotes/origin/master, remotes/origin/ww, ww
Follows:
Precedes:

   initial clone from Clearcase integ3 branch


git log with '-m' and '-follow' shows:

$ git log -m --follow --oneline MANIFEST.MF
9cc8be4 (from 1222d7c) Merge branch 'master' into ww; strategy "ours"
a423f2d (from f869950) merge from ww branch; remove Bundle-NativeCode
51f0628 (from 2c6478c) Merge branch 'ww' of coverity:rmps into ww
240f151 require java 1.8
f746268 initial clone from Clearcase integ3 branch


-----Original Message-----
From: Uxío Prego [mailto:uprego@xxxxxxxxxx]
Sent: Monday, August 14, 2017 01:12
To: Burkhardt, Glenn B UTAS
Cc: git@xxxxxxxxxxxxxxx
Subject: [External] Re: gitk -m ?

Not sure what you are wanting to achieve, but please make sure neither `gitk PATHSPEC` nor `gitk --all PATHSPEC` are presenting you enough information.

On 3 Aug 2017, at 19:37, Burkhardt, Glenn B UTAS <Glenn.Burkhardt@xxxxxxxxxxxx> wrote:

I've been looking in 'gitk' for an option that does what 'git log -m'
does.  Did I miss something?  In particular, I'd like to get information about a file that's currently available with "git log -m --all --follow", but presented in 'gitk'.  If it's not there, please consider this a feature request.

Thanks.




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux