Re: [RFC PATCH v4 1/9] git-submodule.sh:cmd_update: if submodule branch exists, fetch that instead of default

2018-04-19 2:53 GMT+03:00 Stefan Beller : > Hi Eddy, > > all the following patches 3-9 are touching the test as added in patch > 2, which would go best with this patch. > Could you squash all commits into one? Yes, I did not have time yesterday to put all changes into a

Re: Git issue report

"xfswi...@163.com" writes: > Hi, > I met a issue when using git. > I cannot delete the file by the commond 'git rm'. > The file name is a little diff from common file. > I accidentally named the file "filename\r", display such as filename^M. Then > I commit the file by 'git

Re: Silly "git gc" UI issue.

Linus Torvalds writes: > Maybe something like the attached patch? Then I get: > ... > [torvalds@i7 linux]$ time git gc --prune=npw > fatal: Failed to parse prune expiry value npw > > real0m0.004s > user0m0.002s > sys

Re: [RFC WIP PATCH] merge: implement -s theirs -X N

Ævar Arnfjörð Bjarmason writes: > We have a -s ours, but not a -s theirs. This is a WIP patch to implement > that. It works, but I haven't dealt with this part of the internal API > before, comments most welcome. > > The purpose of this is that I'm working with a rollout tool

Re: [RFC WIP PATCH] merge: implement -s theirs -X N

Ævar Arnfjörð Bjarmason writes: > Questions: > > 1. Should I be calling read-tree here with run_command_v_opt(), or is > there some internal API I should be using? The internal is unpack_trees(), which is usabe as a library-ish API reasonably cleanly and easily. For a

Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

Johannes Schindelin writes: > Hi Phillip, > > On Fri, 13 Apr 2018, Phillip Wood wrote: > >> On 12/04/18 23:02, Johannes Schindelin wrote: >> > >> > [...] >> > >> > So: the order of the 3-way merges does matter. >> > >> > [...] >> >> Those conflicts certainly look

Re: man page for "git remote set-url" seems confusing/contradictory

On 18 April 2018 at 22:56, Todd Zullinger wrote: > Tangentially (and I don't know if it's worth fixing), while > poking around the documentation which includes urls.txt I > noticed that git-clone.txt refers readers to the "URLS > section below" when the name of the section is "GIT

Re: [PATCH 1/2] commit: fix --short and --porcelain

On Wed, Apr 18, 2018 at 8:55 PM, Samuel Lijin wrote: > Thanks for the quick review! > > On Wed, Apr 18, 2018 at 11:38 AM, Martin Ågren wrote: >> Hi Samuel, >> >> Welcome back. :-) >> >> On 18 April 2018 at 05:06, Samuel Lijin wrote:

Git issue report

Hi, I met a issue when using git. I cannot delete the file by the commond 'git rm'. The file name is a little diff from common file. I accidentally named the file "filename\r", display such as filename^M. Then I commit the file by 'git add .'. After I find this mistake, I remove the file, then

Re: Silly "git gc" UI issue.

Linus Torvalds writes: > Yes, I get that nice "malformed expiration date 'npw'" error, but I > get it after 64 seconds has passed. Ah, that timing aspect of the issue didn't occur to me. The patch indeed is a reasonable workaround. Thanks.

Re: [PATCH v9 2/2] builtin/config.c: support `--type=` as preferred alias for `--type`

On Thu, Apr 19, 2018 at 11:47:50AM +0900, Junio C Hamano wrote: > Taylor Blau writes: > > > diff --git a/builtin/config.c b/builtin/config.c > > index 92fb8d56b1..bd7a8d0ce7 100644 > > --- a/builtin/config.c > > +++ b/builtin/config.c > > @@ -61,6 +61,58 @@ static int

Re: [PATCH v9 2/2] builtin/config.c: support `--type=` as preferred alias for `--type`

