[PATCH v3] gitk: add --no-replace-objects option
From: Christian Couder <hidden>
Date: 2016-06-15 22:47:45
Subsystem:
the rest · Maintainer:
Linus Torvalds
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. 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. Tested-by: Michael J Gruber <redacted> Signed-off-by: Christian Couder <redacted> --- gitk-git/gitk | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index a0214b7..c586b93 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk@@ -128,7 +128,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
@@ -208,6 +208,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.5.1.gaf97d