{"thread":{"id":"32754","subject":"Bug, feature, or pilot error: format-patch","startedAt":"2013-01-28T17:03:56Z","lastAt":"2013-01-30T14:41:28Z","messageCount":2,"participants":["Gene Czarcinski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"208091","messageId":"5106AF7C.1010502@czarc.net","threadId":"32754","inReplyTo":null,"subject":"Bug, feature, or pilot error: format-patch","fromName":"Gene Czarcinski","fromEmail":"gene@czarc.net","sentAt":"2013-01-28T17:03:56Z","receivedAt":"2013-01-28T17:03:56Z","isPatch":false,"sender":{"key":"gene@czarc.net","avatar":null},"body":"I am not on the mailing list so please CC me.  I am running git 1.8.1 on \nFedora 18.\n\nI aam having what appears to be a problem.  Here is the sequence which \ngenerally describes what I did and what happened:\n\n     git  checkout  -b  test1  master\n     git  am  0001-simple-1.patch\n     git  checkout  -b  test2  master\n     git  am  0001-simple-2.patch        ### this is known to conflict \nwith 0001-simple-1.patch\n     git  checkout  test1\n     git  merge  test2\n[here git-merge detects a conflict]\n     git  mergetool                               ###to resolve the conflict\n[conflict resolved]\n     git  commit  -a -s\n     git  log\n[shows two commits -- one for simple-2 and one for the merge]\n     git  format-patch  master..HEAD\n[two patch files created: 0001-simple-1.patch and 0002-simple-2.patch]\n[0002-simple-2.patch and 0001-simple-2.patch are exactly equal and do \nnot reflect the resolved conflict]\n\nIf you do git-diff between <commit-patch-1> and HEAD, you get something \ndifferent that you got from format-patch.\n\n1. Bug ... format-patch is broken\n\n2. Feature ... that is the way it works\n\n3. Pilot error ... ??\n\nI can create a good version of patch-2 manually but should I have to?\n\nColor me foolish but I assumed I could do git-format-patch in one branch \nand then use git-am to recreate that branch elsewhere.\n\nGene\n"},{"id":"208267","messageId":"51093118.2060709@czarc.net","threadId":"32754","inReplyTo":"5106AF7C.1010502@czarc.net","subject":"Re: Bug, feature, or pilot error: format-patch","fromName":"Gene Czarcinski","fromEmail":"gene@czarc.net","sentAt":"2013-01-30T14:41:28Z","receivedAt":"2013-01-30T14:41:28Z","isPatch":false,"sender":{"key":"gene@czarc.net","avatar":null},"body":"Ping\n\nIt would be useful to get some comment on this\n\nOn 01/28/2013 12:03 PM, Gene Czarcinski wrote:\n> I am not on the mailing list so please CC me.  I am running git 1.8.1 on\n> Fedora 18.\n>\n> I aam having what appears to be a problem.  Here is the sequence which\n> generally describes what I did and what happened:\n>\n>      git  checkout  -b  test1  master\n>      git  am  0001-simple-1.patch\n>      git  checkout  -b  test2  master\n>      git  am  0001-simple-2.patch        ### this is known to conflict\n> with 0001-simple-1.patch\n>      git  checkout  test1\n>      git  merge  test2\n> [here git-merge detects a conflict]\n>      git  mergetool                               ###to resolve the\n> conflict\n> [conflict resolved]\n>      git  commit  -a -s\n>      git  log\n> [shows two commits -- one for simple-2 and one for the merge]\n>      git  format-patch  master..HEAD\n> [two patch files created: 0001-simple-1.patch and 0002-simple-2.patch]\n> [0002-simple-2.patch and 0001-simple-2.patch are exactly equal and do\n> not reflect the resolved conflict]\n>\n> If you do git-diff between <commit-patch-1> and HEAD, you get something\n> different that you got from format-patch.\n>\n> 1. Bug ... format-patch is broken\n>\n> 2. Feature ... that is the way it works\n>\n> 3. Pilot error ... ??\n>\n> I can create a good version of patch-2 manually but should I have to?\n>\n> Color me foolish but I assumed I could do git-format-patch in one branch\n> and then use git-am to recreate that branch elsewhere.\n>\n> Gene\n"}]}