# [PATCH RESEND] gitk: add "--no-replace-objects" option 3 messages from 2009-12-12 to 2009-12-27. Participants: Christian Couder, Paul Mackerras. Thread: https://gitlist.dev/t/21939 ## Christian Couder, 2009-12-12 04:52 Subject: [PATCH RESEND] gitk: add "--no-replace-objects" option Message-ID: <20091212045240.4249.66874.chriscool@tuxfamily.org> URL: https://gitlist.dev/e/20091212045240.4249.66874.chriscool%40tuxfamily.org ``` Replace refs are useful to change some git objects after they have started to be shared between different repositories. One might want to ignore them to see the original state, and "--no-replace-objects" option can be used from the command line to do so. This option simply sets the GIT_NO_REPLACE_OBJECTS environment variable, and that is enough to make gitk ignore replace refs. The GIT_NO_REPLACE_OBJECTS is set to "1" instead of "" as it is safer on some platforms, thanks to Johannes Sixt and Michael J Gruber. Tested-by: Michael J Gruber Signed-off-by: Christian Couder --- gitk-git/gitk | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) I previously sent this patch as part of a series: http://thread.gmane.org/gmane.comp.version-control.git/133423/focus=133427 and it looks like it has been lost. Thanks in advance. diff --git a/gitk-git/gitk b/gitk-git/gitk index 364c7a8..86dff0f 100644 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -130,7 +130,7 @@ proc unmerged_files {files} { } proc parseviewargs {n arglist} { - global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs + global vdatemode vmergeonly vflags vdflags vrevs vfiltered vorigargs env set vdatemode($n) 0 set vmergeonly($n) 0 @@ -210,6 +210,9 @@ proc parseviewargs {n arglist} { # git rev-parse doesn't understand --merge lappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD } + "--no-replace-objects" { + set env(GIT_NO_REPLACE_OBJECTS) "1" + } "-*" { # Other flag arguments including - if {[string is digit -strict [string range $arg 1 end]]} { -- 1.6.6.rc1.8.gd33ec ``` ## Paul Mackerras, 2009-12-13 23:09 Subject: Re: [PATCH RESEND] gitk: add "--no-replace-objects" option Message-ID: <20091213230923.GB8135@brick.ozlabs.ibm.com> URL: https://gitlist.dev/e/20091213230923.GB8135%40brick.ozlabs.ibm.com In-Reply-To: <20091212045240.4249.66874.chriscool@tuxfamily.org> ``` On Sat, Dec 12, 2009 at 05:52:39AM +0100, Christian Couder wrote: > Replace refs are useful to change some git objects after they > have started to be shared between different repositories. One > might want to ignore them to see the original state, and > "--no-replace-objects" option can be used from the command > line to do so. > > This option simply sets the GIT_NO_REPLACE_OBJECTS environment > variable, and that is enough to make gitk ignore replace refs. > > The GIT_NO_REPLACE_OBJECTS is set to "1" instead of "" as it is > safer on some platforms, thanks to Johannes Sixt and Michael J > Gruber. > > Tested-by: Michael J Gruber > Signed-off-by: Christian Couder Thanks, applied. Paul. ``` ## Christian Couder, 2009-12-27 17:26 Subject: Re: [PATCH RESEND] gitk: add "--no-replace-objects" option Message-ID: <200912271826.19058.chriscool@tuxfamily.org> URL: https://gitlist.dev/e/200912271826.19058.chriscool%40tuxfamily.org In-Reply-To: <20091213230923.GB8135@brick.ozlabs.ibm.com> ``` On lundi 14 décembre 2009, Paul Mackerras wrote: > On Sat, Dec 12, 2009 at 05:52:39AM +0100, Christian Couder wrote: > > Replace refs are useful to change some git objects after they > > have started to be shared between different repositories. One > > might want to ignore them to see the original state, and > > "--no-replace-objects" option can be used from the command > > line to do so. > > > > This option simply sets the GIT_NO_REPLACE_OBJECTS environment > > variable, and that is enough to make gitk ignore replace refs. > > > > The GIT_NO_REPLACE_OBJECTS is set to "1" instead of "" as it is > > safer on some platforms, thanks to Johannes Sixt and Michael J > > Gruber. > > > > Tested-by: Michael J Gruber > > Signed-off-by: Christian Couder > > Thanks, applied. Thanks, but it looks like the patch is not in v1.6.6. Could you ask Junio to pull from you? Best regards, Christian. ```