From: Johan Herland <johan@herland.net>
To: git@vger.kernel.org
Cc: johan@herland.net, jrnieder@gmail.com, bebarino@gmail.com,
avarab@gmail.com, gitster@pobox.com, srabbelier@gmail.com
Subject: [PATCHv6 01/23] notes.c: Hexify SHA1 in die() message from init_notes()
Date: Tue, 09 Nov 2010 22:49:37 +0100 [thread overview]
Message-ID: <1289339399-4733-2-git-send-email-johan@herland.net> (raw)
In-Reply-To: <1289339399-4733-1-git-send-email-johan@herland.net>
Signed-off-by: Johan Herland <johan@herland.net>
---
notes.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/notes.c b/notes.c
index 1978244..bb03eb0 100644
--- a/notes.c
+++ b/notes.c
@@ -940,7 +940,7 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
return;
if (get_tree_entry(object_sha1, "", sha1, &mode))
die("Failed to read notes tree referenced by %s (%s)",
- notes_ref, object_sha1);
+ notes_ref, sha1_to_hex(object_sha1));
hashclr(root_tree.key_sha1);
hashcpy(root_tree.val_sha1, sha1);
--
1.7.3.2.173.gab1c9.dirty
next prev parent reply other threads:[~2010-11-09 21:50 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-09 21:49 [PATCHv6 00/23] git notes merge Johan Herland
2010-11-09 21:49 ` Johan Herland [this message]
2010-11-09 21:49 ` [PATCHv6 02/23] (trivial) notes.h: Minor documentation fixes to copy_notes() Johan Herland
2010-11-09 21:49 ` [PATCHv6 03/23] notes.h: Make default_notes_ref() available in notes API Johan Herland
2010-11-09 21:49 ` [PATCHv6 04/23] notes.c: Reorder functions in preparation for next commit Johan Herland
2010-11-09 21:49 ` [PATCHv6 05/23] notes.h/c: Allow combine_notes functions to remove notes Johan Herland
2010-11-09 21:49 ` [PATCHv6 06/23] notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond Johan Herland
2010-11-14 20:46 ` Thiago Farina
2010-11-14 21:22 ` Jonathan Nieder
2010-11-14 23:50 ` Johan Herland
2010-11-14 23:52 ` [PATCHv6.1 " Johan Herland
2010-11-14 23:54 ` [PATCHv6.1 12/23] git notes merge: Handle real, non-conflicting notes merges Johan Herland
2010-11-14 23:55 ` [PATCHv6.1 13/23] git notes merge: Add automatic conflict resolvers (ours, theirs, union) Johan Herland
2010-11-14 23:57 ` [PATCHv6.1 19/23] git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" Johan Herland
2010-11-09 21:49 ` [PATCHv6 07/23] (trivial) t3303: Indent with tabs instead of spaces for consistency Johan Herland
2010-11-09 21:49 ` [PATCHv6 08/23] notes.c: Use two newlines (instead of one) when concatenating notes Johan Herland
2010-11-09 21:49 ` [PATCHv6 09/23] builtin/notes.c: Split notes ref DWIMmery into a separate function Johan Herland
2010-11-09 21:49 ` [PATCHv6 10/23] git notes merge: Initial implementation handling trivial merges only Johan Herland
2010-11-09 21:49 ` [PATCHv6 11/23] builtin/notes.c: Refactor creation of notes commits Johan Herland
2010-11-09 21:49 ` [PATCHv6 12/23] git notes merge: Handle real, non-conflicting notes merges Johan Herland
2010-11-09 21:49 ` [PATCHv6 13/23] git notes merge: Add automatic conflict resolvers (ours, theirs, union) Johan Herland
2010-11-09 21:49 ` [PATCHv6 14/23] Documentation: Preliminary docs on 'git notes merge' Johan Herland
2010-11-09 21:49 ` [PATCHv6 15/23] git notes merge: Manual conflict resolution, part 1/2 Johan Herland
2010-11-09 21:49 ` [PATCHv6 16/23] git notes merge: Manual conflict resolution, part 2/2 Johan Herland
2010-11-09 21:49 ` [PATCHv6 17/23] git notes merge: List conflicting notes in notes merge commit message Johan Herland
2010-11-09 21:49 ` [PATCHv6 18/23] git notes merge: --commit should fail if underlying notes ref has moved Johan Herland
2010-11-09 21:49 ` [PATCHv6 19/23] git notes merge: Add another auto-resolving strategy: "cat_sort_uniq" Johan Herland
2010-11-09 21:49 ` [PATCHv6 20/23] git notes merge: Add testcases for merging notes trees at different fanouts Johan Herland
2010-11-09 21:49 ` [PATCHv6 21/23] Provide 'git notes get-ref' to easily retrieve current notes ref Johan Herland
2010-11-09 21:49 ` [PATCHv6 22/23] cmd_merge(): Parse options before checking MERGE_HEAD Johan Herland
2010-11-09 21:49 ` [PATCHv6 23/23] Provide 'git merge --abort' as a synonym to 'git reset --merge' Johan Herland
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=1289339399-4733-2-git-send-email-johan@herland.net \
--to=johan@herland.net \
--cc=avarab@gmail.com \
--cc=bebarino@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=srabbelier@gmail.com \
/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).