Taylor Blau writes: > diff --git a/builtin/config.c b/builtin/config.c > index 92fb8d56b1..bd7a8d0ce7 100644 > --- a/builtin/config.c > +++ b/builtin/config.c > @@ -61,6 +61,58 @@ static int show_origin; > #define TYPE_PATH4 > #define TYPE_EXPIRY_DATE 5 > >

Re: Silly "git gc" UI issue.

On Wed, Apr 18, 2018 at 7:16 PM, Junio C Hamano wrote: > A few commands that parse --expire= command line option > behaves silly when given nonsense input. For example So this patch definitely improves on the error message. But look at what happens for the kernel:

[PATCH] send-email: allow re-editing of message

When shown the email summary, an opportunity is presented for the user to edit the email as if they had specified --annotate. This also permits them to edit it multiple times. Signed-off-by: Drew DeVault Reviewed-by: Simon Ser --- git-send-email.perl | 35

Re: Silly "git gc" UI issue.

On Wed, Apr 18, 2018 at 6:52 PM, Junio C Hamano wrote: > > Regardless of your originai "git gc" issue, we should make "prune" > say something on this error. And when we do so, I would think that > error message will come before the final "error: failed to run > prune". So to

Re: Silly "git gc" UI issue.

A few commands that parse --expire= command line option behaves silly when given nonsense input. For example $ git prune --no-expire Segmentation falut $ git prune --expire=npw; echo $? 129 Both come from parse_opt_expiry_date_cb(). The former is because the function is not

Re: Silly "git gc" UI issue.

Junio C Hamano writes: > It turns out that prune silently goes away given a bad expiry > > $ git prune --expire=nyah ; echo $? > 129 > > Regardless of your originai "git gc" issue, we should make "prune" > say something on this error. And when we do so, I would think

Re: Silly "git gc" UI issue.

Linus Torvalds writes: > You get this: > >git gc --prune=npw > > Yeah, that "npw" should be "now", which is where the klutz thing comes in. > > It turns out that git reacts ridiculously badly to this. $ git gc --prune=npw Counting objects: 10, done.

Silly "git gc" UI issue.

Ok, this is ridiculous, but I've done it several times, so I thought I'd finally mention it to somebody on the git list that may care: "My name is Linus, and I'm a klutz". what does that have to do with anything? Now, imagine you're a klutz. Imagine you want to clean up your .git directory.

Re: [PATCH 0/4] doc: cleaning up instances of \--

On Tue, Apr 17, 2018 at 09:15:25PM +0200, Martin Ågren wrote: > This is a patch series to convert \-- to -- in our documentation. The > first patch is a reiteration of 1c262bb7b2 (doc: convert \--option to > --option, 2015-05-13) to fix some instances that have appeared since. > The other three

Re: [PATCH v3 0/9] Compute and consume generation numbers

Derrick Stolee writes: > -- >8 -- > > This is the one of several "small" patches that follow the serialized > Git commit graph patch (ds/commit-graph) and lazy-loading trees > (ds/lazy-load-trees). > > As described in Documentation/technical/commit-graph.txt, the

Re: [PATCH v3 8/9] commit-graph: always load commit-graph information

Derrick Stolee writes: > Most code paths load commits using lookup_commit() and then > parse_commit(). In some cases, including some branch lookups, the commit > is parsed using parse_object_buffer() which side-steps parse_commit() in > favor of parse_commit_buffer(). > >

Re: [RFC PATCH v4 1/9] git-submodule.sh:cmd_update: if submodule branch exists, fetch that instead of default

Hi Eddy, all the following patches 3-9 are touching the test as added in patch 2, which would go best with this patch. Could you squash all commits into one? There are a couple ways to do it: git reset --soft git commit -a --reuse-commit-message=<...> or using git rebase --interactive

Re: [RFC WIP PATCH] merge: implement -s theirs -X N

On Wed, Apr 18, 2018 at 3:48 PM, Ævar Arnfjörð Bjarmason wrote: > We have a -s ours, but not a -s theirs. This is a WIP patch to implement > that. It works, but I haven't dealt with this part of the internal API > before, comments most welcome. I hope reference pointers are

Re: [PATCH v3 7/9] commit: add short-circuit to paint_down_to_common()

Derrick Stolee writes: > When running 'git branch --contains', the in_merge_bases_many() > method calls paint_down_to_common() to discover if a specific > commit is reachable from a set of branches. Commits with lower > generation number are not needed to correctly answer

[RFC WIP PATCH] merge: implement -s theirs -X N

We have a -s ours, but not a -s theirs. This is a WIP patch to implement that. It works, but I haven't dealt with this part of the internal API before, comments most welcome. The purpose of this is that I'm working with a rollout tool that is capable of doing hotfixes on top of old commits on

[RFC PATCH v4 6/9] fixup:t7406:don't call init after add, is redundant

From: Eddy Petrișor Signed-off-by: Eddy Petrișor --- t/t7406-submodule-update.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index c5b412c46..32995e272 100755

[RFC PATCH v4 4/9] fixup:t7404:use 'git -C' instead of cd .. && git

From: Eddy Petrișor Signed-off-by: Eddy Petrișor --- t/t7406-submodule-update.sh | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 7fb370991..974f949df 100755

[RFC PATCH v4 5/9] fixup:t7406:cleanup chained submodules after test is done

From: Eddy Petrișor Signed-off-by: Eddy Petrișor --- t/t7406-submodule-update.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 974f949df..c5b412c46 100755

[RFC PATCH v4 8/9] fixup:t7406:use super_w instead of the existing super

From: Eddy Petrișor Signed-off-by: Eddy Petrișor --- t/t7406-submodule-update.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 18328be73..f44872143

[RFC PATCH v4 2/9] t7406: add test for non-default branch in submodule

From: Eddy Petrișor If a submodule uses a non-default branch and the branch info is versioned, on submodule update --recursive --init the correct branch should be checked out. Signed-off-by: Eddy Petrișor --- t/t7406-submodule-update.sh | 54

[RFC PATCH v4 9/9] fixup:t7406:change branches in submodules after the link is done

From: Eddy Petrișor Signed-off-by: Eddy Petrișor --- t/t7406-submodule-update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index f44872143..68c25ce0f 100755

[RFC PATCH v4 1/9] git-submodule.sh:cmd_update: if submodule branch exists, fetch that instead of default

From: Eddy Petrișor There are projects such as llvm/clang which use several repositories, and they might be forked for providing support for various features such as adding Redox awareness to the toolchain. This typically means the superproject will use another branch

[RFC PATCH v4 3/9] fixup:t7406: use test_commit instead of echo/add/commit as suggested by Stefan Beller

From: Eddy Petrișor Signed-off-by: Eddy Petrișor --- t/t7406-submodule-update.sh | 15 +++ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index

[RFC PATCH v4 7/9] fixup:t7406:supr5 commit is done before submodules chaining

From: Eddy Petrișor Signed-off-by: Eddy Petrișor --- t/t7406-submodule-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 32995e272..18328be73 100755 ---

Re: [PATCH v3 6/9] commit: use generation numbers for in_merge_bases()

Derrick Stolee writes: > The containment algorithm for 'git branch --contains' is different > from that for 'git tag --contains' in that it uses is_descendant_of() > instead of contains_tag_algo(). The expensive portion of the branch > algorithm is computing merge bases. >

Re: [PATCH 1/2] daemon: use timeout for uninterruptible poll

Johannes Schindelin writes: > Unless I am misunderstanding violently what you say, that is, in which > case I would like to ask for a clarification why this patch (which does > not change a thing unless NO_POLL is defined!) must be rejected, and while > at it, I would

Re: [PATCH 2/2] daemon: graceful shutdown of client connection

