From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Elijah Newren" <newren@gmail.com>,
"Phillip Wood" <phillip.wood123@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Taylor Blau" <me@ttaylorr.com>,
"Martin Ågren" <martin.agren@gmail.com>
Subject: [PATCH v3 0/2] Object ID support for git merge-file
Date: Wed, 1 Nov 2023 19:24:17 +0000 [thread overview]
Message-ID: <20231101192419.794162-1-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20231024195655.2413191-1-sandals@crustytoothpaste.net>
This series introduces an --object-id option to git merge-file such
that, instead of reading and writing from files on the system, it reads
from and writes to the object store using blobs.
Changes from v2:
* Include a patch from Martin to pre-improve the documentation
* Remove incorrect portion of commit message
Changes from v1:
* Improve error handling
* Re-add `-p` argument for documentation
Martin Ågren (1):
git-merge-file doc: drop "-file" from argument placeholders
brian m. carlson (1):
merge-file: add an option to process object IDs
Documentation/git-merge-file.txt | 38 ++++++++++++++------
builtin/merge-file.c | 62 +++++++++++++++++++++++---------
t/t6403-merge-file.sh | 58 ++++++++++++++++++++++++++++++
3 files changed, 132 insertions(+), 26 deletions(-)
Range-diff against v2:
-: ---------- > 1: 21a96acf42 git-merge-file doc: drop "-file" from argument placeholders
1: 9cd4220a3b ! 2: b1978a7b5c merge-file: add an option to process object IDs
@@ Commit message
Teach it an `--object-id` option which means that its arguments are
object IDs and not files to allow it to do so.
- Since we obviously won't be writing the data to the first argument,
- imply the -p option so we write to standard output.
-
We handle the empty blob specially since read_mmblob doesn't read it
directly and otherwise users cannot specify an empty ancestor.
@@ Commit message
## Documentation/git-merge-file.txt ##
@@ Documentation/git-merge-file.txt: SYNOPSIS
+ [verse]
'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]]
[--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>]
- [--[no-]diff3] <current-file> <base-file> <other-file>
-+'git merge-file' --object-id [-L <current-name> [-L <base-name> [-L <other-name>]]]
-+ [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>]
-+ [--[no-]diff3] <current-oid> <base-oid> <other-oid>
+- [--[no-]diff3] <current> <base> <other>
++ [--[no-]diff3] [--object-id] <current> <base> <other>
DESCRIPTION
-@@ Documentation/git-merge-file.txt: however, these conflicts are resolved favouring lines from `<current-file>`,
- lines from `<other-file>`, or lines from both respectively. The length of the
+@@ Documentation/git-merge-file.txt: however, these conflicts are resolved favouring lines from `<current>`,
+ lines from `<other>`, or lines from both respectively. The length of the
conflict markers can be given with the `--marker-size` option.
+If `--object-id` is specified, exactly the same behavior occurs, except that
next prev parent reply other threads:[~2023-11-01 19:24 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-24 19:56 [PATCH 0/1] Object ID support for git merge-file brian m. carlson
2023-10-24 19:56 ` [PATCH 1/1] merge-file: add an option to process object IDs brian m. carlson
2023-10-24 20:12 ` Eric Sunshine
2023-10-24 21:23 ` brian m. carlson
2023-10-29 6:17 ` Elijah Newren
2023-10-29 10:12 ` Phillip Wood
2023-10-30 16:14 ` brian m. carlson
2023-10-29 14:18 ` brian m. carlson
2023-10-30 16:39 ` Elijah Newren
2023-10-29 6:24 ` [PATCH 0/1] Object ID support for git merge-file Elijah Newren
2023-10-29 10:15 ` Phillip Wood
2023-10-30 15:54 ` Taylor Blau
2023-10-30 16:24 ` brian m. carlson
2023-10-30 17:14 ` Elijah Newren
2023-10-30 16:26 ` [PATCH v2 " brian m. carlson
2023-10-30 16:26 ` [PATCH v2 1/1] merge-file: add an option to process object IDs brian m. carlson
2023-10-31 21:48 ` Martin Ågren
2023-10-31 22:31 ` brian m. carlson
2023-11-01 3:44 ` Junio C Hamano
2023-11-01 19:16 ` brian m. carlson
2023-10-30 17:15 ` [PATCH v2 0/1] Object ID support for git merge-file Elijah Newren
2023-10-31 0:03 ` Junio C Hamano
2023-10-31 11:05 ` Phillip Wood
2023-10-31 23:06 ` Junio C Hamano
2023-11-01 19:24 ` brian m. carlson [this message]
2023-11-01 19:24 ` [PATCH v3 1/2] git-merge-file doc: drop "-file" from argument placeholders brian m. carlson
2023-11-01 23:53 ` Junio C Hamano
2023-11-02 8:53 ` Martin Ågren
2023-11-02 9:18 ` brian m. carlson
2023-11-02 9:29 ` Martin Ågren
2023-11-02 16:28 ` Junio C Hamano
2023-11-01 19:24 ` [PATCH v3 2/2] merge-file: add an option to process object IDs brian m. carlson
2023-11-02 8:51 ` Martin Ågren
2023-11-01 23:55 ` [PATCH v3 0/2] Object ID support for git merge-file 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231101192419.794162-1-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=me@ttaylorr.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).