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

Re: [PATCH 3/4] Add a new test for using a custom merge strategy

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 29, 2008, 23:43 UTC
Message-ID
<7vabg09rye.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<ee13073cd83ff4a3cffb926b21cc54583e67f869.1217372486.git.vmiklos@frugalware.org>
Miklos Vajna <vmiklos@frugalware.org> writes:
> +cat > git-merge-theirs << EOF
> +#!/bin/sh
> +eval git read-tree --reset -u \\\$\$#
> +EOF

This should be $SHELL_PATH, instead of hardcoded /bin/sh, to be easy on people on Solaris and other systems.

Other than that, the patch is good and there is no need to resend it. Thanks.

By the way, this eval shows why "theirs" cannot be a symmetric operation of "ours". You are taking the last remote HEAD even when you are merging more than one remote into the current branch at once. "ours" can be sensibly defined for an octopus, but "theirs" has this "which theirs" problem ;-)

Previous: Miklos VajnaNext: Miklos Vajna
Message 8 of 10 in “Allow custom merge strategies, take 4”
  1. 0/4 Allow custom merge strategies, take 4Miklos Vajna, Jul 29, 2008
  2. 1/4 builtin-help: make some internal functions available to other builtinsMiklos Vajna, Jul 29, 2008
  3. 2/4 builtin-merge: allow using a custom strategyMiklos Vajna, Jul 29, 2008
  4. 3/4 Add a new test for using a custom merge strategyMiklos Vajna, Jul 29, 2008
  5. 4/4 Add a second testcase for handling invalid strategies in git-mergeMiklos Vajna, Jul 29, 2008
  6. Junio C HamanoJul 29, 2008
  7. Miklos VajnaJul 30, 2008
  8. Junio C HamanoJul 29, 2008
  9. Miklos VajnaJul 30, 2008
  10. Junio C HamanoJul 30, 2008

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.