Consider two commits on different branches, one with this patch:
diff --git a/file.txt b/file.txt
index 704fa27..2f7e74c 100644
--- a/file.txt
+++ b/file.txt
@@ -1,3 +1,3 @@
old_context
-foo
+bar
and the other with this patch:
diff --git a/file.txt b/file.txt
index f35051b..8c7de32 100644
--- a/file.txt
+++ b/file.txt
@@ -1,3 +1,3 @@
new_context
-foo
+bar
If I run "git rev-list --cherry-pick --left-right branch1...branch2", it
reports both commits as being genuine commits on their respective
branch, even though I consider their patches to be the same.
I guess for my purpose I would like to have patch-ids that ignore
context (or that use only one line of context, I'm not sure which).
In fact, if I do "git show <commit> -U1 | git patch-id", both commits
show the same id.
So, would it make sense to have a parameter for git-rev-list (and
git-cherry) that lets you specify how much context to be used for the
patch ids?
--
Stefan Haller
Berlin, Germany
http://www.haller-berlin.de/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html