Hi Kim, On Sun, 15 Apr 2018, Kim Gybels wrote: > On (13/04/18 15:03), Johannes Schindelin wrote: > > I wonder whether you found a reliable way to trigger this? It would be > > nice to have a regression test for this. > > On my system, it reproduced reliably using Oleg's example [1], below is >

Re: [PATCH v3 1/1] perl: fix installing modules from contrib

Christian Hesse writes: > Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules) > removed a target that allowed Makefiles from contrib/ to get the correct > install path. This introduces a new target for main Makefile and fixes > installation for Mediawiki

[PATCH v9 2/2] builtin/config.c: support `--type=` as preferred alias for `--type`

`git config` has long allowed the ability for callers to provide a 'type specifier', which instructs `git config` to (1) ensure that incoming values can be interpreted as that type, and (2) that outgoing values are canonicalized under that type. In another series, we propose to extend this

[PATCH v9 0/2] builtin/config.c: support `--type=` as preferred alias for `--type`

Hi, Attached is my final re-roll of the series to add `--type=` as a supported replacement for `--`. Since the last time, I have changed the following: * OPT_CALLBACK_VALUE no longer takes a function pointer, and instead assumes option_parse_type(). * No longer rely on 'type' as a

[PATCH v9 1/2] builtin/config.c: treat type specifiers singularly

Internally, we represent `git config`'s type specifiers as a bitset using OPT_BIT. 'bool' is 1<<0, 'int' is 1<<1, and so on. This technique allows for the representation of multiple type specifiers in the `int types` field, but this multi-representation is left unused. In fact, `git config` will

Re: [PATCH v3 0/2] fsexcludes: Add programmatic way to exclude files

Ben Peart writes: > I found a bug with how this patch series deals with untracked > files. I'm going to retract this patch until I have time to create a > new test case to demonstrate the bug and come up with a good fix. > > Ben Thanks.

Re: [PATCH] submodule--helper: don't print null in 'submodule status'

Stefan Beller writes: > Hi Nguyễn, > > On Wed, Apr 18, 2018 at 7:53 AM, Nguyễn Thái Ngọc Duy > wrote: >> The function compute_rev_name() can return NULL sometimes (e.g. right >> after 'submodule init'). The current code makes 'submodule status' >> print

Re: [PATCH] git-send-email: Cc more people

Ævar Arnfjörð Bjarmason writes: > But IMO this patch is really lacking a few things before being ready: > > 1. You have no tests for this. See t/t9001-send-email.sh for examples, > ... > 2. Just a few lines down from your quoted hunk we have this: > ... code about $supress_cc{}

Re: [PATCH 1/2] daemon: use timeout for uninterruptible poll

Hi Kim, On Sun, 15 Apr 2018, Kim Gybels wrote: > On (13/04/18 14:36), Johannes Schindelin wrote: > > > The poll provided in compat/poll.c is not interrupted by receiving > > > SIGCHLD. Use a timeout for cleaning up dead children in a timely > > > manner. > > > > Maybe say "When using this poll

Re: [PATCH 0/3] completion: improvements for git stash

On 04/18, Junio C Hamano wrote: > Thomas Gummerer writes: > > > In this series we stop completing the 'git stash save' subcommand in > > git-completion.bash. The command has been deprecated for a while,... > > Anything deprecated in Oct 2017 is still too young in Git's >

Re: [RFC PATCH] ident: don't cache default date

Johannes Sixt writes: > While I like the basic theme of your patch, I think we should fix this > case in a much simpler way, namely, use the infrastructure that was > introduced for git-am. Yup. reset_ident_date() was introduced by 4d9c7e6f ("am: reset cached ident date for each

Re: [PATCH 1/2] daemon: use timeout for uninterruptible poll

Hi Junio, On Mon, 16 Apr 2018, Junio C Hamano wrote: > Kim Gybels writes: > > > The poll provided in compat/poll.c is not interrupted by receiving > > SIGCHLD. Use a timeout for cleaning up dead children in a timely manner. > > I think you identified the problem and

[PATCH v4] bisect: create 'bisect_flags' parameter in find_bisection()

Make it possible to implement bisecting only on first parents or on merge commits by passing flags to find_bisection(), instead of just a 'find_all' boolean. Signed-off-by: Harald Nordgren --- Notes: Use unsigned type and cache flag value bisect.c | 15

Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)

