Re: [PATCH v2 1/2] mergetool: don't require a work tree for --tool-help
> On 11 Oct 2014, at 09:29, David Aguilar wrote: > > Thanks for the heads-up. > > I tested mergetool and it seems fine but indeed there's an > `if test -e "$GIT_DIR/MERGE_RR"` in there that is surely not > working as intended. > > One solution would be to move the work done in the test -z "$NONGIT_OK" > block in git-sh-setup into a function e.g. git_dir_init () so > that we can defer the GIT_DIR initialization until after > require_work_tree has been called. I believe I had a very similar idea but the vast number of things that would potentially be affected by changing git-sh-setup.sh made me put things on hold in case I had any other ideas. I haven't so I think this is probably the best approach.-- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 1/2] mergetool: don't require a work tree for --tool-help
On Fri, Oct 10, 2014 at 10:01:57AM +0100, Charles Bailey wrote: > On 10 Oct 2014, at 09:51, David Aguilar wrote: > > Changes since v1: > > > > NONGIT_OK=Yes was added to make it actually work outside of a git repo. > > Does this actually work? The reason that I haven't got around > to resending my re-roll is that I found that I needed changes > to git-sh-setup.sh because doing NONGIT_OK and then > require_work_tree didn't correctly set GIT_DIR when it wasn't > already explicitly set in the environment. (I believe the rest > of mergetool relies on it.) > > Perhaps I misunderstood, though. Thanks for the heads-up. I tested mergetool and it seems fine but indeed there's an `if test -e "$GIT_DIR/MERGE_RR"` in there that is surely not working as intended. One solution would be to move the work done in the test -z "$NONGIT_OK" block in git-sh-setup into a function e.g. git_dir_init () so that we can defer the GIT_DIR initialization until after require_work_tree has been called. -- David -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 1/2] mergetool: don't require a work tree for --tool-help
On 10 Oct 2014, at 09:51, David Aguilar wrote: > Changes since v1: > > NONGIT_OK=Yes was added to make it actually work outside of a git repo. Does this actually work? The reason that I haven't got around to resending my re-roll is that I found that I needed changes to git-sh-setup.sh because doing NONGIT_OK and then require_work_tree didn't correctly set GIT_DIR when it wasn't already explicitly set in the environment. (I believe the rest of mergetool relies on it.) Perhaps I misunderstood, though.-- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 1/2] mergetool: don't require a work tree for --tool-help
From: Charles Bailey
Signed-off-by: Charles Bailey
Signed-off-by: David Aguilar
---
Changes since v1:
NONGIT_OK=Yes was added to make it actually work outside of a git repo.
git-mergetool.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 96a61ba..a502430 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -10,11 +10,11 @@
USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge]
...'
SUBDIRECTORY_OK=Yes
+NONGIT_OK=Yes
OPTIONS_SPEC=
TOOL_MODE=merge
. git-sh-setup
. git-mergetool--lib
-require_work_tree
# Returns true if the mode reflects a symlink
is_symlink () {
@@ -378,6 +378,8 @@ prompt_after_failed_merge () {
done
}
+require_work_tree
+
if test -z "$merge_tool"
then
# Check if a merge tool has been configured
--
2.1.2.377.g0e18f12
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
