A developer completed a new feature last month and I've completed the review, test, etc and merge that feature branch into release branch this month. Now I need to collect my current month's release branch changes and I'm using the below git command to see the changes applied to the release branch. Unfortunately the above mentioned feature changes are not listing since the commit date for above changes doesn't fall under the date I've selected. For me, the change has been delivered to release branch now and I need to count those change towards this month release churn metrics.
git log --after='2017-07-01 00:00:00'
Any quick and easy thoughts on this?
As a workaround, currently I'm achieving the above functionality by collecting the full release branch log every month and do a diff between previously saved last month git log o/p file. The resulting diff will have all changes since last month's saved log.
Here's one idea:
- Rebase before you merge. The rebase will leave all the "authorDate" meta-data alone on the rebased commits, but it will update the "commitDate" meta-data, which is what "git log --after" actually uses internally, even though it uses "authorDate" in its output (a git ux mistake IMO, quite confusing for users!). And so if you rebase today, all commits that get rebased will be captured by a "git log --after yesterday" even though the dates they show look older.
More info here about what data "git log --after" is actually using (stackoverflow.com): How to get git to show commits in a specified date range for author date?
Here's another idea:
- The merge commit itself should show up (its "commitDate" will be in July), just not the commits brought over by the merge. Can you use the merge commit to calculate your metrics?
- Try "git log --first-parent -m -p" to get merge diffs into your git log output. Normally "git log -p" does not include merges in the diff output. You need to add "-m" to get their diffs to print.
p.s. If you're on Bitbucket Server, my paid add-on, Bit-Booster Rebase/Squash, is very useful if you're want to try a rebase workflow. It also includes a hook you can enable to require rebases for merges into the release branch.
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot