Bug report: `git-ls-files --exclude-standard --ignored --others --directory` gives incomplete output

2019-04-17 Thread Carmen Bianca Bakker
Hi git developers, Apologies in advance if my mailing list etiquette isn't 100% perfect. I don't use mailing lists all that often. Please CC me in replies, because I am not subscribed. I use `git-ls-files` in a project[1] to get a list of ignored files/directories, and to ignore them in my projec

Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

2019-04-17 Thread Taylor Blau
On Wed, Apr 17, 2019 at 03:14:28PM +0900, Junio C Hamano wrote: > Taylor Blau writes: > > >> That's this one > >> > >> Date: Tue, 9 Apr 2019 19:13:06 -0700 (1 week, 3 hours, 23 minutes ago) > >> Subject: [PATCH v2 0/7] harden unexpected object types checks > >> > >> which I think is what h

Re: [PATCH 1/1] configure.ac: Properly check for libintl

2019-04-17 Thread Junio C Hamano
Vadim Kochan writes: > Some libc implementations like uclibc or musl provides > gettext stubs via libintl library but this case is not checked > by AC_CHECK_LIB(c, gettext ...) because gcc has gettext as builtin > which passess the check. > > So check it with included libintl.h where gettext may

Re: [PATCH v10 00/10] Fix scissors bug during conflict

2019-04-17 Thread Junio C Hamano
Phillip Wood writes: > From: Phillip Wood > > With Denton's blessing I've rebased his patches on top of my patch to > fix the message cleanup with cherry-pick --signoff and -x [1]. I've > > [1] > https://public-inbox.org/git/20190329110842.30604-1-phillip.wood...@gmail.com/ Hmph, I certainly s

[PATCH 1/1] configure.ac: Properly check for libintl

2019-04-17 Thread Vadim Kochan
Some libc implementations like uclibc or musl provides gettext stubs via libintl library but this case is not checked by AC_CHECK_LIB(c, gettext ...) because gcc has gettext as builtin which passess the check. So check it with included libintl.h where gettext may unfold into libintl_gettext which

Re: [PATCH] worktree: update is_bare heuristics

2019-04-17 Thread Junio C Hamano
Jonathan Tan writes: [jc: pinging the current area expert for the multiple worktree setup for sanity checking] > When "git branch -D " is run, Git usually first checks if that > branch is currently checked out. But this check is not performed if the > Git directory of that repository is not at "

Re: Feature request: Allow to update commit ID in messages when rebasing

2019-04-17 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Wed, Apr 17 2019, Giuseppe Crinò wrote: > >> The feature I'm asking is to add an extra-step during rebasing, >> checking whether there's a reference to a commit that's not going to >> be included in history and asks the user whether the heuristics is >> correc

Re: [PATCH 7/7] Turn `git serve` into a test helper

2019-04-17 Thread Junio C Hamano
Josh Steadmon writes: > On 2019.04.17 14:40, Junio C Hamano wrote: >> Jeff King writes: >> ... >> I guess we are more or less on the same page, then. I'll let others >> chime in by waiting for a bit more but I won't wait forever ;-). >> >> Thanks. > > FWIW I used git-serve a fair amount while

