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

Re: [PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude

From
Sam Vilain <sam@vilain.net>
Date
Aug 18, 2012, 19:51 UTC
Message-ID
<502FF250.6010402@vilain.net>
In-Reply-To
<1344705265-10939-2-git-send-email-stevenrwalter@gmail.com>
On 08/11/2012 10:14 AM, Steven Walter wrote:
Show 22 quoted lines
> This fixes a bug where git finds the incorrect merge parent.  Consider a
> repository with trunk, branch1 of trunk, and branch2 of branch1.
> Without this change, git interprets a merge of branch2 into trunk as a
> merge of branch1 into trunk.
>
> Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
> ---
>   git-svn.perl                                     |    1 -
>   t/t9164-git-svn-fetch-merge-branch-of-branch2.sh |   53 ++++++++++++++++++++++
>   2 files changed, 53 insertions(+), 1 deletion(-)
>   create mode 100755 t/t9164-git-svn-fetch-merge-branch-of-branch2.sh
>
> diff --git a/git-svn.perl b/git-svn.perl
> index abcec11..c4678c1 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -3623,7 +3623,6 @@ sub parents_exclude {
>   				if ( $commit eq $excluded ) {
>   					push @excluded, $commit;
>   					$found++;
> -					last;
>   				}

I could believe that, too. I like this change: one line of code, 53 lines of test and a paragraph of explanation :-).

Cheers, Sam.

Previous: Steven WalterNext: Steven Walter
Message 3 of 13 in “git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip”
  1. 1/2 git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tipSteven Walter, Aug 11, 2012
  2. 2/2 git-svn.perl: keep processing all commits in parents_excludeSteven Walter, Aug 11, 2012
  3. Sam VilainAug 18, 2012
  4. Steven WalterAug 18, 2012
  5. Sam VilainAug 18, 2012
  6. Junio C HamanoAug 18, 2012
  7. Eric WongAug 19, 2012
  8. 1/2 git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tipSteven Walter, Aug 20, 2012
  9. 2/2 git-svn.perl: keep processing all commits in parents_excludeSteven Walter, Aug 20, 2012
  10. Eric WongAug 21, 2012
  11. Junio C HamanoAug 21, 2012
  12. Eric WongAug 13, 2012
  13. Sam VilainAug 18, 2012

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.