git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
	Joey Hess <joey@kitenet.net>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Karsten Blees <karsten.blees@gmail.com>
Subject: [PATCH v4 00/10] teach replace objects to sha1_object_info_extended()
Date: Sat, 28 Dec 2013 12:00:05 +0100	[thread overview]
Message-ID: <20131228105505.2272.58873.chriscool@tuxfamily.org> (raw)

Here is version 4 of a patch series to improve the way
sha1_object_info_extended() behaves when it is passed a
replaced object. The idea is to add a flags argument to it
in the same way as what has been done to read_sha1_file().

This patch series was inspired by a sub thread in this
discussion:

http://thread.gmane.org/gmane.comp.version-control.git/238118

The only changes compared to version 3 are the following:

	- the name of the 'full' format is now 'long'

	- the names of the replace_format enum fields
	have been prepended with 'REPLACE_FORMAT_'. This
	avoids a compilation conflict on Windows where
	SHORT is predefined. Thanks to Karsten for
	reporting this problem.

These changes only affect patches 7/10, 8/10, 9/10 and 10/10
that add a new --format option to list replace refs.

Christian Couder (10):
  Rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT
  replace_object: don't check read_replace_refs twice
  Introduce lookup_replace_object_extended() to pass flags
  Add an "unsigned flags" parameter to sha1_object_info_extended()
  t6050: show that git cat-file --batch fails with replace objects
  sha1_file: perform object replacement in sha1_object_info_extended()
  builtin/replace: teach listing using short, medium or long formats
  t6050: add tests for listing with --format
  builtin/replace: unset read_replace_refs
  Documentation/git-replace: describe --format option

 Documentation/git-replace.txt | 19 +++++++++++-
 builtin/cat-file.c            |  2 +-
 builtin/replace.c             | 67 ++++++++++++++++++++++++++++++++++++++-----
 cache.h                       | 12 ++++++--
 replace_object.c              |  3 --
 sha1_file.c                   | 20 ++++++-------
 streaming.c                   |  2 +-
 t/t6050-replace.sh            | 42 +++++++++++++++++++++++++++
 8 files changed, 141 insertions(+), 26 deletions(-)

-- 
1.8.4.1.616.g07f5c81

             reply	other threads:[~2013-12-28 11:01 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-28 11:00 Christian Couder [this message]
2013-12-28 11:00 ` [PATCH v4 01/10] Rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT Christian Couder
2013-12-28 11:00 ` [PATCH v4 02/10] replace_object: don't check read_replace_refs twice Christian Couder
2013-12-28 11:00 ` [PATCH v4 03/10] Introduce lookup_replace_object_extended() to pass flags Christian Couder
2013-12-28 11:00 ` [PATCH v4 04/10] Add an "unsigned flags" parameter to sha1_object_info_extended() Christian Couder
2013-12-28 11:00 ` [PATCH v4 05/10] t6050: show that git cat-file --batch fails with replace objects Christian Couder
2013-12-28 11:00 ` [PATCH v4 06/10] sha1_file: perform object replacement in sha1_object_info_extended() Christian Couder
2013-12-28 11:00 ` [PATCH v4 07/10] builtin/replace: teach listing using short, medium or long formats Christian Couder
2013-12-28 11:00 ` [PATCH v4 08/10] t6050: add tests for listing with --format Christian Couder
2013-12-28 11:00 ` [PATCH v4 09/10] builtin/replace: unset read_replace_refs Christian Couder
2013-12-28 11:00 ` [PATCH v4 10/10] Documentation/git-replace: describe --format option Christian Couder
2013-12-30 20:32 ` [PATCH v4 00/10] teach replace objects to sha1_object_info_extended() Junio C Hamano
2013-12-31  6:23   ` Christian Couder

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=20131228105505.2272.58873.chriscool@tuxfamily.org \
    --to=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=joey@kitenet.net \
    --cc=karsten.blees@gmail.com \
    --cc=peff@peff.net \
    --cc=sunshine@sunshineco.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).