From: "Henrik Grubbström (Grubba)" <grubba@grubba.org>
To: git@vger.kernel.org
Cc: gitster@pobox.com, "Henrik Grubbström " <grubba@grubba.org>
Subject: [PATCH v4 0/5] Patches to avoid reporting conversion changes.
Date: Tue, 1 Jun 2010 16:41:50 +0200 [thread overview]
Message-ID: <cover.1275309129.git.grubba@grubba.org> (raw)
This is the fourth go at having the git index keep track of
the conversion mode for blobs.
This is useful for repositorys not containing fully normalized files
(eg containing CRLF's or expanded $Id$ strings), where a later attribute
change implies a conversion mode change. Without this set of patches
the user would need to recommit semantically unchanged files to get
a clean index.
Changes since last time:
o The patch set has been rebased upon 0ed6711 (aka eb/core-eol),
to be able to take advantage of convert.c:get_output_conversion()
and convert.c:determine_action().
o As a consequence of using those functions, the on-disk format for
the CONV extension has changed slightly. The change should have
minimal impact, since the index will in most cases self-repair.
o The t0025-crlf-auto.sh tests have been updated to still test
the same behaviour.
Junio: This should be close to what you envisioned in
<7vsk6qio1f.fsf@alter.siamese.dyndns.org>.
Henrik Grubbström (Grubba) (5):
sha1_file: Add index_blob().
strbuf: Add strbuf_add_uint32().
cache: Keep track of conversion mode changes.
cache: Add index extension "CONV".
t/t0021: Test that conversion changes are detected.
cache.h | 12 ++++++
convert.c | 46 ++++++++++++++++++++++
read-cache.c | 102 ++++++++++++++++++++++++++++++++++++++++++++----
sha1_file.c | 19 +++++++++
strbuf.h | 4 ++
t/t0021-conversion.sh | 54 ++++++++++++++++++++++++++
t/t0025-crlf-auto.sh | 20 ++++++----
7 files changed, 240 insertions(+), 17 deletions(-)
next reply other threads:[~2010-06-01 14:42 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-01 14:41 Henrik Grubbström (Grubba) [this message]
2010-06-01 14:41 ` [PATCH v4 1/5] sha1_file: Add index_blob() Henrik Grubbström (Grubba)
2010-06-01 14:41 ` [PATCH v4 2/5] strbuf: Add strbuf_add_uint32() Henrik Grubbström (Grubba)
2010-06-01 14:41 ` [PATCH v4 3/5] cache: Keep track of conversion mode changes Henrik Grubbström (Grubba)
2010-06-01 14:41 ` [PATCH v4 4/5] cache: Add index extension "CONV" Henrik Grubbström (Grubba)
2010-06-01 14:41 ` [PATCH v4 5/5] t/t0021: Test that conversion changes are detected Henrik Grubbström (Grubba)
2010-06-02 4:40 ` [PATCH v4 0/5] Patches to avoid reporting conversion changes Junio C Hamano
2010-06-03 16:00 ` Henrik Grubbström
2010-06-04 0:56 ` Jonathan Nieder
2010-06-04 11:59 ` Henrik Grubbström
2010-06-04 19:42 ` Jonathan Nieder
2010-06-06 10:50 ` Henrik Grubbström
2010-06-07 8:59 ` Finn Arne Gangstad
2010-06-07 16:37 ` Henrik Grubbström
2010-06-07 19:50 ` Finn Arne Gangstad
2010-06-08 15:52 ` Henrik Grubbström
2010-06-09 14:03 ` Finn Arne Gangstad
2010-06-09 18:04 ` Henrik Grubbström
2010-06-10 19:55 ` Finn Arne Gangstad
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=cover.1275309129.git.grubba@grubba.org \
--to=grubba@grubba.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).