{"thread":{"id":"34859","subject":"Re: [PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check","startedAt":"2013-09-05T22:20:51Z","lastAt":"2013-09-09T15:17:50Z","messageCount":4,"participants":["Philip Oakley","Junio C Hamano"],"isPatch":true,"patchVersion":3,"patchTotal":11},"messages":[{"id":"226887","messageId":"926222C46F2240BDA71A004633E8DB7E@PhilipOakley","threadId":"34859","inReplyTo":null,"subject":"Re: [PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.org","sentAt":"2013-09-05T22:20:51Z","receivedAt":"2013-09-05T22:20:51Z","isPatch":true,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"From: \"Philip Oakley\" \nSent: Saturday, August 31, 2013 11:16 PM\n> From: \"Christian Couder\" \n>> Signed-off-by: Christian Couder \n>> ---\n>> Documentation/git-replace.txt | 4 +++-\n>> 1 file changed, 3 insertions(+), 1 deletion(-)\n>>\n>> diff --git a/Documentation/git-replace.txt \n>> b/Documentation/git-replace.txt\n>> index 736b48c..a2bd2ee 100644\n>> --- a/Documentation/git-replace.txt\n>> +++ b/Documentation/git-replace.txt\n>> @@ -21,10 +21,12 @@ replaced. The content of the 'replace' reference \n>> is the SHA-1 of the\n>> replacement object.\n>>\n>> The replaced object and the replacement object must be of the same \n>> type.\n>> -There is no other restriction on them.\n>> +This restriction can be bypassed using `-f`.\n>>\n>> Unless `-f` is given, the 'replace' reference must not yet exist.\n>>\n>> +There is no other restriction on the replaced and replacement \n>> objects.\n>\n> Is this trying to allude to the fact that merge commits may be \n> exchanged with non-merge commits? I strongly believe that this ability \n> to exchange merge and non-merge commits should be stated _explicitly_ \n> to counteract the false beliefs that are listed out on the internet.\n>\n> It's probably better stated in a separate patch for that explicit \n> purpose to avoid mixed messages within this commit.\n>\n\nNot sure how this method of preparing a comment patch will pan out..\n\n--->8----\nFrom a0c0e765cfd969c9c8a6ff3a2cb6b2f1391d2e7d Mon Sep 17 00:00:00 2001\nFrom: Philip Oakley \nDate: Thu, 5 Sep 2013 22:54:04 +0100\nSubject: [PATCH] Doc: 'replace' merge and non-merge commits\n\nSigned-off-by: Philip Oakley \n---\n\nThis is supplemental to Christian Couder's 'replace' patch series\n(2013-09-03 69dada4 (Christian Couder): t6050-replace: use some long\noption names).\n\nIt adds the clarification that merge and non-merge commits are\nreplaceable.\n\nMerges are often treated as special case objects so tell users that they \nare not special here.\n\n---\n Documentation/git-replace.txt | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/Documentation/git-replace.txt \nb/Documentation/git-replace.txt\nindex 414000e..f373ab4 100644\n--- a/Documentation/git-replace.txt\n+++ b/Documentation/git-replace.txt\n@@ -26,6 +26,7 @@ This restriction can be bypassed using `-f`.\n Unless `-f` is given, the 'replace' reference must not yet exist.\n\n There is no other restriction on the replaced and replacement objects.\n+Merge commits can be replaced by non-merge commits and vice versa.\n\n Replacement references will be used by default by all Git commands\n except those doing reachability traversal (prune, pack transfer and\n-- \n1.8.1.msysgit.1\n"},{"id":"226891","messageId":"xmqqob86g8v4.fsf@gitster.dls.corp.google.com","threadId":"34859","inReplyTo":"926222C46F2240BDA71A004633E8DB7E@PhilipOakley","subject":"Re: [PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-09-05T23:13:35Z","receivedAt":"2013-09-05T23:13:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Philip Oakley\" writes:\n\n> From: \"Philip Oakley\" \n> Sent: Saturday, August 31, 2013 11:16 PM\n>> From: \"Christian Couder\" \n>>> Signed-off-by: Christian Couder \n>>> ---\n>>> Documentation/git-replace.txt | 4 +++-\n>>> 1 file changed, 3 insertions(+), 1 deletion(-)\n>>>\n>>> diff --git a/Documentation/git-replace.txt\n>>> b/Documentation/git-replace.txt\n>>> index 736b48c..a2bd2ee 100644\n>>> --- a/Documentation/git-replace.txt\n>>> +++ b/Documentation/git-replace.txt\n>>> @@ -21,10 +21,12 @@ replaced. The content of the 'replace'\n>>> reference is the SHA-1 of the\n>>> replacement object.\n>>>\n>>> The replaced object and the replacement object must be of the same\n>>> type.\n>>> -There is no other restriction on them.\n>>> +This restriction can be bypassed using `-f`.\n>>>\n>>> Unless `-f` is given, the 'replace' reference must not yet exist.\n>>>\n>>> +There is no other restriction on the replaced and replacement\n>>> objects.\n>>\n>> Is this trying to allude to the fact that merge commits may be\n>> exchanged with non-merge commits? I strongly believe that this\n>> ability to exchange merge and non-merge commits should be stated\n>> _explicitly_ to counteract the false beliefs that are listed out on\n>> the internet.\n>>\n>> It's probably better stated in a separate patch for that explicit\n>> purpose to avoid mixed messages within this commit.\n>>\n>\n> Not sure how this method of preparing a comment patch will pan out..\n>\n> --->8----\n\nMake it \"--- >8 ---\" perhaps to balance out the perforation on both\nsides.\n\n> From a0c0e765cfd969c9c8a6ff3a2cb6b2f1391d2e7d Mon Sep 17 00:00:00 2001\n\nNot needed nor wanted.\n\n> From: Philip Oakley \n\nNot needed but does not hurt.\n\n> Date: Thu, 5 Sep 2013 22:54:04 +0100\n\nIs OK but redundant given that your message has a timestamp when we\nsaw your patch for the first time anyway.\n\n> Subject: [PATCH] Doc: 'replace' merge and non-merge commits\n>\n> Signed-off-by: Philip Oakley \n> ---\n>\n> This is supplemental to Christian Couder's 'replace' patch series\n> (2013-09-03 69dada4 (Christian Couder): t6050-replace: use some long\n> option names).\n>\n> It adds the clarification that merge and non-merge commits are\n> replaceable.\n>\n> Merges are often treated as special case objects so tell users that\n> they are not special here.\n\nI think the last paragraph deserves to be in the proposed commit log\nmessage proper. It explains why it is a good idea to have the added\nline in the documentation very well.\n\n> ---\n> Documentation/git-replace.txt | 1 +\n> 1 file changed, 1 insertion(+)\n>\n> diff --git a/Documentation/git-replace.txt\n> b/Documentation/git-replace.txt\n> index 414000e..f373ab4 100644\n> --- a/Documentation/git-replace.txt\n> +++ b/Documentation/git-replace.txt\n> @@ -26,6 +26,7 @@ This restriction can be bypassed using `-f`.\n> Unless `-f` is given, the 'replace' reference must not yet exist.\n>\n> There is no other restriction on the replaced and replacement objects.\n> +Merge commits can be replaced by non-merge commits and vice versa.\n>\n> Replacement references will be used by default by all Git commands\n> except those doing reachability traversal (prune, pack transfer and\n"},{"id":"227123","messageId":"1378642244-3572-1-git-send-email-philipoakley@iee.org","threadId":"34859","inReplyTo":"xmqqob86g8v4.fsf@gitster.dls.corp.google.com","subject":"[PATCH] Doc: 'replace' merge and non-merge commits","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.org","sentAt":"2013-09-08T12:10:44Z","receivedAt":"2013-09-08T12:10:44Z","isPatch":true,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"Merges are often treated as special case objects so tell users that\nthey are not special here.\n\nSigned-off-by: Philip Oakley \n---\n\nThis updates my in-line patch given in [PATCH v3 07/11]\nDocumentation/replace: tell that -f option bypasses the type check\n($gmane/233997 05 September 2013 23:20) and Junio's comments\n($gmane/234001 06 September 2013 00:13) \n\nApplies on top of pu and Christian Couder's series.\n\nPhilip\n\n---\n Documentation/git-replace.txt | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt\nindex 414000e..f373ab4 100644\n--- a/Documentation/git-replace.txt\n+++ b/Documentation/git-replace.txt\n@@ -26,6 +26,7 @@ This restriction can be bypassed using `-f`.\n Unless `-f` is given, the 'replace' reference must not yet exist.\n \n There is no other restriction on the replaced and replacement objects.\n+Merge commits can be replaced by non-merge commits and vice versa.\n \n Replacement references will be used by default by all Git commands\n except those doing reachability traversal (prune, pack transfer and\n-- \n1.8.1.msysgit.1\n"},{"id":"227277","messageId":"xmqqwqmp1u7y.fsf@gitster.dls.corp.google.com","threadId":"34859","inReplyTo":"1378642244-3572-1-git-send-email-philipoakley@iee.org","subject":"Re: [PATCH] Doc: 'replace' merge and non-merge commits","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-09-09T15:17:50Z","receivedAt":"2013-09-09T15:17:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Philip Oakley writes:\n\n> Merges are often treated as special case objects so tell users that\n> they are not special here.\n>\n> Signed-off-by: Philip Oakley \n> ---\n>\n> This updates my in-line patch given in [PATCH v3 07/11]\n> Documentation/replace: tell that -f option bypasses the type check\n> ($gmane/233997 05 September 2013 23:20) and Junio's comments\n> ($gmane/234001 06 September 2013 00:13) \n>\n> Applies on top of pu and Christian Couder's series.\n\nThanks, looks good.\n\n>\n> Philip\n>\n> ---\n> Documentation/git-replace.txt | 1 +\n> 1 file changed, 1 insertion(+)\n>\n> diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt\n> index 414000e..f373ab4 100644\n> --- a/Documentation/git-replace.txt\n> +++ b/Documentation/git-replace.txt\n> @@ -26,6 +26,7 @@ This restriction can be bypassed using `-f`.\n> Unless `-f` is given, the 'replace' reference must not yet exist.\n> \n> There is no other restriction on the replaced and replacement objects.\n> +Merge commits can be replaced by non-merge commits and vice versa.\n> \n> Replacement references will be used by default by all Git commands\n> except those doing reachability traversal (prune, pack transfer and\n"}]}