git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tay Ray Chuan <rctay89@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>
Subject: [PATCH v2 0/3] commit: fix abbrev-sha regression
Date: Thu, 27 May 2010 23:34:49 +0800	[thread overview]
Message-ID: <1274974492-4692-1-git-send-email-rctay89@gmail.com> (raw)
In-Reply-To: <1274694452-4200-1-git-send-email-rctay89@gmail.com>

After c197702 (pretty: Respect --abbrev option), the summary output for
git-commit began to throw up non-abbreviated SHA-1s.

For example,

  $ git commit --allow-empty -m "empty"
  [master f869bf09c8eefee54094bb21387241aaf5f10324] empty

I also notice that this happens for merges after conflict resolutions.

This afflicts 'master', but not any release.

Changes from v1:

 - move cleanup commands into separate function in patch #1.
 - add a cleanup command to patch #1 to accomodate tests #20 and #22.
 - changed shell syntax in patch #2 (based on Junio's suggestion).
 - used a more "aggressive" fix in patch #3.

Contents:
[PATCH v2 1/3] t7502-commit: add tests for summary output
[PATCH v2 2/3] t7502-commit: add summary output tests for empty and merge commits
[PATCH v2 3/3] commit::print_summary(): set rev_info.always_show_header to 1

  parent reply	other threads:[~2010-05-27 15:35 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-24  9:47 [PATCH 0/3] commit: fix abbrev-sha regression Tay Ray Chuan
2010-05-24  9:47 ` [PATCH 1/3] t7502-commit: add tests for summary output Tay Ray Chuan
2010-05-24  9:47   ` [PATCH 2/3] t7502-commit: add summary output tests for empty and merge commits Tay Ray Chuan
2010-05-24  9:47     ` [PATCH 3/3] commit: show abbreviated sha for commits with empty diffs Tay Ray Chuan
2010-05-26  5:07       ` Junio C Hamano
2010-05-26  5:37         ` Tay Ray Chuan
2010-05-26  5:39           ` Tay Ray Chuan
2010-05-26  5:07     ` [PATCH 2/3] t7502-commit: add summary output tests for empty and merge commits Junio C Hamano
2010-05-26  5:19       ` Tay Ray Chuan
2010-05-27 15:34 ` Tay Ray Chuan [this message]
2010-05-27 15:34   ` [PATCH v2 1/3] t7502-commit: add tests for summary output Tay Ray Chuan
2010-05-27 15:34     ` [PATCH v2 2/3] t7502-commit: add summary output tests for empty and merge commits Tay Ray Chuan
2010-05-27 15:34       ` [PATCH v2 3/3] commit::print_summary(): set rev_info.always_show_header to 1 Tay Ray Chuan
2010-05-29  1:10         ` Junio C Hamano
2010-05-29  1:41           ` Tay Ray Chuan
2010-06-04  8:21         ` [PATCH v3 " Tay Ray Chuan
2010-06-04  8:34           ` Tay Ray Chuan
2010-06-05  6:44           ` Junio C Hamano
2010-06-07  5:04         ` [PATCH v4] " Tay Ray Chuan
2010-06-12 14:15         ` [PATCH v6 3/3] commit::print_summary(): don't use format_commit_message() Tay Ray Chuan
2010-05-27 16:58   ` [PATCH v2 0/3] commit: fix abbrev-sha regression Will Palmer
  -- strict thread matches above, loose matches on Subject: below --
2010-06-02 23:36 What's cooking in git.git (Jun 2010, #01; Wed, 2) Junio C Hamano
2010-06-03  3:13 ` Tay Ray Chuan
2010-06-03  8:40 ` Michael J Gruber
2010-06-03 18:25   ` mg/rev-parse-option-sifter-deprecation Jonathan Nieder
2010-06-03 13:36 ` [PATCH 1/2] separate quoting and relative path generation Clemens Buchacher
2010-06-03 13:39   ` [PATCH 2/2] ls-files: allow relative pathspec Clemens Buchacher
2010-06-03 22:16   ` [PATCH 1/2] separate quoting and relative path generation Junio C Hamano
2010-06-04  7:44     ` [PATCH] optimize path_relative() Clemens Buchacher
2010-06-04  7:50       ` Clemens Buchacher
2010-06-05  8:04         ` [PATCH] setup: document prefix Clemens Buchacher
2010-06-05  7:37       ` [PATCH v2] optimize path_relative() Clemens Buchacher
2010-06-05 18:07         ` Junio C Hamano
2010-06-03 14:36 ` What's cooking in git.git (Jun 2010, #01; Wed, 2) Thomas Rast
2010-06-03 19:53 ` Eyvind Bernhardsen
2010-06-04 21:18 ` Jonathan Nieder
2010-06-05 18:07   ` Junio C Hamano
2010-06-05 19:32     ` Jonathan Nieder
2010-06-05 23:57     ` Sverre Rabbelier
2010-06-06  4:00       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1274974492-4692-1-git-send-email-rctay89@gmail.com \
    --to=rctay89@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).