Github user erikdw commented on the issue:

    https://github.com/apache/storm/pull/2550
  
    @hmcl : now we're going down the rathole that I knew existed if we didn't 
take this offline. 😄 
    
    Before I get to the question of using command-line `git` to see the related 
commits, I must note my agreement that all commits should be prefixed with the 
same ID (e.g., `STORM-2937:`) and perhaps a common brief description [1].  That 
would provide a convention for seeing that the commits are all part of the same 
JIRA.  That *might* suffice for satisfying your question.
    
    As for how I personally would enumerate the commits in the `git log` for 
this PR as you requested, I cannot show you *yet* because this PR hasn't been 
merged.  So if you'll excuse the reference to a separate repo, I'll show you 
how I enumerate the commits for a PR different in a different repo:
    * https://github.com/mesos/storm/pull/233/commits
    
    We can see that the commits there are:
    * f9fa0f6
    * 03030db
    
    When I look at my "git log" for purposes of seeing the flow of history, I 
use`git l` [2].  This output looks like so:
    
    ```
    * 4119581 - (base/master) avoid hardcoding storm-core version in 
storm-shim-1x/pom.xml, just use the property defined in the project's base 
pom.xml (2018-01-23 18:56:03 -0800) <Erik Weathers>
    *   256d5f0 - Merge pull request #231 from 
JessicaLHartog/logviewer-sidecar-flag (2017-12-20 11:40:06 -0800) 
<JessicaLHartog>
    |\  
    | * 18832dd - Conditionally perform logviewer sidecar creation depending on 
configuration. (2017-12-13 15:28:21 -0800) <Jessica Hartog>
    | * 6dd4973 - Rename now defunct  configuration parameter (2017-12-13 
14:46:29 -0800) <Jessica Hartog>
    * |   d2cedb8 - Merge pull request #233 (2017-12-20 11:30:34 -0800) 
<JessicaLHartog>
    |\ \  
    | * | 03030db - Update protobuf version to be compatable with newer 
versions of Mesos (2017-12-18 15:16:37 -0800) <Jessica Hartog>
    | * | f9fa0f6 - Updating storm version (2017-12-18 15:16:37 -0800) <Jessica 
Hartog>
    |/ /  
    * |   7a1e50c - Merge pull request #232 from JessicaLHartog/issue-222 
(2017-12-18 15:12:29 -0800) <JessicaLHartog>
    |\ \  
    | |/  
    |/|   
    ```
    
    I acknowledge that it's a bit hard to parse visually at first!  But it 
shows me that there are 2 commits that went into the merge of PR #233:
    * 03030db
    * f9fa0f6
    
    Then you can put those commits in a sequence when you run various git 
commands.
    
    Again, I **do** agree that it's best practice to squash.  I'm just trying 
to argue that it shouldn't be a blanket unwavering policy with no exceptions.  
Otherwise I believe we're choosing ease of commit stewardship over ease of 
reading and maintaining the actual code.
    
    [1] I kind of dislike having the *exact same* headline with nothing unique 
for each commit because it forces you to look more deeply to see what each 
commit does (e.g., open each commit separately in GitHub, or use git show for 
each commit, or use git log and scroll to the commits you are looking at).  
That is a minor nit with the convention you proposed though. 
    
    [2] Definition of my `git l` alias
    
    ```
    % cat ~/.gitconfig
    ...
    [alias]
    ...
            l = log --date=iso-local --color --graph 
--pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cd) %C(bold 
blue)<%an>%Creset' --abbrev-commit
    ```


---

Reply via email to