'git log --abbrev-commit' added an ellipsis to all commit names that were abbreviated. This was particularly annoying if you wanted to cut&paste the sha1 from the terminal, since selecting by word would pick up '...' too. So use find_unique_abbrev() instead of diff_unique_abbrev() in all log-related commit sha1 printing routines, and also change the formatting of the 'Merge: parent1 parent2' line output via pretty_print_commit(). Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			35 lines
		
	
	
		
			778 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			35 lines
		
	
	
		
			778 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
$ git log master
 | 
						|
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
 | 
						|
Merge: 9a6d494 c7a2ab9
 | 
						|
Author: A U Thor <author@example.com>
 | 
						|
Date:   Mon Jun 26 00:04:00 2006 +0000
 | 
						|
 | 
						|
    Merge branch 'side'
 | 
						|
 | 
						|
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
 | 
						|
Author: A U Thor <author@example.com>
 | 
						|
Date:   Mon Jun 26 00:03:00 2006 +0000
 | 
						|
 | 
						|
    Side
 | 
						|
 | 
						|
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 | 
						|
Author: A U Thor <author@example.com>
 | 
						|
Date:   Mon Jun 26 00:02:00 2006 +0000
 | 
						|
 | 
						|
    Third
 | 
						|
 | 
						|
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
 | 
						|
Author: A U Thor <author@example.com>
 | 
						|
Date:   Mon Jun 26 00:01:00 2006 +0000
 | 
						|
 | 
						|
    Second
 | 
						|
    
 | 
						|
    This is the second commit.
 | 
						|
 | 
						|
commit 444ac553ac7612cc88969031b02b3767fb8a353a
 | 
						|
Author: A U Thor <author@example.com>
 | 
						|
Date:   Mon Jun 26 00:00:00 2006 +0000
 | 
						|
 | 
						|
    Initial
 | 
						|
$
 |