{"thread":{"id":"21939","subject":"[PATCH RESEND] gitk: add \"--no-replace-objects\" option","startedAt":"2009-12-12T04:52:39Z","lastAt":"2009-12-27T17:26:18Z","messageCount":3,"participants":["Christian Couder","Paul Mackerras"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"129786","messageId":"20091212045240.4249.66874.chriscool@tuxfamily.org","threadId":"21939","inReplyTo":null,"subject":"[PATCH RESEND] gitk: add \"--no-replace-objects\" option","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-12-12T04:52:39Z","receivedAt":"2009-12-12T04:52:39Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"Replace refs are useful to change some git objects after they\nhave started to be shared between different repositories. One\nmight want to ignore them to see the original state, and\n\"--no-replace-objects\" option can be used from the command\nline to do so.\n\nThis option simply sets the GIT_NO_REPLACE_OBJECTS environment\nvariable, and that is enough to make gitk ignore replace refs.\n\nThe GIT_NO_REPLACE_OBJECTS is set to \"1\" instead of \"\" as it is\nsafer on some platforms, thanks to Johannes Sixt and Michael J\nGruber.\n\nTested-by: Michael J Gruber \nSigned-off-by: Christian Couder \n---\n gitk-git/gitk | 5 ++++-\n 1 files changed, 4 insertions(+), 1 deletions(-)\n\n\tI previously sent this patch as part of a series:\n\n\thttp://thread.gmane.org/gmane.comp.version-control.git/133423/focus=133427\n\n\tand it looks like it has been lost.\n\n\tThanks in advance.\n\ndiff --git a/gitk-git/gitk b/gitk-git/gitk\nindex 364c7a8..86dff0f 100644\n--- a/gitk-git/gitk\n+++ b/gitk-git/gitk\n@@ -130,7 +130,7 @@ proc unmerged_files {files} {\n }\n \n proc parseviewargs {n arglist} {\n- global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs\n+ global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs env\n \n set vdatemode($n) 0\n set vmergeonly($n) 0\n@@ -210,6 +210,9 @@ proc parseviewargs {n arglist} {\n \t\t# git rev-parse doesn't understand --merge\n \t\tlappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD\n \t }\n+\t \"--no-replace-objects\" {\n+\t\tset env(GIT_NO_REPLACE_OBJECTS) \"1\"\n+\t }\n \t \"-*\" {\n \t\t# Other flag arguments including -\n \t\tif {[string is digit -strict [string range $arg 1 end]]} {\n-- \n1.6.6.rc1.8.gd33ec\n"},{"id":"129823","messageId":"20091213230923.GB8135@brick.ozlabs.ibm.com","threadId":"21939","inReplyTo":"20091212045240.4249.66874.chriscool@tuxfamily.org","subject":"Re: [PATCH RESEND] gitk: add \"--no-replace-objects\" option","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2009-12-13T23:09:23Z","receivedAt":"2009-12-13T23:09:23Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"On Sat, Dec 12, 2009 at 05:52:39AM +0100, Christian Couder wrote:\n\n> Replace refs are useful to change some git objects after they\n> have started to be shared between different repositories. One\n> might want to ignore them to see the original state, and\n> \"--no-replace-objects\" option can be used from the command\n> line to do so.\n> \n> This option simply sets the GIT_NO_REPLACE_OBJECTS environment\n> variable, and that is enough to make gitk ignore replace refs.\n> \n> The GIT_NO_REPLACE_OBJECTS is set to \"1\" instead of \"\" as it is\n> safer on some platforms, thanks to Johannes Sixt and Michael J\n> Gruber.\n> \n> Tested-by: Michael J Gruber \n> Signed-off-by: Christian Couder \n\nThanks, applied.\n\nPaul.\n"},{"id":"130365","messageId":"200912271826.19058.chriscool@tuxfamily.org","threadId":"21939","inReplyTo":"20091213230923.GB8135@brick.ozlabs.ibm.com","subject":"Re: [PATCH RESEND] gitk: add \"--no-replace-objects\" option","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-12-27T17:26:18Z","receivedAt":"2009-12-27T17:26:18Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On lundi 14 décembre 2009, Paul Mackerras wrote:\n> On Sat, Dec 12, 2009 at 05:52:39AM +0100, Christian Couder wrote:\n> > Replace refs are useful to change some git objects after they\n> > have started to be shared between different repositories. One\n> > might want to ignore them to see the original state, and\n> > \"--no-replace-objects\" option can be used from the command\n> > line to do so.\n> >\n> > This option simply sets the GIT_NO_REPLACE_OBJECTS environment\n> > variable, and that is enough to make gitk ignore replace refs.\n> >\n> > The GIT_NO_REPLACE_OBJECTS is set to \"1\" instead of \"\" as it is\n> > safer on some platforms, thanks to Johannes Sixt and Michael J\n> > Gruber.\n> >\n> > Tested-by: Michael J Gruber \n> > Signed-off-by: Christian Couder \n>\n> Thanks, applied.\n\nThanks, but it looks like the patch is not in v1.6.6.\nCould you ask Junio to pull from you?\n\nBest regards,\nChristian.\n"}]}