summaryrefslogtreecommitdiff
path: root/t/t4013/diff.show_master
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2009-02-13 23:10:41 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-13 17:18:22 -0800
commit7fcda9201e192413c2e63fe35ce6664dbc81705d (patch)
treee9103e8f6e6fa0fa060ebf2e1ee2032bf8ca1b8e /t/t4013/diff.show_master
parentInstall the default "master" branch configuration after cloning a void (diff)
downloadtgif-7fcda9201e192413c2e63fe35ce6664dbc81705d.tar.xz
log: do not print ellipses with --abbrev-commit
'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>
Diffstat (limited to 't/t4013/diff.show_master')
-rw-r--r--t/t4013/diff.show_master2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4013/diff.show_master b/t/t4013/diff.show_master
index 9e6e1f2710..fb08ce0e46 100644
--- a/t/t4013/diff.show_master
+++ b/t/t4013/diff.show_master
@@ -1,6 +1,6 @@
$ git show master
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
-Merge: 9a6d494... c7a2ab9...
+Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000