Hi,
I'm trying to generate an accurate changelog of changes between 2 tags on a branch. There is a merge between these 2 points which includes changes that were cherry-picked before the start point. This causes the changelog to show these changes, despite them already existing before the start point of the log.
I've included a test script below that creates a repository that shows a simplified version of the issue. Basically, I want the changelog to only show the changes between the start and end tags, which are test4 and test5, but I get a list that also includes other commits. I have tried git-cherry and git-log with --cherry-pick and various things with git-rev-list and git-merge-base.
#!/bin/sh
mkdir testrepo
cd testrepo
git init
echo initial > testfile
git add testfile
git commit -m initial
git branch stable
for f in $(seq 1 5)
do
echo test$f >> testfile
git commit -a -m test$f
done
#without this sleep the cherry-picks end up with the same hash as
their original commit...
sleep 1
git checkout stable
git cherry-pick :/test1
git cherry-pick :/test2
git cherry-pick :/test3
git tag start
git cherry-pick :/test4
git merge master
#Clean up the merge error.
if [ ! $? -eq 0 ]
then
sed -i "/[:=]/ d" testfile
git commit -a -m "Merge branch 'master' into stable"
fi
git tag end
##########################Thanks, Luuk
