git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 10/10] mergetool: use run_mergetool from git-mergetool-lib

From
David Aguilar <davvid@gmail.com>
Date
Apr 3, 2009, 01:54 UTC
Message-ID
<20090403015402.GA52576@gmail.com>
In-Reply-To
<200904022213.15173.markus.heidelberg@web.de>
On  0, Markus Heidelberg <markus.heidelberg@web.de> wrote:
Show 15 quoted lines
> Charles Bailey, 02.04.2009:
> > 
> > I think that it would be better if $status stayed as local as
> > possible. If run_mergetool returned the value of $status as its exit
> > code then the function will properly return whether the merge
> > succeeded or not.
> > 
> > This way run_mergetool's clients can just use its exit code, without
> > having to know about a magic $status global variable.
> 
> And shouldn't also check_unchanged() move from git-mergetool.sh to
> git-mergetool--lib.sh, since it is only used there?
> Huh, it seems as if some editors for difftool cannot work correctly
> currently, because this function is used, but defined in
> git-mergetool.sh.

Sounds good. A patch is on the way:

- moves check_unchanged into mergetool--lib
- returns $status in run_mergetool
- updates mergetool to not rely on the global $status
-- 
		David
Previous: Markus HeidelbergNext: Markus Heidelberg
Message 16 of 26 in “git-{diff,merge} refactor round 2”
  1. David AguilarApr 1, 2009
  2. 01/10 difftool: add support for a difftool.prompt config variableDavid Aguilar, Apr 1, 2009
  3. 02/10 mergetool: use $( ... ) instead of `backticks`David Aguilar, Apr 1, 2009
  4. 03/10 Add a mergetool-lib scriptlet for holding common merge tool functionsDavid Aguilar, Apr 1, 2009
  5. 04/10 mergetool: use get_mergetool_path from git-mergetool-libDavid Aguilar, Apr 1, 2009
  6. 05/10 difftool: use get_mergetool_path from git-mergetool-libDavid Aguilar, Apr 1, 2009
  7. 06/10 mergetool: use valid_tool from git-mergetool-libDavid Aguilar, Apr 1, 2009
  8. 07/10 difftool: use valid_tool from git-mergetool-libDavid Aguilar, Apr 1, 2009
  9. 08/10 mergetool-lib: introduce run_mergetoolDavid Aguilar, Apr 1, 2009
  10. 09/10 difftool: use run_mergetool from git-mergetool-libDavid Aguilar, Apr 1, 2009
  11. 10/10 mergetool: use run_mergetool from git-mergetool-libDavid Aguilar, Apr 1, 2009
  12. Markus HeidelbergApr 1, 2009
  13. Charles BaileyApr 2, 2009
  14. Markus HeidelbergApr 2, 2009
  15. Markus HeidelbergApr 2, 2009
  16. David AguilarApr 3, 2009
  17. Markus HeidelbergApr 1, 2009
  18. Markus HeidelbergApr 1, 2009
  19. David AguilarApr 2, 2009
  20. Charles BaileyApr 2, 2009
  21. Markus HeidelbergApr 5, 2009
  22. David AguilarApr 5, 2009
  23. Junio C HamanoApr 5, 2009
  24. David AguilarApr 5, 2009
  25. Markus HeidelbergApr 5, 2009
  26. Junio C HamanoApr 6, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.