[PATCH 02/13] log: drop unused rev_info from early output

The early output code passes around a rev_info struct but doesn't need it. The setup step only turns on global signal handlers, and the "estimate" step is done completely from the rev->commits list that is passed in separately. Signed-off-by: Jeff King --- builtin/log.c | 10 +- 1 file c

[PATCH 0/13] more unused parameter cleanups

Here's another round of -Wunused-parameter cleanups. Previous rounds were at [1] and [2]. As before, these are mostly just removals, so it's easy to see there's no behavior change (there are a couple of cleanups that ride along, though, so watch for those). There are two minor conflicts when mergi

[PATCH 01/13] revision: drop some unused "revs" parameters

There are several internal helpers that take a rev_info struct but don't actually look at it. While one could argue that all helpers in revision.c should take a rev_info struct for consistency, dropping the unused parameter makes it clear that they don't actually depend on any other rev options. S

[PATCH 04/13] update-index: drop unused prefix_length parameter from do_reupdate()

The prefix is always a NUL-terminated string, and we just end up passing it along to parse_pathspec() anyway (which does not even take a length). Signed-off-by: Jeff King --- builtin/update-index.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/builtin/update-index.c b/

[PATCH 03/13] log: drop unused "len" from show_tagger()

We pass the length of the found "tagger" line to show_tagger(), but it does not use it; instead, it passes the string to pp_user_info(), which reads until newline or NUL. This is OK for our purposes because we always read the object contents into a buffer with an extra NUL (and indeed, our sole cal

[PATCH 05/13] test-date: drop unused "now" parameter from parse_dates()

We only need the current time for relative dates like "5 minutes ago", and those are parsed only through approxidate, not the strict parser used by parse_dates(). Signed-off-by: Jeff King --- t/helper/test-date.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/helper/te

[PATCH 06/13] unpack-trees: drop name_entry from traverse_by_cache_tree()

We pull the names from the existing index rather than the tree entry, which is after all the point of this function. Let's drop the unused "names" parameter. Note that we leave the "nr_names" parameter, as it tells us how many trees we are traversing (and thus how many index stages to set up). Si

[PATCH 07/13] unpack-trees: drop unused error_type parameters

The verify_clean_subdirectory() helper takes an error_type parameter from the caller, but doesn't actually use it. Instead, when it calls add_rejected_path() it passes NOT_UPTODATE_DIR, its own custom error type which is more specific than what the caller provides. Likewise for verify_clean_submodu

[PATCH 08/13] report_path_error(): drop unused prefix parameter

This hasn't been used since 17ddc66e70 (convert report_path_error to take struct pathspec, 2013-07-14), as the names in the struct will have already been prefixed when they were parsed. Signed-off-by: Jeff King --- builtin/checkout.c | 2 +- builtin/commit.c| 6 +++--- built

[PATCH 10/13] parse-options: drop unused ctx parameter from show_gitcomp()

The completion display doesn't actually care about where we are in the parsing. It's generated completely from the set of available options. So we don't need to see the parse-options context struct at all. Signed-off-by: Jeff King --- parse-options.c | 5 ++--- 1 file changed, 2 insertions(+), 3

[PATCH 11/13] pretty: drop unused "type" parameter in needs_rfc2047_encoding()

The "should we encode" check was split off from add_rfc2047() into its own function in 41dd00bad3 (format-patch: fix rfc2047 address encoding with respect to rfc822 specials, 2012-10-18). But only the "add" half needs to know the rfc2047_type, since it only affects _how_ we encode, not whether we d

[PATCH 09/13] fetch_pack(): drop unused parameters

We don't need the caller of fetch_pack() to pass in "dest", which is the remote URL. Since ba227857d2 (Reduce the number of connects when fetching, 2008-02-04), the caller is responsible for calling git_connect() itself, and our "dest" parameter is unused. That commit also started passing us the r

[PATCH 12/13] pretty: drop unused strbuf from parse_padding_placeholder()

Unlike other parts of the --pretty user-format expansion, this function is not actually writing to the output, but instead just storing the padding values into a context struct. We don't need to be passed a strbuf at all. Signed-off-by: Jeff King --- pretty.c | 5 ++--- 1 file changed, 2 inserti

[PATCH 13/13] parse_opt_ref_sorting: always use with NONEG flag

The "--sort" parameter of for-each-ref, etc, does not handle negation, and instead returns an error to the parse-options code. But neither piece of code prints anything for the user, which may leave them confused: $ git for-each-ref --no-sort $ echo $? 129 As the comment in the callback fun

Re: [PATCH 0/13] more unused parameter cleanups

Jeff King writes: > Here's another round of -Wunused-parameter cleanups. Previous rounds > were at [1] and [2]. As before, these are mostly just removals, so it's > easy to see there's no behavior change (there are a couple of cleanups > that ride along, though, so watch for those). > > There are

Re: [REGRESSION ps/stash-in-c] git stash show -v

On Wed, Mar 20, 2019 at 12:06 PM Jeff King wrote: > > On Tue, Mar 19, 2019 at 11:18:26PM +, Thomas Gummerer wrote: > > > From a quick search I couldn't find where 'git diff' actually parses > > the '-v' argument, but I wonder if we should actually disallow it, in > > case we want to use it for

Re: [RFC PATCH] cherry-pick: set default `--mainline` parent to 1

On Wed, Mar 20, 2019 at 10:57 AM C.J. Jameson wrote: > --m parent-number:: > ---mainline parent-number:: > +-m [parent-number]:: Careful with this. Optional argument with a short option means the "stuck" form which is known to cause confusion [1]. Try "git revert -mX HEAD" and "git revert -m X H

Re: [PATCH v2] unpack-trees: fix oneway_merge accidentally carry over stage index

On Wed, Mar 20, 2019 at 7:41 AM Junio C Hamano wrote: > > Phillip Wood writes: > > > Thanks for doing this, one minor comment - I try to use > > phillip.w...@dunelm.org.uk for git as it wont change if I change my > > email provider. > > You mean something like this? I think he meant fixing the R

Dear,

Dear, Please accept my apologies I do not intend to invade your privacy, I wrote to you earlier, but no answer, in my first post I told you about my late client who bears the same surname with you, I received several letters from the bank, where he made a deposit of 10.4 million dollars before h

How to properly find git config in a libgit.a-using executable?

Hi, In git-cinnabar (the remote-helper that can talk to mercurial servers), I'm using a fast-import-derived helper to do a lot of the heavy lifting, because $REASONS. Anyways, while built (mostly) with the git build system, using libgit.a, etc. the helper doesn't live in the GIT_EXEC_PATH. That le

[PATCH] commit: improve error message in "-a " case

I did something stupid today and got $ git commit -a --fixup= @^ fatal: Paths with -a does not make sense. which didn't make any sense (at least for the first few seconds). Include the first path(spec) in the error message to help spot the problem quicker. Now it shows fatal: paths

Re: [PATCH v4 22/26] switch: reject if some operation is in progress

Hi Duy The new switch command is shaping up nicely On 17/03/2019 12:49, Nguyễn Thái Ngọc Duy wrote: > Unless you know what you're doing, switching to another branch to do > something then switching back could be confusing. Worse, you may even > forget that you're in the middle of something. By th

Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)

