diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-25 13:13:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-25 13:13:43 -0700 |
| commit | d0b16c8f878bef5c1268e033a3d1f427498c7008 (patch) | |
| tree | 23b896e51418ea182bf6335020b5b53138398df9 /builtin | |
| parent | 770c54170a43ffb3810088a85f25c59c0cbf7b38 (diff) | |
| parent | e498257d650529812ffe1872b3cd62e2bd604287 (diff) | |
| download | git-d0b16c8f878bef5c1268e033a3d1f427498c7008.tar.gz | |
Merge branch 'maint'
* maint:
Documentation/SubmittingPatches: clarify GMail section and SMTP
show-branch: use DEFAULT_ABBREV instead of 7
t7502-commit: fix spelling
test get_git_work_tree() return value for NULL
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/show-branch.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/show-branch.c b/builtin/show-branch.c index e20fcf3e93..e8719aa9e9 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -313,7 +313,8 @@ static void show_one_commit(struct commit *commit, int no_name) } else printf("[%s] ", - find_unique_abbrev(commit->object.sha1, 7)); + find_unique_abbrev(commit->object.sha1, + DEFAULT_ABBREV)); } puts(pretty_str); strbuf_release(&pretty); |