[PATCH RESEND] gitk: add "--no-replace-objects" option

[PATCH RESEND] gitk: add "--no-replace-objects" option

[Christian Couder]

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 <git@drmicha.warpmail.net>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 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 -<n>
 		if {[string is digit -strict [string range $arg 1 end]]} {
-- 
1.6.6.rc1.8.gd33ec

Re: [PATCH RESEND] gitk: add "--no-replace-objects" option

[Paul Mackerras]

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 <git@drmicha.warpmail.net>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>

Thanks, applied.

Paul.

Re: [PATCH RESEND] gitk: add "--no-replace-objects" option

[Christian Couder]

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 <git@drmicha.warpmail.net>
> > Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
>
> 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.