git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mergetool: export variables for use by custom mergetools
@ 2008-05-17 20:39 David Aguilar
  2008-05-17 23:34 ` Charles Bailey
  0 siblings, 1 reply; 5+ messages in thread
From: David Aguilar @ 2008-05-17 20:39 UTC (permalink / raw)
  To: tytso; +Cc: git, evgeny.zislis, David Aguilar

The MERGED, BACKUP, LOCAL, REMOTE and BASE variables were not being
exported from the git-mergetool.sh script.  This prevented custom
mergetools from being able to use them.

We now export them so that arbitrary mergetools can easily interact
with git mergetool.

This problem was Reported-By: Evgeny <evgeny.zislis@gmail.com>

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 git-mergetool.sh |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/git-mergetool.sh b/git-mergetool.sh
index fcdec4a..c4f31ee 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -146,6 +146,12 @@ merge_file () {
     REMOTE="$MERGED.REMOTE.$ext"
     BASE="$MERGED.BASE.$ext"
 
+    export MERGED
+    export BACKUP
+    export LOCAL
+    export REMOTE
+    export BASE
+
     mv -- "$MERGED" "$BACKUP"
     cp -- "$BACKUP" "$MERGED"
 
-- 
1.5.5.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2008-05-18  0:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-17 20:39 [PATCH] mergetool: export variables for use by custom mergetools David Aguilar
2008-05-17 23:34 ` Charles Bailey
2008-05-17 23:55   ` Evgeny
2008-05-18  0:07     ` Charles Bailey
2008-05-18  0:12       ` Evgeny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).