On Wed, Mar 20, 2019 at 3:13 AM Junio C Hamano wrote: > * tg/stash-in-c-show-default-to-p-fix (2019-03-20) 1 commit > - stash: setup default diff output format if necessary > (this branch uses ps/stash-in-c; is tangled with js/stash-in-c-pathspec-fix > and tb/stash-in-c-unused-param-fix.) > >

[ANNOUNCE] Git Rev News edition 49

Hi everyone, The 49th edition of Git Rev News is now published: https://git.github.io/rev_news/2019/03/20/edition-49/ Thanks a lot to the contributor: Luca Milanesio! Enjoy, Christian, Jakub, Markus and Gabriel.

[PATCH 00/20] nd/diff-parseopt the last part

Gotta keep pumping until everything is out! This is the last part to finish converting diff.c to use parse_options(). The two commands 'range-diff' and 'diff --no-index' are also updated to do parse_options() directly, which is the end game (i.e. the end of diff_opt_parse(), but that can't happen

[PATCH 02/20] diff-parseopt: convert --ita-[in]visible-in-index

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index 8fdcdcc8ff..3eace63172 100644 --- a/diff.c +++ b/diff.c @@ -5352,6 +5352,12 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 01/20] diff-parseopt: convert --ws-error-highlight

mark one more string for translation while at there. Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/diff.c b/diff.c index ce118bb326..8fdcdcc8ff 100644 --- a/diff.c +++ b/diff.c @@ -4801,17 +4801,18 @@ s