Elijah Newren writes: > On Mon, Apr 16, 2018 at 11:07 PM, Junio C Hamano wrote: >> * en/rename-directory-detection-reboot (2018-04-16) 32 commits >> ... >> - directory rename detection: testcases to avoid taking detection too far >> - directory rename

Re: [PATCH v3 5/9] ref-filter: use generation number for --contains

Here I can offer only the cursory examination, as I don't know this area of code in question. Derrick Stolee writes: > A commit A can reach a commit B only if the generation number of A > is larger than the generation number of B. This condition allows > significantly

Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)

Christian Hesse writes: > Junio C Hamano on Tue, 2018/04/17 15:07: >> * ab/simplify-perl-makefile (2018-04-11) 1 commit >> (merged to 'next' on 2018-04-17 at 4448756934) >> + perl: fix installing modules from contrib >> >> Recent simplification of build

Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)

Jonathan Tan writes: >> I considered this done a long time ago, >> >> "All 6 patches look good to me, thanks. >> Reviewed-by: Jonathan Tan " >> >> https://public-inbox.org/git/20180328161727.af10f596dffc8e01205c4...@google.com/ > > To

Re: man page for "git remote set-url" seems confusing/contradictory

Junio C Hamano wrote: > Jacob Keller writes: > >> Maybe something like: >> >> "Note that the push URL and the fetch URL, even though they can be set >> differently, are expected to refer to the same repository. For >> example, the fetch URL might use an unauthenticated

Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)

Derrick Stolee writes: > I'm sorry that my second message was terse. My response to v1 [1] was > >> I looked through these patches and only found one set of whitespace >> > > errors. Compiles and tests fine on my machine. > > Reviewed-by: > Derrick Stolee

Re: [PATCH v3] bisect: create 'bisect_flags' parameter in find_bisection()

Hi Harald, On Sun, 15 Apr 2018, Harald Nordgren wrote: > Make it possible to implement bisecting only on first parents or on > merge commits by passing flags to find_bisection(), instead of just > a 'find_all' boolean. > > Signed-off-by: Harald Nordgren Very nice.

Re: [PATCH v4] git{,-blame}.el: remove old bitrotting Emacs code

Thanks for working on this cruft cleanup Ævar and to Jonathan & Junio for asking questions about how to improve this transition for packagers & users. Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >>> On the other hand, the 6-lines of e-lisp you wrote for git.el

Re: [PATCH] git-send-email: Cc more people

On Wed, Apr 18 2018, Matthew Wilcox wrote: > From: Matthew Wilcox > > Several of my colleagues (and myself) have expressed surprise and > annoyance that git-send-email doesn't automatically pick up people who > are listed in patches as Reported-by: or Reviewed-by: or ...

Re: [PATCH v2 1/1] completion: load completion file for external subcommand

On Tue, Apr 10, 2018 at 10:28 PM, Florian Gamböck wrote: > Adding external subcommands to Git is as easy as to put an executable > file git-foo into PATH. Packaging such subcommands for a Linux > distribution can be achieved by unpacking the executable into /usr/bin > of the user's

Re: [PATCH v3 4/9] commit-graph.txt: update design document

Derrick Stolee writes: > We now calculate generation numbers in the commit-graph file and use > them in paint_down_to_common(). All right. > > Expand the section on generation numbers to discuss how the three > special generation numbers GENERATION_NUMBER_INFINITY,

Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)

On Mon, Apr 16, 2018 at 11:07 PM, Junio C Hamano wrote: > * en/rename-directory-detection-reboot (2018-04-16) 32 commits > - merge-recursive: fix check for skipability of working tree updates > - merge-recursive: Fix was_tracked() to quit lying with some renamed paths > -

