Using git, I would like to check which, if any, of the diffs from a specific commit have been applied (and where) to a specific branch.
cherry-pick does this (except for the "where" part) when you cherry pick a commit and only applies the diffs that haven't been applied to that branch already. For example, if I commit two file changes to a topic branch, I manually apply one of those same file changes to master, when I cherry-pick the commit with the two file diffs from topic to master, it only applies the un-applied diff. To demonstrate this, run the following commands from an empty folder and look at the final diff output:
git init
echo file 1 > file1.txt
git add .
git commit -m "Initial commit"
git branch topic
echo file 1.1 > file1.txt
git add .
git commit -m "Change file1.txt on master"
git checkout topic
echo file 1.1 > file1.txt
echo file 2 > file2.txt
git add .
git commit -m "Change file1.txt and add file2.txt on topic"
git tag to-cherrypick
git checkout master
git cherry-pick --no-commit to-cherrypick
git diff --cached
The diff output is:
diff --git a/file2.txt b/file2.txt
new file mode 100644
index 0000000..6bb4b1d
--- /dev/null
+++ b/file2.txt
@@ -0,0 +1 @@
+file 2
Showing that even though the cherry-picked commit had two file changes, it detected the first one was already applied.
So my question is: Does git have an exposed plumbing (or somewhere between plumbing and porcelain) command that will look at the hunks in a commit and check for each hunk in another branch, showing the commit where each hunk is applied?
And if that command doesn't exist, what are some pathways to finding that? I'm already looking into possibly writing a script/program to break the commit into it's hunks, run patch-id or something similar on each, then looping through the other branching starting at the common ancestor and doing the same for each commit, and comparing hunks. I would like to avoid writing that if it is already exposed -- I know it exists because cherry-pick does that (except for showing the "where").
UPDATE: git cherry will do some of what I am looking for. It will tell me which commits in one branch have one or more diff hunks that haven't been applied to another. It does not tell where those diff hunks were applied or if a commit has hunks that were applied and others that weren't.
