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

Re: Diff impromements: keep block whole

From
Kevin Daudt <me@ikke.info>
Date
Sep 12, 2016, 10:38 UTC
Message-ID
<20160912103850.GA31326@ikke.info>
In-Reply-To
<1190311473672986@web29o.yandex.ru>
On Mon, Sep 12, 2016 at 12:36:26PM +0300, KES wrote:
Show 38 quoted lines
> Does it be more meaning full which change was done when diff will be displayed as:
> @@ -1278,6 +1311,16 @@ sub process {
>  		if( ref $result eq 'HASH' ) {
>  			$code =  $result->{ code };
>  			@args =  DB::eval( $result->{ expr } );
>  
>  			redo PROCESS;
> 		}
> +		elsif( ref $result eq 'ARRAY' ) {
> +			$code =  shift @$result;
> +			@args =  ();
> +			for my $expr ( @$result ) {
> +				push @args, [ DB::eval( $expr ) ];
> +			}
> +
> + 			redo PROCESS;
> + 		}
>  
> 
> instead of:
> 
> @@ -1278,6 +1311,16 @@ sub process {
>  		if( ref $result eq 'HASH' ) {
>  			$code =  $result->{ code };
>  			@args =  DB::eval( $result->{ expr } );
> +
> +			redo PROCESS;
> +		}
> +		elsif( ref $result eq 'ARRAY' ) {
> +			$code =  shift @$result;
> +			@args =  ();
> +			for my $expr ( @$result ) {
> +				push @args, [ DB::eval( $expr ) ];
> +			}
> +
>  			redo PROCESS;
>  		}
>  

Yes, it would definately be more meaningfull, but for an algorithm it's not that clear cut. Michael Hagerty is currently working on a patch series[1] to give git some heuristics to get better diffs, but is hard to get right.

You can already enable this by adding --compaction-heuristic to the diff command, but this can also give odd results in other cases, so it's not enabled by default.

Kevin.
[1]:https://public-inbox.org/git/cover.1473068229.git.mhagger@alum.mit.edu/
Previous: KES
Message 2 of 2 in “Diff impromements: keep block whole”
  1. KESSep 12, 2016
  2. Kevin DaudtSep 12, 2016

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.