Re: [RFC 01/10] submodule: add 'core.submodulesFile' to override the '.gitmodules' path

Hi Antonio, >> >> Good point! I wonder if the cleaner solution would be to just >> tell git to use HEAD:.gitmodules and not check out the file? >> then you would not need to come up with a namespace for names >> of the .gitmodules files and scatter them into the worktree as well? >> > > Any

Re: [PATCH 1/2] commit: fix --short and --porcelain

Hi Samuel, Welcome back. :-) On 18 April 2018 at 05:06, Samuel Lijin wrote: > Make invoking `git commit` with `--short` or `--porcelain` return status > code zero when there is something to commit. > > Mark the commitable flag in the wt_status object in the call to >

Re: [RFC PATCH] ident: don't cache default date

Am 18.04.2018 um 19:47 schrieb Phillip Wood: > On 18/04/18 12:27, Ævar Arnfjörð Bjarmason wrote: >> On Wed, Apr 18 2018, Phillip Wood wrote: >>> From: Phillip Wood >>> as it is created by running an separate instance of 'git commit'. If >>> the reworded commit is

Re: [PATCH v6 05/15] sequencer: introduce the `merge` command

On 14/04/18 01:51, Johannes Schindelin wrote: > Hi Phillip, > > On Fri, 13 Apr 2018, Phillip Wood wrote: > >> On 13/04/18 11:12, Phillip Wood wrote: >>> @@ -3030,7 +3029,8 @@ static int pick_commits(struct todo_list *todo_list, >>> struct replay_opts *opts) >>> return

Re: [PATCH v6 04/15] sequencer: introduce new commands to reset the revision

On 15/04/18 18:17, Philip Oakley wrote: > From: "Phillip Wood" > : Friday, April 13, 2018 11:03 AM >> If a label or reset command fails it is likely to be due to a >> typo. Rescheduling the command would make it easier for the user to fix >> the problem as they can just

Re: [RFC PATCH] ident: don't cache default date

Hi Ævar, thanks for your comments On 18/04/18 12:27, Ævar Arnfjörð Bjarmason wrote: > > On Wed, Apr 18 2018, Phillip Wood wrote: > >> From: Phillip Wood >> >> Now that the sequencer commits without forking when the commit message >> isn't edited all the commits that

Re: [PATCH] submodule--helper: don't print null in 'submodule status'

Hi Nguyễn, On Wed, Apr 18, 2018 at 7:53 AM, Nguyễn Thái Ngọc Duy wrote: > The function compute_rev_name() can return NULL sometimes (e.g. right > after 'submodule init'). The current code makes 'submodule status' > print this: > > 19d97bf5af05312267c2e874ee6bcf584d9e9681

Re: [PATCH] git-send-email: Cc more people

- On Apr 18, 2018, at 10:33 AM, rostedt rost...@goodmis.org wrote: > On Wed, 18 Apr 2018 07:05:03 -0700 > Matthew Wilcox wrote: > >> From: Matthew Wilcox >> >> Several of my colleagues (and myself) have expressed surprise and >> annoyance that

[PATCH 0/2] Fix --short and --porcelain options for commit

Hi all - I last contributed about a year ago and I've finally found the time to start contributing again, and hopefully I'll stick around this time. Figured I'd start with something small :) Samuel Lijin (2): commit: fix --short and --porcelain wt-status: const-ify all printf helper methods

[PATCH 2/2] wt-status: const-ify all printf helper methods

Change the method signatures of all printf helper methods to take a `const struct wt_status *` rather than a `struct wt_status *`. Signed-off-by: Samuel Lijin --- wt-status.c | 18 +- wt-status.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-)

[PATCH 1/2] commit: fix --short and --porcelain

Make invoking `git commit` with `--short` or `--porcelain` return status code zero when there is something to commit. Mark the commitable flag in the wt_status object in the call to `wt_status_collect()`, instead of in `wt_longstatus_print_updated()`, and simplify the logic in the latter function