Re: jt/clone-server-option (was What's cooking in git.git (Apr 2019, #03; Tue, 16))

2019-04-17 Thread Junio C Hamano
Jonathan Tan writes: >> Jonathan Tan writes: >> >> >> * jt/clone-server-option (2019-04-15) 4 commits >> >> - SQUASH??? >> >> - clone: send server options when using protocol v2 >> >> - SQUASH??? >> >> - transport: die if server options are unsupported >> >> >> >> "git clone" learned a ne

Re: [PATCH] [WIP/RFC] add git pull and git fetch --set-upstream

2019-04-17 Thread Junio C Hamano
Corentin BOMPARD writes: > Add the --set-upstream option to git pull/fetch > which lets the user set the upstream configuration > for the current branch. I think it is a good idea to mention what you exactly mean by "the upstream configuration" here. Do you mean the "branch..merge" configurat

Re: [PATCH v2] parse-options: don't emit "ambiguous option" for aliases

2019-04-17 Thread Junio C Hamano
Duy Nguyen writes: >> { OPTION_CALLBACK, 0, "recursive", &option_recurse_submodules, >> N_("pathspec"), N_("initialize submodules in the clone"), >> - PARSE_OPT_OPTARG | PARSE_OPT_HIDDEN, recurse_submodules_cb, >> - (intptr_t)"." }, >> + PARSE_OPT_OPTARG

Re: jc/format-patch-error-check, was Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

2019-04-17 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Tue, 16 Apr 2019, Junio C Hamano wrote: > >> * jc/format-patch-error-check (2019-02-22) 2 commits >> (merged to 'next' on 2019-04-10 at 6ca358b7ef) >> + format-patch: notice failure to open cover letter for writing >> + builtin/log: downcase the

Re: [PATCH v2 00/16] Add new command 'restore'

2019-04-17 Thread Junio C Hamano
Duy Nguyen writes: > On Thu, Apr 11, 2019 at 8:12 PM Nguyễn Thái Ngọc Duy > wrote: >> >> This is the companion of "git switch" and is based on that topic. >> This command peforms the "checkout paths" from git-checkout, git-reset >> and also has a third mode to reset only worktree, leaving the i

Re: [PATCH 1/1] Fix %(push:track) in ref-filter

2019-04-17 Thread Junio C Hamano
Damien Robert writes: > From: Damien Robert > Date: Tue, 16 Apr 2019 14:16:46 +0200 > Subject: [PATCHv3 1/1] ref-filter: use correct branch for %(push:track) > > In ref-filter.c, when processing the atom %(push:track), the > ahead/behind values are computed using `stat_tracking_info` which refer

Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

2019-04-17 Thread Denton Liu
Hi Junio, On Tue, Apr 16, 2019 at 10:19:45PM +0900, Junio C Hamano wrote: > * dl/rebase-i-keep-base (2019-04-16) 6 commits > - rebase: teach rebase --keep-base > - rebase: fast-forward --fork-point in more cases > - rebase: fast-forward --onto in more cases > - t3432: test rebase fast-forward

Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

2019-04-17 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >>> LGTM, but AFAICT this patch of yours never got sent to the list, >>> oversight? >> >> I am reasonably sure that >> was sent with you on >> CC: line. > > My bad, missed it. While juggling several dozens of topics in flight, I'm bound to screw up when it comes

Re: [PATCH v2 1/1] documentation: add lab for first contribution

2019-04-17 Thread Junio C Hamano
Eric Sunshine writes: > On Wed, Apr 17, 2019 at 1:32 AM Junio C Hamano wrote: >> "Emily Shaffer via GitGitGadget" writes: >> > +Now that you've written your manpage, you'll need to build it explicitly. >> > We >> > +convert your AsciiDoc to troff which is man-readable like so: >> > + >> > +mak

Page Suggestion

2019-04-17 Thread Sarah Watts
Hi, I am inquiring about whether you may be interested in linking to our site https://www.mathschase.com/ from your page? https://porter.io/github.com/akanshgulati/commit-semantics Maths Chase is a completely free site where you can quickly test your times tables. The site is a very simple gam

Re: [PATCH v2 1/1] documentation: add lab for first contribution

2019-04-17 Thread Emily Shaffer
> > This code lab covers how to add a new command to Git and, in the > > process, everything from cloning git/git to getting reviewed on the mail > > "lab"? I thought we settled on "tutorial". Also the place we are > having conversation we call "mailing list", I think. You're right. My find/repl

[PATCH] worktree: update is_bare heuristics

2019-04-17 Thread Jonathan Tan
When "git branch -D " is run, Git usually first checks if that branch is currently checked out. But this check is not performed if the Git directory of that repository is not at "/.git", which is the case if that repository is a submodule that has its Git directory stored as "super/.git/modules/",

Re: Feature request: Allow to update commit ID in messages when rebasing

2019-04-17 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 17 2019, Giuseppe Crinò wrote: > The feature I'm asking is to add an extra-step during rebasing, > checking whether there's a reference to a commit that's not going to > be included in history and asks the user whether the heuristics is > correct and if she wants to update those refe

Feature request: Allow to update commit ID in messages when rebasing

2019-04-17 Thread Giuseppe Crinò
The feature I'm asking is to add an extra-step during rebasing, checking whether there's a reference to a commit that's not going to be included in history and asks the user whether the heuristics is correct and if she wants to update those references. Scenario: it can happen for a commit message

Re: [PATCH v6 4/6] rebase: fast-forward --onto in more cases

2019-04-17 Thread Phillip Wood
Hi Denton On 17/04/2019 19:01, Denton Liu wrote: Before, when we had the following graph, A---B---C (master) \ D (side) running 'git rebase --onto master... master side' would result in D being always rebased, no matter what. However, the desired behavior is

Re: [PATCH v10 09/10] sequencer.c: save and restore cleanup mode

2019-04-17 Thread Phillip Wood
Hi Denton On 17/04/2019 18:02, Denton Liu wrote: On Wed, Apr 17, 2019 at 11:23:29AM +0100, Phillip Wood wrote: From: Denton Liu We should drop this line before applying the patch since Phillip did all of the hard work for this patch and he's the primary author. If the user specifies an ex

Re: [PATCH 7/7] Turn `git serve` into a test helper

2019-04-17 Thread Josh Steadmon
On 2019.04.17 14:40, Junio C Hamano wrote: > Jeff King writes: > > >> I do not personally think, as the design of v2 stands, a standalone > >> "serve" server that "can serve anything as long as it goes over > >> protocol v2" makes much sense, but perhaps those who have been doing > >> the v2 work

[PATCH v6 4/6] rebase: fast-forward --onto in more cases

2019-04-17 Thread Denton Liu
Before, when we had the following graph, A---B---C (master) \ D (side) running 'git rebase --onto master... master side' would result in D being always rebased, no matter what. However, the desired behavior is that rebase should notice that this is fast-forwarda

[PATCH v6 5/6] rebase: fast-forward --fork-point in more cases

2019-04-17 Thread Denton Liu
Before, when we rebased with a --fork-point invocation where the fork-point wasn't empty, we would be setting options.restrict_revision. The fast-forward logic would automatically declare that the rebase was not fast-forwardable if it was set. However, this was painting with a very broad brush. Re

[PATCH v6 3/6] rebase: refactor can_fast_forward into goto tower

2019-04-17 Thread Denton Liu
Before, can_fast_forward was written with an if-else statement. However, in the future, we may be adding more termination cases which would lead to deeply nested if statements. Refactor to use a goto tower so that future cases can be easily inserted. Signed-off-by: Denton Liu --- builtin/rebase

[PATCH v6 6/6] rebase: teach rebase --keep-base

2019-04-17 Thread Denton Liu
A common scenario is if a user is working on a topic branch and they wish to make some changes to intermediate commits or autosquash, they would run something such as git rebase -i --onto master... master in order to preserve the merge base. This is useful when contributing a patch series

[PATCH v6 0/5] rebase: teach rebase --keep-base

2019-04-17 Thread Denton Liu
Thanks for the comments, Junio and Phillip. I've fixed the ASCII art graphs and also refactored the if-else into a goto tower. Hopefully, this will be the last reroll of this series ;) --- This patchset now depends "[PATCH 1/8] tests (rebase): spell out the `--keep-empty` option" which is the f

[PATCH v6 2/6] t3432: test rebase fast-forward behavior

2019-04-17 Thread Denton Liu
When rebase is run on a branch that can be fast-forwarded, this should automatically be done. Create test to ensure this behavior happens. There are some cases that currently don't pass. The first case is where a feature and master have diverged, running "git rebase master... master" causes a full

[PATCH v6 1/6] t3431: add rebase --fork-point tests

2019-04-17 Thread Denton Liu
Signed-off-by: Denton Liu --- t/t3431-rebase-fork-point.sh | 53 1 file changed, 53 insertions(+) create mode 100755 t/t3431-rebase-fork-point.sh diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh new file mode 100755 index 00..

Re: Generating a todo file for non-interactive rebasing

2019-04-17 Thread Drew DeVault
Thanks for clarifying this, folks. On 2019-04-17 6:11 PM, Johannes Schindelin wrote: > To my surprise, Elijah Newren (who authored that change) then demonstrated > that in most cases, the `--merge` backend is actually *faster* than the > default (`--am`) backend. There were patches floating aroun

Re: [PATCH v10 09/10] sequencer.c: save and restore cleanup mode

2019-04-17 Thread Denton Liu
On Wed, Apr 17, 2019 at 11:23:29AM +0100, Phillip Wood wrote: > From: Denton Liu We should drop this line before applying the patch since Phillip did all of the hard work for this patch and he's the primary author. > > If the user specifies an explicit cleanup mode then save and restore it > so

Re: jt/clone-server-option (was What's cooking in git.git (Apr 2019, #03; Tue, 16))

2019-04-17 Thread Jonathan Tan
> Jonathan Tan writes: > > >> * jt/clone-server-option (2019-04-15) 4 commits > >> - SQUASH??? > >> - clone: send server options when using protocol v2 > >> - SQUASH??? > >> - transport: die if server options are unsupported > >> > >> "git clone" learned a new --server-option option when ta

Re: Generating a todo file for non-interactive rebasing

2019-04-17 Thread Johannes Schindelin
Hi Drew, On Tue, 16 Apr 2019, Drew DeVault wrote: > Whenever I do a particularly long rebase on a branch, sorting out > conflicts from upstream, I find that it's often useful to have the > additional context that you get during an interactive rebase, such as > recent commands run, commands planne

Re: [PATCH v2] parse-options: don't emit "ambiguous option" for aliases

2019-04-17 Thread Duy Nguyen
On Wed, Apr 17, 2019 at 7:44 PM Ævar Arnfjörð Bjarmason wrote: > > Change the option parsing machinery so that e.g. "clone --recurs ..." > doesn't error out because "clone" understands both "--recursive" and > "--recurse-submodules" to mean the same thing. > > Initially "clone" just understood --r

[PATCH] [WIP/RFC] add git pull and git fetch --set-upstream

2019-04-17 Thread Corentin BOMPARD
Add the --set-upstream option to git pull/fetch which lets the user set the upstream configuration for the current branch. For example a typical use-case like git clone http://example.com/my-public-fork git remote add main http://example.com/project-main-repo git pull main master --set

Re: [PATCH/docs] make slash-rules more readable

2019-04-17 Thread Dr. Adam Nielsen
I think its maybe hard to track all the changes that we have discussed so far. Should I create a new PATCH request including all the changes from the recent mails and then we continue the discussion from there? Best regards, Adam Am Mi., 10. Apr. 2019 um 09:39 Uhr schrieb Dr. Adam Nielsen : > > >

Re: [PATCH v2 1/2] commit/reset: try to clean up sequencer state

2019-04-17 Thread Phillip Wood
Hi Dscho On 17/04/2019 13:26, Johannes Schindelin wrote: Hi, On Wed, 17 Apr 2019, Junio C Hamano wrote: Phillip Wood writes: Avoid this potential problem by removing the sequencer state if we're committing or resetting the final pick in a sequence. The use-case story before this conclusi

Re: Generating a todo file for non-interactive rebasing

2019-04-17 Thread Phillip Wood
Hi Drew On 16/04/2019 16:37, Drew DeVault wrote: Hiya! Whenever I do a particularly long rebase on a branch, sorting out conflicts from upstream, I find that it's often useful to have the additional context that you get during an interactive rebase, such as recent commands run, commands planned

[PATCH v1 08/12] rebase -i: use struct object_id for squash_onto

2019-04-17 Thread Phillip Wood
From: Phillip Wood More preparation for using `struct rebase_options` in cmd_rebase__interactive(). Using a string was a hangover from the scripted version of rebase, update the functions that use `squash_onto` to take a `sturct object_id`. Signed-off-by: Phillip Wood --- builtin/rebase.c |

[PATCH v1 10/12] rebase -i: use struct rebase_options in do_interactive_rebase()

2019-04-17 Thread Phillip Wood
From: Phillip Wood All the parameters that are passed to do_interactive_rebase() apart from `flags` are already in `struct rebase_options` so there is no need to pass them separately. Signed-off-by: Phillip Wood --- builtin/rebase.c | 69 +--- 1 file

[PATCH v1 11/12] rebase: use a common action enum

2019-04-17 Thread Phillip Wood
From: Phillip Wood cmd_rebase() and cmd_rebase__interactive() used different enums to hold the current action. Change to using a common enum so the values are the same when we change `rebase -i` to avoid forking `rebase--interactive`. Signed-off-by: Phillip Wood --- builtin/rebase.c | 91 +

[PATCH v1 07/12] rebase -i: use struct commit when parsing options

2019-04-17 Thread Phillip Wood
From: Phillip Wood This is in preparation for using `struct rebase_options` when parsing options in cmd_rebase__interactive(). Using a string for onto, restrict_revision and upstream, was a hangover from the scripted version of rebase. The functions that use these variables are updated to take a

[PATCH v1 09/12] rebase -i: use struct rebase_options to parse args

2019-04-17 Thread Phillip Wood
From: Phillip Wood In order to run `rebase -i` without forking `rebase--interactive` it will be convenient to use the same structure when parsing the options in cmd_rebase() and cmd_rebase__interactive(). Signed-off-by: Phillip Wood --- builtin/rebase.c | 203 ++

[PATCH v1 12/12] rebase -i: run without forking rebase--interactive

2019-04-17 Thread Phillip Wood
From: Phillip Wood When the builtin rebase starts an interactive rebase it parses the options and then repackages them and forks `rebase--interactive`. Separate the option parsing in cmd_rebase__interactive() from the business logic to allow interactive rebases can be run without forking `rebase_

[PATCH v1 06/12] rebase -i: remove duplication

2019-04-17 Thread Phillip Wood
From: Phillip Wood path_state_dir() and merge_dir() refer to the same path so remove one of them. Signed-off-by: Phillip Wood --- builtin/rebase.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 57a3c9caf1..610b67827b 100644 --

[PATCH v1 04/12] rebase: use OPT_RERERE_AUTOUPDATE()

2019-04-17 Thread Phillip Wood
From: Phillip Wood As we have a macro for this it makes sense to use it. Having cmd_rebase() and cmd_rebase__interactive() use the same values for this option will be helpful when we start running interactive rebases without forking rebase--interactive. Signed-off-by: Phillip Wood --- builtin/

[PATCH v1 05/12] rebase -i: combine rebase--interactive.c with rebase.c

2019-04-17 Thread Phillip Wood
From: Phillip Wood In order to run `rebase -i` without forking `rebase--interactive` it will be convenient to have all the code from rebase--interactive.c in rebase.c. This is a straight forward copy of the code from rebase--interactive.c, it will be simplified slightly in the next commit. Signe

[PATCH v1 02/12] rebase: don't translate trace strings

2019-04-17 Thread Phillip Wood
From: Phillip Wood commit b3a5d5a80c ("trace2:data: add subverb for rebase", 2019-02-22) mistakenly marked the subverb names for translation and unnecessarily NULL terminated the array. Signed-off-by: Phillip Wood --- builtin/rebase.c | 15 +++ 1 file changed, 7 insertions(+), 8 de

[PATCH v1 03/12] rebase: rename write_basic_state()

2019-04-17 Thread Phillip Wood
From: Phillip Wood This clashes with a function in sequencer.c Signed-off-by: Phillip Wood --- builtin/rebase.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index 239a54ecfe..0b1a193a8e 100644 --- a/builtin/rebase.c +++ b/builtin/r

[PATCH v1 00/12] Run rebase -i without forking rebase--interactive

2019-04-17 Thread Phillip Wood
From: Phillip Wood Thanks for the feedback on the last version. I've updated the final commit message to mention the speed up reported by Ævar. I've also removed the translation of the trace strings. Apart from that this series is unchanged. There shouldn't be any merge conflicts with the updated

[PATCH v1 01/12] sequencer: always discard index after checkout

2019-04-17 Thread Phillip Wood
From: Phillip Wood As the checkout runs in a separate process our index will be out of date so it should be discarded. The existing callers are not doing this consistently so do it here to avoid the callers having to worry about it. This fixes some test failures that happen if do_interactive_reb

Re: [PATCH v5 3/5] rebase: fast-forward --onto in more cases

2019-04-17 Thread Phillip Wood
On 17/04/2019 07:44, Denton Liu wrote: On Tue, Apr 16, 2019 at 02:59:12PM +0100, Phillip Wood wrote: Hi Denton It's good to see rebase fast-forwarding properly when it should On 15/04/2019 23:29, Denton Liu wrote: Before, when we had the following graph, A---B---C (master)

ab/test-lib-pass-trace2-env, was Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

2019-04-17 Thread Johannes Schindelin
Hi Junio, On Tue, 16 Apr 2019, Junio C Hamano wrote: > * ab/test-lib-pass-trace2-env (2019-04-01) 1 commit > (merged to 'next' on 2019-04-16 at 4dad6d6d7a) > + test-lib: whitelist GIT_TR2_* in the environment > > Allow tracing of Git executable while running out tests. Did you mean "our" ins

jc/format-patch-error-check, was Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

2019-04-17 Thread Johannes Schindelin
Hi Junio, On Tue, 16 Apr 2019, Junio C Hamano wrote: > * jc/format-patch-error-check (2019-02-22) 2 commits > (merged to 'next' on 2019-04-10 at 6ca358b7ef) > + format-patch: notice failure to open cover letter for writing > + builtin/log: downcase the beginning of error messages > (this bra

[PATCH v2] parse-options: don't emit "ambiguous option" for aliases

2019-04-17 Thread Ævar Arnfjörð Bjarmason
Change the option parsing machinery so that e.g. "clone --recurs ..." doesn't error out because "clone" understands both "--recursive" and "--recurse-submodules" to mean the same thing. Initially "clone" just understood --recursive until the --recurses-submodules alias was added in ccdd3da652 ("cl

Re: [PATCH v2 1/2] commit/reset: try to clean up sequencer state

2019-04-17 Thread Johannes Schindelin
Hi, On Wed, 17 Apr 2019, Junio C Hamano wrote: > Phillip Wood writes: > > > Avoid this potential problem by removing the sequencer state if we're > > committing or resetting the final pick in a sequence. > > The use-case story before this conclusion only mentioned "commit" > that concluded the m

High danger. Your account was attacked.

2019-04-17 Thread git
Hi, stranger! I know the usmaniopzxc, this is your password. As you can see, I logged in with your account. And I wrote you this message from your account. If you have already changed your password, my malware will be intercepts it every time. You may not know me, and you are most likely wond

Re: [PATCH v2 8/8] tests: disallow the use of abbreviated options (by default)

2019-04-17 Thread Johannes Schindelin
Hi Junio, On Mon, 15 Apr 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Mon, 15 Apr 2019, Junio C Hamano wrote: > > > >> Junio C Hamano writes: > >> > >> > >> > Do you mean more like > >> > ... > >> > I think I can agree with either of the two positions... > >> > >> I am gue

Re: [RFC PATCH 2/4] range-diff: don't remove funcname from inner diff

2019-04-17 Thread Johannes Schindelin
Hi Thomas, On Mon, 15 Apr 2019, Thomas Gummerer wrote: > On 04/15, Johannes Schindelin wrote: > > > On Sun, 14 Apr 2019, Eric Sunshine wrote: > > > > > On Sun, Apr 14, 2019 at 5:09 PM Thomas Gummerer > > > wrote: > > > > [...] > > > > However it can still be useful to have the function name tha

Re: [PATCH v2 1/2] t9822: skip tests if file names cannot be ISO-8859-1 encoded

2019-04-17 Thread Johannes Schindelin
Hi Junio, On Mon, 15 Apr 2019, Junio C Hamano wrote: > On Mon, Apr 15, 2019 at 9:37 PM Johannes Schindelin > wrote: > > > > It seems not to have made it into the js/macos-gettext-build branch, > > though. Would you terribly mind picking it up, please? > > I think they are separately queued, so t

[PATCH v10 00/10] Fix scissors bug during conflict

2019-04-17 Thread Phillip Wood
From: Phillip Wood With Denton's blessing I've rebased his patches on top of my patch to fix the message cleanup with cherry-pick --signoff and -x [1]. I've also refactored a couple of the patches and cleaned up the coding style in places. The refactoring aims to simplify the code that deals with

[PATCH v10 03/10] t7604: clean up style

2019-04-17 Thread Phillip Wood
From: Denton Liu 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 Help

[PATCH v10 01/10] t7600: clean up style

2019-04-17 Thread Phillip Wood
From: Denton Liu 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

[PATCH v10 10/10] cherry-pick/revert: add scissors line on merge conflict

2019-04-17 Thread Phillip Wood
From: Denton Liu 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

[PATCH v10 05/10] commit: extract cleanup_mode functions to sequencer

2019-04-17 Thread Phillip Wood
From: Denton Liu 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 f17537474

[PATCH v10 06/10] parse-options.h: extract common --cleanup option

2019-04-17 Thread Phillip Wood
From: Denton Liu 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 --

[PATCH v10 08/10] merge: add scissors line on merge conflict

2019-04-17 Thread Phillip Wood
From: Denton Liu 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_M

[PATCH v10 02/10] t3507: clean up style

2019-04-17 Thread Phillip Wood
From: Denton Liu 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-pi

[PATCH v10 04/10] t7502: clean up style

2019-04-17 Thread Phillip Wood
From: Denton Liu 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-b

[PATCH v10 09/10] sequencer.c: save and restore cleanup mode

2019-04-17 Thread Phillip Wood
From: Denton Liu If the user specifies an explicit cleanup mode then save and restore it so that it is preserved by 'git cherry-pick --continue'. Signed-off-by: Phillip Wood --- sequencer.c | 28 +++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/sequenc

[PATCH v10 07/10] merge: cleanup messages like commit

2019-04-17 Thread Phillip Wood
From: Denton Liu 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 option of --cleanup so that it can also take advantage of this change. Finally, add testing to ensure th

Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

2019-04-17 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 17 2019, Phillip Wood wrote: > On 16/04/2019 15:51, Ævar Arnfjörð Bjarmason wrote: >> >> On Tue, Apr 16 2019, Junio C Hamano wrote: >> >>> * pw/rebase-i-internal-rfc (2019-03-21) 12 commits >>> - rebase -i: run without forking rebase--interactive >>> - rebase: use a common action

Re: [PATCH v2 00/16] Add new command 'restore'

2019-04-17 Thread Duy Nguyen
On Thu, Apr 11, 2019 at 8:12 PM Nguyễn Thái Ngọc Duy wrote: > > This is the companion of "git switch" and is based on that topic. > This command peforms the "checkout paths" from git-checkout, git-reset > and also has a third mode to reset only worktree, leaving the index > alone. It does not hav

Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

2019-04-17 Thread Phillip Wood
On 16/04/2019 15:51, Ævar Arnfjörð Bjarmason wrote: On Tue, Apr 16 2019, Junio C Hamano wrote: * pw/rebase-i-internal-rfc (2019-03-21) 12 commits - rebase -i: run without forking rebase--interactive - rebase: use a common action enum - rebase -i: use struct rebase_options in do_interacti

Some files not ignored as they should be

2019-04-17 Thread Celestino, Federico
Dear Support Team, I am facing another issue with Git. Please find attached the .gitignore file that I am currently using. My intention is to ignore all the files inside any Debug folder, except for .map, .hex and .bin files. Yet, a .out file is not ignored, as shown in the second attachment. I

Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

2019-04-17 Thread Duy Nguyen
On Tue, Apr 16, 2019 at 9:51 PM Ævar Arnfjörð Bjarmason wrote: > > * nd/precious (2019-04-09) 1 commit > > - Introduce "precious" file concept > > > > "git clean" learned to pay attention to the 'precious' attributes > > and keep untracked paths with the attribute instead of removing > > when

FW: Some files not ignored as they should be

2019-04-17 Thread Celestino, Federico
Please find a better picture showing the anomaly. Freundliche Grüße / Kind regards i.A. Federico Celestino Entwicklungsingenieur Fon +49 2151 7830 324 Fax +49 2151 7830 499 www.xcmg-erc.com celest...@xcmg-erc.com --

Re: [PATCH] Give git-pull a --reset option

2019-04-17 Thread Eric Sunshine
On Wed, Apr 17, 2019 at 12:07 AM Alex Henrie wrote: > A common workflow is to make a commit on a local branch, push the branch > to the remote, check out the remote branch on a second computer, amend > the commit on the second computer, force-push back to the remote branch, > and finally submit a

Re: [PATCH 1/1] Fix %(push:track) in ref-filter

2019-04-17 Thread Damien Robert
>From Jeff King, Tue 16 Apr 2019 at 17:48:43 (-0400) : > The name "compare_info" is a bit vague. Perhaps "stat_branch_pair" or > something would be more descriptive. Done. > ref-filter: use correct branch for %(push:track) Done. > s/refer/&s/ > s/change/&s/ Grmf, thanks. > Is it worth chang

Re: [PATCH v2 1/1] documentation: add lab for first contribution

2019-04-17 Thread Eric Sunshine
On Wed, Apr 17, 2019 at 1:32 AM Junio C Hamano wrote: > "Emily Shaffer via GitGitGadget" writes: > > +Now that you've written your manpage, you'll need to build it explicitly. > > We > > +convert your AsciiDoc to troff which is man-readable like so: > > + > > +make all doc > > +man Documentation

[PATCH v3 0/4] remove extern from function declarations

2019-04-17 Thread Denton Liu
Hi Thomas, Thanks for the feedback. I couldn't find a tool that could selectively fix indentation on patches so I went through and manually realigned the parameter lists wherever the tools mangled the alignment. I guess this also implies that one pair of (tired) human eyes has manually inspected

[PATCH v3 2/4] *.[ch]: remove extern from function declarations using sed

2019-04-17 Thread Denton Liu
There has been a push to remove extern from function declarations. Finish the job by removing all instances of "extern" for function declarations in headers using sed. This was done by running the following on my system with sed 4.2.2: $ git ls-files \*.{c,h} | xargs sed -i'' -e 's/^\(\s*\)ex

[PATCH v3 4/4] cocci: prevent extern function declarations

2019-04-17 Thread Denton Liu
Since function declarations already implicitly imply extern, create a Coccinelle rule which removes the redundant extern. Signed-off-by: Denton Liu --- contrib/coccinelle/noextern.cocci | 6 ++ 1 file changed, 6 insertions(+) create mode 100644 contrib/coccinelle/noextern.cocci diff --git

[PATCH v3 3/4] *.[ch]: manually align parameter lists

2019-04-17 Thread Denton Liu
In previous patches, extern was mechanically removed from function declarations without care to formatting, causing parameter lists to be misaligned. Manually format changed sections such that the parameter lists should be realigned. Viewing this patch with 'git diff -w' should produce no output.

Re: What's cooking in git.git (Apr 2019, #03; Tue, 16)

2019-04-17 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 16 2019, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> On Tue, Apr 16 2019, Junio C Hamano wrote: >> >> >>> * jc/gettext-test-fix (2019-04-15) 1 commit >>> - gettext tests: export the restored GIT_TEST_GETTEXT_POISON >>> >>> The GETTEXT_POISON test option has been q

Re: [PATCH v2 1/2] commit/reset: try to clean up sequencer state

2019-04-17 Thread Junio C Hamano
Phillip Wood writes: > Avoid this > potential problem by removing the sequencer state if we're committing or > resetting the final pick in a sequence. The use-case story before this conclusion only mentioned "commit" that concluded the multi-step cherry-pick/revert, and never talked about "reset