[PATCH 07/20] diff-parseopt: convert -O

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 23 +++ 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/diff.c b/diff.c index 639b166c79..21c7a6b1a1 100644 --- a/diff.c +++ b/diff.c @@ -4617,22 +4617,6 @@ static int opt_arg(const char *arg, int arg_short, const

[PATCH 06/20] diff-parseopt: convert --pickaxe-all|--pickaxe-regex

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index e198129353..639b166c79 100644 --- a/diff.c +++ b/diff.c @@ -5391,6 +5391,12 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 10/20] diff-parseopt: convert --[no-]abbrev

OPT__ABBREV() has the same behavior as the deleted code with one difference: it does check for valid number and error out if not. And the '40' change is self explanatory. Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 12 +--- parse-options-cb.c | 4 ++-- 2 files changed,

[PATCH 09/20] diff-parseopt: convert --diff-filter

while at it, mark one more string for translation Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/diff.c b/diff.c index 694f32148c..6e84af1cce 100644 --- a/diff.c +++ b/diff.c @@ -4736,10 +4736,13 @@ static uns

[PATCH 08/20] diff-parseopt: convert --find-object

while at it, mark one more string for translation. Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/diff.c b/diff.c index 21c7a6b1a1..694f32148c 100644 --- a/diff.c +++ b/diff.c @@ -4799,12 +4799,15 @@ static int di

