[PATCH v9 07/11] sequencer.c: remove duplicate code

Since we implemented get_cleanup_mode, we had some duplicate code in git_sequencer_config which essentially performed the same operations. Refactor git_sequencer_config to take advantage of the logic already in get_cleanup_mode. Note that we had to introduce a separate argument to get_cleanup_mode

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

Junio C Hamano writes: > Sergey Organov writes: > >>> To put it a bit differently, I share with you that picking merges >>> should be deliberate and it is safer to make sure allowing it only >>> when the told us that s/he knows the commit being picked is a merge, >> >> Something like "--[no-]ban

[PATCH v9 10/11] sequencer.c: define describe_cleanup_mode

Define a function which allows us to get the string configuration value of a enum commit_msg_cleanup_mode. This is done by refactoring get_cleanup_mode such that it uses a lookup table to find the mappings between string and enum and then using the same LUT in reverse to define describe_cleanup_mod

[PATCH v9 11/11] cherry-pick/revert: add scissors line on merge conflict

Fix a bug where the scissors line is placed after the Conflicts: section, in the case where a merge conflict occurs and commit.cleanup = scissors. Helped-by: Phillip Wood Signed-off-by: Denton Liu --- Documentation/git-cherry-pick.txt | 7 +++ Documentation/git-revert.txt | 7 +++ builti

[PATCH v9 08/11] merge: cleanup messages like commit

This change allows git-merge messages to be cleaned up with the commit.cleanup configuration or --cleanup option, just like how git-commit does it. We also give git-pull the passthrough option of --cleanup so that it can also take advantage of this change. Finally, add testing to ensure that mess

[PATCH v9 06/11] parse-options.h: extract common --cleanup option

The --cleanup option is commonly used. Extract it so that its definition is not repeated. Helped-by: Phillip Wood Signed-off-by: Denton Liu --- builtin/commit.c | 2 +- builtin/tag.c| 3 +-- parse-options.h | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/commi

[PATCH v9 09/11] merge: add scissors line on merge conflict

This fixes a bug where the scissors line is placed after the Conflicts: section, in the case where a merge conflict occurs and commit.cleanup = scissors. Next, if commit.cleanup = scissors is specified, don't produce a scissors line in commit if one already exists in the MERGE_MSG file. Helped-by

[PATCH v9 01/11] t7600: clean up style

Clean up the 'merge --squash c3 with c7' test by removing some unnecessary braces and removing a pipe. Also, generally cleanup style by unindenting a here-doc, removing stray spaces after a redirection operator and allowing sed to open its own input instead of redirecting input from the shell. He

[PATCH v9 03/11] t7604: clean up style

Before, we had some Git commands which were upstream of the pipe. This meant that if it produced an error, it would've gone unnoticed. Refactor to place Git commands on their own. Also, while we're at it, remove spaces after redirection operators. Helped-by: Eric Sunshine Helped-by: SZEDER Gábor

[PATCH v9 05/11] commit: extract cleanup_mode functions to sequencer

Signed-off-by: Denton Liu --- builtin/commit.c | 25 ++--- sequencer.c | 29 + sequencer.h | 6 ++ 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index f17537474a..0df15e4851 10064

[PATCH v9 00/11] Fix scissors bug during conflict

Thanks again for the reviews, everyone. We're slowly making it there ;) Previous discussion on the cherry-pick/revert changes can be found here[1]. Changes since revert/cherry-pick v3: * Rebased on top of latest master * Reordered and squashed patches * Added populate_opts_cb and save_opts to

[PATCH v9 02/11] t3507: clean up style

Remove space after redirection operators for style. Also, remove a git command which was upstream of a pipe. Finally, let grep and sed open their own input instead of letting the shell redirect the input. Helped-by: SZEDER Gábor Signed-off-by: Denton Liu --- t/t3507-cherry-pick-conflict.sh | 42

[PATCH v9 04/11] t7502: clean up style

Refactor out Git commands that were upstream of a pipe. Remove spaces after "> ". Indent here-docs appropriately. Convert echo chains to use the test_write_lines function. Refactor 'sign off' test to use test_cmp instead of comparing variables. Helped-by: Eric Sunshine Helped-by: SZEDER Gábor Si

Re: git-format-patch and dates

Arrgh! That was an e-mail I was drafting when I suffered a power failure. That's why it's full of incomplete sentences and repeitions; I was trying different wordings. It was never supposed to be sent, and when the power came back on I decided not to try to resurrect it. But apparently when the

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

Junio C Hamano writes: > Sergey Organov writes: > >>> To put it a bit differently, I share with you that picking merges >>> should be deliberate and it is safer to make sure allowing it only >>> when the told us that s/he knows the commit being picked is a merge, >> >> Something like "--[no-]ban

Re: git-format-patch and dates

George Spelvin wrote nothing... Did you mis-send or did vger eat your message? Doesn't seem to be a problem with public-inbox.org, same for gmane and marc.info: nntp://news.gmane.org/201903190646.x2j6krwe017...@sdf.org https://marc.info/?i=201903190646.x2j6krwe017...@sdf.org mail-archive.com d

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

Nguyễn Thái Ngọc Duy writes: > 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 > p

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

Sergey Organov writes: >> To put it a bit differently, I share with you that picking merges >> should be deliberate and it is safer to make sure allowing it only >> when the told us that s/he knows the commit being picked is a merge, > > Something like "--[no-]ban-merges" then [*], having "--ban-

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

Junio C Hamano writes: > Junio C Hamano writes: > >> 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. >> >> We can just reject this RFC patch

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

Junio C Hamano writes: > Æ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

Re: [RFC PATCH 08/11] rebase -i: use struct rebase_options to parse args

Phillip Wood writes: > +static struct replay_opts get_replay_opts(const struct rebase_options *opts) > +{ > + struct replay_opts replay = REPLAY_OPTS_INIT; > + > + sequencer_init_config(&replay); > + > + replay.action = REPLAY_INTERACTIVE_REBASE; > + replay.signoff = opts->signoff

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

Junio C Hamano writes: > 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. > > We can just reject this RFC patch and we'd be in a slightly safer >

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

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 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

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: [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: 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: 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: 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: [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: [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: 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

[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

[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

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

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

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: [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: [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: [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: 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

[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 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

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: 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

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

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: [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: [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: [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: [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: [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/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 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 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] 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] 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

[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

[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 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 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 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

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

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

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

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

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 > >

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: 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] 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: [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 > >

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 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

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: [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 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-

[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 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 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

[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 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 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 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 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 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 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 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 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)

[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.

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.) > >

  1   2   >