Re: Mergetool generating blank files (1.5.3)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 27, 2007, 20:51 UTC
- Message-ID
- <7vwsubsuh1.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <7v8x6ru97z.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 15 quoted lines
> "Kelvie Wong" <kelvie@ieee.org> writes: > >> Egads, it's alive! >> >> I was in a subdirectory (most of my work is in that one subdirectory >> anyways :p), but running it on the top level did indeed work as >> expected. >> >> Thanks, > > Thanks for spotting a bug. It claims to be subdirectory safe at > the top of the script but apparently it isn't. > > And I do not see a reason why it cannot be made subdirectory > safe.
It _could_ be just the matter of doing this, although I cannot test it right now (at work and have no access to any of the backends). Care to try it from a subdirectory and report failure or success?
---
git-mergetool.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh index a0e44f7..018db58 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -12,6 +12,7 @@ USAGE='[--tool=tool] [file to merge] ...' SUBDIRECTORY_OK=Yes . git-sh-setup require_work_tree +cd_to_toplevel # Returns true if the mode reflects a symlink is_symlink () {