在git历史记录中查找未部署的提交

Question

When we are planing a next release, we build the release notes by looking at commits which are not included in the last release. Normally we use gitk and a trained eye to detect such commits. But now, since the number of commits and branches are increasing, it gets harder and harder to see those.

Is there a command which prints all commits under HEAD but not a specific tag? To make this more clear I added this over simplified example.

                    F <- develop | HEAD
                    | \ 
                    D E
                    | |
last_release_tag -> B C
                    |/
                    A 

The expected output would be: CEDF (The order is not important.)

Thanks in advance.

Answer 1

What you're looking for is a range of commits including everything up to HEAD, but excluding things up to the last release tag. You might use:

git log last_release_tag..HEAD

which is equivalent to:

git log ^last_release_tag HEAD

See "SPECIFYING RANGES" in gitrevisions(7) for more detail. In the second form you can use more than one ^last_release_tag if you need to exclude multiple tags (this might be necessary if eg version C was also released).

You might also want to investigate options like --oneline or the --pretty formats to customise the output, depending on how you want your release notes to look. More detail can be found under "PRETTY FORMATS" in git-log(1) .

Answer 2

gitk is just a graphical layer on top of the standard Git tools. In your example,

git log last_release_tag..F

would list information about the commits you want. The command should be interpreted as "commits reachable by F except those reachable by the commit that last_release_tag points to". There are numerous formatting options if the default output format doesn't suit your needs, see git-log(1) . For details on how revision ranges can be specified see gitrevisions(7) .

For scripting purposes where you only want the SHA-1s of the commits, use the git rev-list plumbing command.

Answer 3

A bash script should do the job:

for commit in `git log --pretty=format:"%H" START_COMMIT..HEAD; do
  # Is there a tag which points to this commit ?
  tag=`git tag -l --points-at $commit`; 
  # Test if not the specific tag
  if test "$tag" != "specific_tag"; then 
    # You can use any git command on the commit here
    echo $commit;
  fi ; 
done