Re: [PATCH/RFC 0/5] Keep all info in command-list.txt in git binary

On Wed, Apr 18, 2018 at 12:47 AM, Philip Oakley wrote: >>> > Is that something I should add to my todo to add a 'guide' category > >>> > etc.? >>> >>> I added it too [1]. Not sure if you want anything more on top though. > > > What I've seen is looking good - I've not had as

Re: [PATCH v3 0/2] fsexcludes: Add programmatic way to exclude files

I found a bug with how this patch series deals with untracked files. I'm going to retract this patch until I have time to create a new test case to demonstrate the bug and come up with a good fix. Ben

Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)

Junio C Hamano on Tue, 2018/04/17 15:07: > * ab/simplify-perl-makefile (2018-04-11) 1 commit > (merged to 'next' on 2018-04-17 at 4448756934) > + perl: fix installing modules from contrib > > Recent simplification of build procedure forgot a bit of tweak to > the build

Re: [PATCH/RFC] completion: complete all possible -no-

On Wed, Apr 18, 2018 at 5:43 AM, Junio C Hamano wrote: > So, the earlier mention of "clone --no-checkout" sounded about not > losing this historical practice, but (desirabilty of magic number 4 > aside) this "show first handful of --no-foo" feature is not about > historical

Re: [BUG] git p4 clone fails when p4 sizes does not return 'fileSize' key

Just to be clear - git-p4 does not use the p4 "sizes" command anywhere AFAIK. We are just talking about the output from "p4 print" and the "fileSize" key, right? --> Correct. Does that happen with the 17.2 version of p4? -->Correct. print() probably makes more sense; can we try to use the

[PATCH] submodule--helper: don't print null in 'submodule status'

The function compute_rev_name() can return NULL sometimes (e.g. right after 'submodule init'). The current code makes 'submodule status' print this: 19d97bf5af05312267c2e874ee6bcf584d9e9681 sha1collisiondetection ((null)) This ugly 'null' adds no value to the user using this command. More

FROM I.M.F

imf london.pdf Description: Adobe PDF document

Re: [PATCH v3 3/9] commit: use generations in paint_down_to_common()

On 4/18/2018 10:31 AM, Jakub Narebski wrote: Derrick Stolee writes: Define compare_commits_by_gen_then_commit_date(), which uses generation numbers as a primary comparison and commit date to break ties (or as a comparison when both commits do not have computed

Re: [PATCH] git-send-email: Cc more people

On Wed, 18 Apr 2018 07:05:03 -0700 Matthew Wilcox wrote: > From: Matthew Wilcox > > Several of my colleagues (and myself) have expressed surprise and > annoyance that git-send-email doesn't automatically pick up people who > are listed in patches as

Re: [PATCH v3 3/9] commit: use generations in paint_down_to_common()

Derrick Stolee writes: > Define compare_commits_by_gen_then_commit_date(), which uses generation > numbers as a primary comparison and commit date to break ties (or as a > comparison when both commits do not have computed generation numbers). > > Since the commit-graph

[PATCH] git-send-email: Cc more people

From: Matthew Wilcox Several of my colleagues (and myself) have expressed surprise and annoyance that git-send-email doesn't automatically pick up people who are listed in patches as Reported-by: or Reviewed-by: or ... many other tags that would seem (to us) to indicate

Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)

On Tue, Apr 17, 2018 at 11:05 AM, Stefan Beller wrote: >> * sb/submodule-move-nested (2018-03-29) 6 commits >> - submodule: fixup nested submodules after moving the submodule >> - submodule-config: remove submodule_from_cache >> - submodule-config: add repository argument

Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)

On 4/17/2018 9:04 PM, Junio C Hamano wrote: Stefan Beller writes: What's the doneness of this thing? I didn't recall seeing any response, especially ones that demonstrated the reviewer carefully read and thought about the issues surrounding the code. Not that I