[PATCH 05/20] diff-parseopt: convert -S|-G

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 37 - 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/diff.c b/diff.c index a2abc7e5b0..e198129353 100644 --- a/diff.c +++ b/diff.c @@ -5056,6 +5056,28 @@ static int diff_opt_patience(const struct

[PATCH 04/20] diff-parseopt: convert -l

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index f290dfe6be..a2abc7e5b0 100644 --- a/diff.c +++ b/diff.c @@ -5283,6 +5283,8 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 03/20] diff-parseopt: convert -z

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/diff.c b/diff.c index 3eace63172..f290dfe6be 100644 --- a/diff.c +++ b/diff.c @@ -5238,6 +5238,9 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 13/20] diff-parseopt: convert --no-prefix

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/diff.c b/diff.c index 4ab5b3c06a..045fdbb882 100644 --- a/diff.c +++ b/diff.c @@ -5022,6 +5022,18 @@ static int diff_opt_line_prefix(const struct option *opt,

[PATCH 15/20] diff-parseopt: convert --[no-]color-moved

mark one more string for translation while at there Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 38 +- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/diff.c b/diff.c index e2f515a7da..df4303de4e 100644 --- a/diff.c +++ b/diff.c @@ -4841,6

[PATCH 14/20] diff-parseopt: convert --inter-hunk-context

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 50 +++-- parse-options.h | 3 ++- 2 files changed, 5 insertions(+), 48 deletions(-) diff --git a/diff.c b/diff.c index 045fdbb882..e2f515a7da 100644 --- a/diff.c +++ b/diff.c @@ -4573,50 +4573

[PATCH 11/20] diff-parseopt: convert --[src|dst]-prefix

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 14 ++ parse-options.h | 3 ++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/diff.c b/diff.c index 30baf21021..2d34dc878e 100644 --- a/diff.c +++ b/diff.c @@ -5255,6 +5255,12 @@ static void prep_parse_options

[PATCH 12/20] diff-parseopt: convert --line-prefix

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 23 +++ 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/diff.c b/diff.c index 2d34dc878e..4ab5b3c06a 100644 --- a/diff.c +++ b/diff.c @@ -5010,6 +5010,18 @@ static int diff_opt_ignore_submodules(const struct opti

[PATCH 20/20] am: avoid diff_opt_parse()

diff_opt_parse() is a heavy hammer to just set diff filter. But it's the only way because of the diff_status_letters[] mapping. Add a new API to set diff filter and use it in git-am. diff_opt_parse()'s only remaining call site in revision.c will be gone soon and having it here just because of git-a

[PATCH 16/20] diff-parseopt: convert --color-moved-ws

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 35 ++- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/diff.c b/diff.c index df4303de4e..8f79d3f002 100644 --- a/diff.c +++ b/diff.c @@ -4862,6 +4862,20 @@ static int diff_opt_color_moved(const struc

[PATCH 19/20] diff --no-index: use parse_options() instead of diff_opt_parse()

While at there, move exit() back to the caller. It's easier to see the flow that way than burying it in diff-no-index.c Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/diff.c | 21 +++-- diff-no-index.c | 49 diff.h

[PATCH 17/20] diff.c: allow --no-color-moved-ws

This option is added in commit b73bcbac4a (diff: allow --no-color-moved-ws - 2018-11-23) in pw/diff-color-moved-ws-fix. To ease merge conflict resolution, re-implement the option handling here so that the conflict could be resolved by taking this side of change. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH 18/20] range-diff: use parse_options() instead of diff_opt_parse()

Diff's internal option parsing is now done with 'struct option', which makes it possible to combine all diff options to range-diff and parse everything all at once. Parsing code becomes simpler, and we get a looong 'git range-diff -h' Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/range-diff.c

Re: [PATCH v2 1/1] t/lib-gpg.sh: fix GPG keyring import options

On Tue, Mar 19, 2019 at 04:20:13PM -0700, Dave Huseby wrote: > Fix the way GPG keyrings are imported during testing to prevent GPG from > prompting for approval to change the default config. This appears to have no > adverse affects on GPG users with "normal" configurations but fixes the > always-

Re: [RFC PATCH] cherry-pick: set default `--mainline` parent to 1

Junio C Hamano writes: [...] > But I do have a very strong opinion against adding yet another > option that takes an optional argument. If we want to allow > cherry-picking a merge commit just as easy as cherrry-picking a > single-parent commit, "git cherry-pick -m merge" (assuming 'merge' > is

Re: [PATCH v3 10/21] checkout: split part of it to new command 'switch'

On Tue, Mar 19, 2019 at 2:10 AM Elijah Newren wrote: > > On Sun, Mar 17, 2019 at 7:03 PM Junio C Hamano wrote: > > > > Elijah Newren writes: > > > > > I don't see why even makes sense to use with --orphan; > > > you should error if both are given, IMO. The point of --orphan is to > > > create

Re: [PATCH 13/13] parse_opt_ref_sorting: always use with NONEG flag

On Wed, 20 Mar 2019 at 09:17, Jeff King wrote: > - since this was cut-and-pasted to four different spots, let's define > a single OPT_REF_SORT() macro that we can use everywhere Indeed, all four are identical. And FWIW I failed to find a fifth caller anywhere (I looked for "OPT_CALLBACK.*so

git tag -v should verify that the tag signer intended the same tag name as the user is verifying

Hi git folks-- I understand that git tags can be easily renamed. for example: git tag push origin refs/tags/v0.0.3:refs/tags/v2.3.4 However, for tags signed with any recent version of git, the tag name is also included in the signed material: 0 dkg@test:~$ git tag -v v0.0.3 object

Re: [PATCH] checkout.txt: note about losing staged changes with --merge

On Tue, Mar 19, 2019 at 7:50 PM Junio C Hamano wrote: > > Duy Nguyen writes: > > > Kinda. But "--force --merge" makes no sense. --force discards all > > local changes by definition, which means you can't have conflicts and > > will not need --merge. I think this is the reason why we die() out > >

Re: [PATCH] checkout.txt: note about losing staged changes with --merge

On Wed, Mar 20, 2019 at 8:53 PM Elijah Newren wrote: > So, I think we do need something (eventually at least). Would you > prefer we dropped this patch from Duy and instead made 'checkout -m' > abort when the index is dirty? I have no problem with this. Still scratching my head wondering if t720

Re: git tag -v should verify that the tag signer intended the same tag name as the user is verifying

Hi, This has been known for a whlie now[1]. The consensus back then was that this information was up to higher-level integrators to verify using means like e.g., --format. This is implemented in for example pacman/devtools here[2]. We published a paper with a more thorough security model here[3],

Re: [PATCH] git-diff.txt: prefer not using ..

On Mon, Mar 18, 2019 at 12:07 PM Ævar Arnfjörð Bjarmason wrote: > On Mon, Mar 18 2019, Elijah Newren wrote: > > > On Sun, Mar 17, 2019 at 6:41 AM Ævar Arnfjörð Bjarmason > > wrote: > >> On Sun, Mar 17 2019, Denton Liu wrote: > >> > Some of this thread's confusing, and on re-reading I see my repl

Re: [RFC PATCH] cherry-pick: set default `--mainline` parent to 1

On Wed, Mar 20, 2019 at 8:09 AM Sergey Organov wrote: > > Junio C Hamano writes: > > [...] > > > But I do have a very strong opinion against adding yet another > > option that takes an optional argument. If we want to allow > > cherry-picking a merge commit just as easy as cherrry-picking a > >

Good day,

Dear, It is about my late client a national of your country. Urgent response needed for More details about his (WILL).. Kind Regards. Mrs. Annabelle Edo.

Re: [RFC PATCH] cherry-pick: set default `--mainline` parent to 1

Elijah Newren writes: > On Wed, Mar 20, 2019 at 8:09 AM Sergey Organov wrote: >> >> Junio C Hamano writes: >> >> [...] >> >> > But I do have a very strong opinion against adding yet another >> > option that takes an optional argument. If we want to allow >> > cherry-picking a merge commit just

Re: [PATCH] git-diff.txt: prefer not using ..

Hi Elijah, Sorry for the late reply, I've been mulling over it for the past couple of days. On Mon, Mar 18, 2019 at 10:59:56AM -0700, Elijah Newren wrote: > Hi Denton, > > Thanks for working on this. Some thoughts... > > On Sun, Mar 17, 2019 at 4:09 AM Denton Liu wrote: > > > > The documentat

MASSAGE FROM Ms Safi>> Reply

Dear Friend, I am Ms Safi Kabore work with the department of Audit and accounting manager here in the Bank, There is this fund that was keep in my custody years ago,please i need your assistance for the transferring of thIs fund to your bank account for both of us benefit for life time invest

[PATCH v3 0/4] completion.commands: fix multiple command removals

Hi, Duy Nguyen wrote: > You probably want to drop the comment block about repository setup > inside list_cmds_by_config() too. You're right, of course. Thanks Duy. :) That's the only change since v2. Other than a follow-up to update the commit reference in 4/4 after 1/4 is in the final form on

[PATCH v3 2/4] t9902: test multiple removals via completion.commands

6532f3740b ("completion: allow to customize the completable command list", 2018-05-20) added the completion.commands config variable. Multiple commands may be added or removed, separated by a space. Demonstrate the failure of multiple removals. Signed-off-by: Todd Zullinger --- t/t9902-completi

[PATCH v3 3/4] completion: fix multiple command removals

From: Jeff King Commit 6532f3740b ("completion: allow to customize the completable command list", 2018-05-20) tried to allow multiple space-separated entries in completion.commands. To do this, it copies each parsed token into a strbuf so that the result is NUL-terminated. However, for tokens st

[PATCH v3 4/4] completion: use __git when calling --list-cmds

Since e51bdea6d3 ("git: read local config in --list-cmds", 2019-03-01), the completion.commands variable respects repo-level configuration. Use __git which ensures that the proper repo config is consulted if the command line contains 'git -C /some/other/repo'. Suggested-by: SZEDER Gábor Signed-o

[PATCH v3 1/4] git: read local config in --list-cmds

From: Jeff King Normally code that is checking config before we've decided to do setup_git_directory() would use read_early_config(), which uses discover_git_directory() to tentatively see if we're in a repo, and if so to add it to the config sequence. But list_cmds() uses the caching configset

Re: [PATCH] asciidoctor-extensions: provide ``

Hi, Martin Ågren wrote: > On Sun, 17 Mar 2019 at 20:44, Todd Zullinger wrote: >> Martin Ågren wrote: >> +ASCIIDOC_EXTRA += -a mansource="Git $(GIT_VERSION)" -a manmanual="Git >> Manual" > > So to be honest, I still don't understand how this works, but it does, > great. I really need to improve

Re: [PATCH] asciidoctor-extensions: provide ``

Jeff King wrote: > On Tue, Mar 19, 2019 at 08:12:54AM +0100, Martin Ågren wrote: > >>> I just tried with asciidoc 2.0.0.rc.2, which came out last week. It does >>> seem to work from the command line: >>> >>> $ make USE_ASCIIDOCTOR=Yes \ >>> ASCIIDOC_DOCBOOK=docbook5 \ >>> ASCII

Re: [PATCH 0/4] doc-diff: support diffing from/to AsciiDoc(tor)

On Tue, 19 Mar 2019 at 04:14, Jeff King wrote: > > On Sun, Mar 17, 2019 at 07:35:59PM +0100, Martin Ågren wrote: > > > I've taught `doc-diff` a few new knobs to support usage like > > > > $ ./doc-diff --from-asciidoc --to-asciidoctor HEAD HEAD > > Very nice. All the patches look good to me. Tha

Re: [PATCH 01/20] diff-parseopt: convert --ws-error-highlight

On Wed, 20 Mar 2019 at 12:59, Nguyễn Thái Ngọc Duy wrote: > > mark one more string for translation while at there. s/^m/M/ > + OPT_CALLBACK_F(0, "ws-error-highlight", options, N_(""), > + N_("highlight whitespaces errors in the > context, old or new li

Re: [PATCH 13/13] parse_opt_ref_sorting: always use with NONEG flag

On Wed, Mar 20, 2019 at 01:22:22PM +0100, Martin Ågren wrote: > > +#define OPT_REF_SORT(var) \ > > + OPT_CALLBACK_F(0, "sort", (var), \ > > + N_("key"), N_("field name to sort"), \ > > + PARSE_OPT_NONEG, parse_opt_ref_sorting) > > This one is not id

Re: [PATCH 07/20] diff-parseopt: convert -O

On Wed, 20 Mar 2019 at 12:48, Nguyễn Thái Ngọc Duy wrote: > + OPT_FILENAME('O', NULL, &options->orderfile, > +N_("override diff.orderFile configuration > variable")), This doesn't really tell me *why* I would want to provide -O. Or put another way, there

Re: [PATCH 13/20] diff-parseopt: convert --no-prefix

On Wed, 20 Mar 2019 at 12:50, Nguyễn Thái Ngọc Duy wrote: > + OPT_CALLBACK_F(0, "no-prefix", options, NULL, > + N_("no not show any source or destination > prefix"), > + PARSE_OPT_NONEG | PARSE_OPT_NOARG, > diff_opt_no_prefi

Re: [RFC PATCH 00/11] rebase -i run without forking rebase--interactive

On 2019.03.19 19:03, Phillip Wood wrote: > From: Phillip Wood > > When the builtin rebase starts an interactive rebase it parses the > options and then repackages them and forks `rebase--interactive`. This > series refactors rebase--interactive so that interactive rebases can > be started by the

Re: [REGRESSION ps/stash-in-c] git stash show -v

On 03/20, Junio C Hamano wrote: > Thomas Gummerer writes: > > > Subject: [PATCH] stash: setup default diff output format if necessary > > > > In the scripted 'git stash show' when no arguments are passed, we just > > pass '--stat' to 'git diff'. When any argument is passed to 'stash > > show', w

Re: [REGRESSION ps/stash-in-c] git stash show -v

On 03/20, Jeff King wrote: > On Tue, Mar 19, 2019 at 11:18:26PM +, Thomas Gummerer wrote: > > > From a quick search I couldn't find where 'git diff' actually parses > > the '-v' argument, but I wonder if we should actually disallow it, in > > case we want to use it for something else in the fu

Re: git tag -v should verify that the tag signer intended the same tag name as the user is verifying

Hi Santiago-- On Wed 2019-03-20 10:20:57 -0400, Santiago Torres Arias wrote: > This has been known for a whlie now[1]. The consensus back then was that > this information was up to higher-level integrators to verify using > means like e.g., --format. > > [1] https://public-inbox.org/git/xmqqk2hzld

Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)

Hey Junio! On Wed, 20 Mar 2019 12:13:47 +0900 Junio C Hamano wrote: > * ra/t3600-test-path-funcs (2019-03-08) 3 commits > - t3600: use helpers to replace test -d/f/e/s > - t3600: modernize style > - test functions: add function `test_file_not_empty` > > A GSoC micro. > > Will merge to 'next

Re: git tag -v should verify that the tag signer intended the same tag name as the user is verifying

On Wed, Mar 20 2019, Daniel Kahn Gillmor wrote: > Hi git folks-- > > I understand that git tags can be easily renamed. for example: > > git tag push origin refs/tags/v0.0.3:refs/tags/v2.3.4 > > However, for tags signed with any recent version of git, the tag name is > also included in the s

with due respect

Dear Friend, I know that this mail will come to you as a surprise as we have never met before, but need not to worry as I am contacting you independently of my investigation and no one is informed of this communication. I need your urgent assistance in transferring the sum of $11.3million immedia

Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)

On Wed, Mar 20 2019, Junio C Hamano wrote: > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. The ones marked with '.' do not appear in any of > the integration branches, but I am still

[PATCH v2] stash: setup default diff output format if necessary

In the scripted 'git stash show' when no arguments are passed, we just pass '--stat' to 'git diff'. When any argument is passed to 'stash show', we no longer pass '--stat' to 'git diff', and pass whatever flags are passed directly through to 'git diff'. By default 'git diff' shows the patch outpu

Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)

On 03/21, Rohit Ashiwal wrote: > Hey Junio! > > On Wed, 20 Mar 2019 12:13:47 +0900 Junio C Hamano wrote: > > * ra/t3600-test-path-funcs (2019-03-08) 3 commits > > - t3600: use helpers to replace test -d/f/e/s > > - t3600: modernize style > > - test functions: add function `test_file_not_empty

Re: [PATCH 10/20] diff-parseopt: convert --[no-]abbrev

On Wed, Mar 20 2019, Nguyễn Thái Ngọc Duy wrote: > [...]And the '40' change is self explanatory. Let me make an attempt at being dense anyway... > - else if (v > 40) > - v = 40; > + else if (v > the_hash_algo->hexsz) > + v = the_h

Re: [PATCH v2] stash: setup default diff output format if necessary

Hi Thomas, Thanks for the quick fix! On Wed, Mar 20, 2019 at 10:49:55PM +, Thomas Gummerer wrote: > In the scripted 'git stash show' when no arguments are passed, we just > pass '--stat' to 'git diff'. When any argument is passed to 'stash > show', we no longer pass '--stat' to 'git diff', a

Re: [RFC PATCH 00/11] rebase -i run without forking rebase--interactive

On Tue, Mar 19 2019, Phillip Wood wrote: > From: Phillip Wood > > When the builtin rebase starts an interactive rebase it parses the > options and then repackages them and forks `rebase--interactive`. This > series refactors rebase--interactive so that interactive rebases can > be started by th

Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)

On 2019-03-20 22:56 UTC Thomas Gummerer wrote: > Junio sometimes applies these fixes himself, if he deems it easier to > apply them directly than to wait for another iteration, and if he has > time to do so. If you have a look at the ra/t3600-test-path-funcs > branch in gitster/git, e.g. on GitHu

Re: [PATCH v2] stash: setup default diff output format if necessary

On Wed, Mar 20, 2019 at 10:49:55PM +, Thomas Gummerer wrote: > In the scripted 'git stash show' when no arguments are passed, we just > pass '--stat' to 'git diff'. When any argument is passed to 'stash > show', we no longer pass '--stat' to 'git diff', and pass whatever > flags are passed dir

Dear Friend,

Dear Friend, I am Mrs Clara David. am sending you this brief letter to solicit your partnership to transfer $18.5 million US Dollars.I shall send you more information and procedures when I receive positive response from you. please send me a message in my Email box (mrsclarad...@gmail.com) as i wa

[PATCH v2 1/1] trace2: write to directory targets

When the value of a trace2 environment variable is an absolute path referring to an existing directory, write output to files (one per process) underneath the given directory. Files will be named according to the final component of the trace2 SID, followed by a counter to avoid potential collisions

[PATCH v2 0/1] Write trace2 output to directories

Persistently enabling trace2 output is difficult because it requires specifying a full filename. This series teaches tr2_dst_get_trace_fd() to create files underneath a given directory provided as the target of the GIT_TR2_* envvars. Changes since V1: * No longer supports timestamp templates. * N

Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)

Thomas Gummerer writes: > On 03/21, Rohit Ashiwal wrote: >> Hey Junio! >> >> On Wed, 20 Mar 2019 12:13:47 +0900 Junio C Hamano wrote: >> > * ra/t3600-test-path-funcs (2019-03-08) 3 commits >> > - t3600: use helpers to replace test -d/f/e/s >> > - t3600: modernize style >> > - test functions

Re: [PATCH 10/20] diff-parseopt: convert --[no-]abbrev

On Thu, Mar 21, 2019 at 6:00 AM Ævar Arnfjörð Bjarmason wrote: > > > On Wed, Mar 20 2019, Nguyễn Thái Ngọc Duy wrote: > > > [...]And the '40' change is self explanatory. > > Let me make an attempt at being dense anyway... > > > - else if (v > 40) > > - v = 40; > > +

Re: [PATCH] checkout.txt: note about losing staged changes with --merge

Elijah Newren writes: > On Tue, Mar 19, 2019 at 7:50 PM Junio C Hamano wrote: >> >> Duy Nguyen writes: >> >> > Kinda. But "--force --merge" makes no sense. --force discards all >> > local changes by definition, which means you can't have conflicts and >> > will not need --merge. I think this is

Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)

Ævar Arnfjörð Bjarmason writes: > On Wed, Mar 20 2019, Junio C Hamano wrote: > >> Here are the topics that have been cooking. Commits prefixed with >> '-' are only in 'pu' (proposed updates) while commits prefixed with >> '+' are in 'next'. The ones marked with '.' do not appear in any of >> th

Re: git tag -v should verify that the tag signer intended the same tag name as the user is verifying

Daniel Kahn Gillmor writes: > I understand that git tags can be easily renamed. for example: > > git tag push origin refs/tags/v0.0.3:refs/tags/v2.3.4 > > However, for tags signed with any recent version of git, the tag name is > also included in the signed material: > ... > But git tag does

Re: git tag -v should verify that the tag signer intended the same tag name as the user is verifying

Junio C Hamano writes: > * "git tag -v $(git rev-parse v1.0.0)" should work, but the command Sorry, forget about this part of my message. I completely forgot the discussion we had a few years ago: https://public-inbox.org/git/CAPc5daV9ZvHqFtdzr565vp6Mv7O66ySr-p5Vi8o6bd6=gyv...@mail.gmail.com/

Re: [RFC PATCH 00/11] rebase -i run without forking rebase--interactive

Phillip Wood writes: > From: Phillip Wood > > When the builtin rebase starts an interactive rebase it parses the > options and then repackages them and forks `rebase--interactive`. This > series refactors rebase--interactive so that interactive rebases can > be started by the builtin rebase with

Re: [RFC PATCH] cherry-pick: set default `--mainline` parent to 1

On Wed, Mar 20, 2019 at 8:59 AM Sergey Organov wrote: > > Elijah Newren writes: > > > On Wed, Mar 20, 2019 at 8:09 AM Sergey Organov wrote: > >> > >> Junio C Hamano writes: > >> > >> [...] > >> > >> > But I do have a very strong opinion against adding yet another > >> > option that takes an opt

Re: [PATCH v2 1/1] trace2: write to directory targets

Josh Steadmon writes: > diff --git a/t/t0210-trace2-normal.sh b/t/t0210-trace2-normal.sh > index 03a0aedb1d..26c9c1b3b8 100755 > --- a/t/t0210-trace2-normal.sh > +++ b/t/t0210-trace2-normal.sh > @@ -80,6 +80,21 @@ test_expect_success 'normal stream, return code 1' ' > test_cmp expect actual

Re: [RFC PATCH] cherry-pick: set default `--mainline` parent to 1

Elijah Newren writes: > This worries me that it'll lead to bad surprises. Perhaps some folks > cherry-pick merges around intentionally, but I would want that to be a > rare occurrence at most. There are lots of folks at $DAYJOB that > cherry-pick things, not all of them are expert git-users, an

Re: [PATCH v3 0/4] completion.commands: fix multiple command removals

Todd Zullinger writes: > Other than a follow-up to update the commit reference in 4/4 > after 1/4 is in the final form on pu, I think this might be good. > If it's easier, we can skip 4/4 and I'll resend it after the > others are on pu. A series that makes a single topic should expect to be read

  1   2   >