git record-only merge / whitelist known breaks from interbranch diff report

Asked Jul 23 '15 at 12:54

Active Jul 27 '15 at 19:25

Viewed 235 times

I have an automatic report aimed at catching missing commits between release branches based on the output of

tgt=$(git rev-parse --verify "origin/${TARGET_BRANCH}")
ref=$(git rev-parse --verify "origin/${REFERENCE_BRANCH}")
git log --oneline --pretty=format:'%h\x1E%ad\x1E%s%d\x1E%an' --date=short --cherry-pick --right-only --no-merges "${tgt}...${ref}"

which works nicely for 99% cases. Sometimes though, usually because of a gentle human touch post-merge/post-cherry-pick there are breaks. Which I want to "white list" post manual validation to keep the report in a clean PASS-good/FAIL-bad shape not requiring manual judgement.

With Subversion I would have just done merge --record only -c<commit-id> ... to shut the svn --show-revs eligible up.

Is there a way to do it in GIT (not storing any meta-information outside the git repository)?

edited Jul 23 '15 at 13:02

asked Jul 23 '15 at 12:54

bobah

18,364
2
37
70

BTW, have you tried using `git cherry` to list the missing commits between 2 branches?... – TheCodeArtist Aug 02 '15 at 17:08
1

Possible duplicate of [Subversion has --record-only for merges, how do I do the same in Git?](http://stackoverflow.com/questions/2786272/subversion-has-record-only-for-merges-how-do-i-do-the-same-in-git) – Philipp Wendler Apr 27 '17 at 12:19
@PhilippWendler - indeed! – bobah Apr 27 '17 at 14:04

git record-only merge / whitelist known breaks from interbranch diff report

0 Answers0