Re: [PATCH 01/11] t9902-completion: add tests demonstrating issues with quoted pathnames

Hi Gábor, On Tue, 17 Apr 2018, SZEDER Gábor wrote: > Completion functions see all words on the command line verbatim, > including any backslash-escapes, single and double quotes that might > be there. Furthermore, git commands quote pathnames if they contain > certain special characters. All

[ANNOUNCE] Git Rev News edition 38

Hi everyone, The 38th edition of Git Rev News is now published: https://git.github.io/rev_news/2018/04/18/edition-38/ Thanks a lot to all the contributors: Jiang Xin, Jacob Keller, Luca Milanesio, Sergey Organov and Kaartic Sivaraam! Enjoy, Christian, Jakub, Markus and Gabriel.

Re: [RFC 01/10] submodule: add 'core.submodulesFile' to override the '.gitmodules' path

On Mon, 16 Apr 2018 14:22:35 -0700 Stefan Beller wrote: > On Mon, Apr 16, 2018 at 9:37 AM, Antonio Ospite wrote: > > On Thu, 12 Apr 2018 16:50:03 -0700 > > Stefan Beller wrote: > > > >> Hi Antonio, > >> > >> On Thu, Apr 12, 2018 at 3:20 PM,

Re: [RFC PATCH] ident: don't cache default date

On Wed, Apr 18 2018, Phillip Wood wrote: > From: Phillip Wood > > Now that the sequencer commits without forking when the commit message > isn't edited all the commits that are picked have the same committer > date. If a commit is reworded it's committer date will be

Re: [BUG] git p4 clone fails when p4 sizes does not return 'fileSize' key

On 17 April 2018 at 20:12, Thandesha VK wrote: > I have few cases where even p4 -G sizes (or p4 sizes) is not returning > the size value even with latest version of p4 (17.2). In that case, we > have to regenerate the digest for file save it - It mean something is > wrong with

[RFC PATCH] ident: don't cache default date

From: Phillip Wood Now that the sequencer commits without forking when the commit message isn't edited all the commits that are picked have the same committer date. If a commit is reworded it's committer date will be a later time as it is created by running an

Re: Bug: rebase -i creates committer time inversions on 'reword'

On 16/04/18 06:56, Johannes Sixt wrote: > > Am 15.04.2018 um 23:35 schrieb Junio C Hamano: >> Ah, do you mean we have an internal sequence like this, when "rebase >> --continue" wants to conclude an edit/reword? > > Yes, it's only 'reword' that is affected, because then subsequent picks > are

getur þú svarað mér

Re: [PATCH 0/3] completion: improvements for git stash

Thomas Gummerer writes: > In this series we stop completing the 'git stash save' subcommand in > git-completion.bash. The command has been deprecated for a while,... Anything deprecated in Oct 2017 is still too young in Git's timescale, but this is the right thing to do

I am waiting to hear from you soon,

From The international Investigation Financial Crime Unit Attention Beneficiary We need your urgent information . I am writing to inform you that I am Staff In the international investigation financial crime unit and I have discovered through our network E-mail system This Week that your

Re: [PATCH] send-email: avoid duplicate In-Reply-To/References

On 18.04.2018 02:54, Eric Wong wrote: > Stefan Agner wrote: >> This addresses the issue reported here: >> https://public-inbox.org/git/997160314bbafb3088a401f1c09cc...@agner.ch/ > > Thanks for bringing this up. > >> --- a/git-send-email.perl >> +++ b/git-send-email.perl >> @@

Re: [PATCH/RFC 0/5] Keep all info in command-list.txt in git binary

From: "Philip Oakley" : Tuesday, April 17, 2018 11:47 PM From: "Duy Nguyen" : Tuesday, April 17, 2018 5:48 PM On Tue, Apr 17, 2018 at 06:24:41PM +0200, Duy Nguyen wrote: On Sun, Apr 15, 2018 at 11:21 PM, Philip Oakley wrote: >