From: Elijah Newren
Signed-off-by: Elijah Newren
---
Documentation/CodingGuidelines | 2 +-
Documentation/RelNotes/1.7.0.2.txt | 2 +-
Documentation/RelNotes/1.7.10.4.txt| 2 +-
Documentation/RelNotes/1.7.12.3.txt| 2
ing a word in
commit-graph.txt.
Elijah Newren (1):
Documentation: fix a bunch of typos, both old and new
Documentation/CodingGuidelines | 2 +-
Documentation/RelNotes/1.7.0.2.txt | 2 +-
Documentation/RelNotes/1.7.10.4.txt| 2 +-
Document
* Added a new patch to the end of the series to stop making setup tests be
part of a separate test_expect_success block.
Elijah Newren (3):
merge-recursive: clean up get_renamed_dir_portion()
merge-recursive: fix merging a subdirectory into the root directory
t604[236]: do not run setup in
From: Elijah Newren
We allow renaming all entries in e.g. a directory named z/ into a
directory named y/ to be detected as a z/ -> y/ rename, so that if the
other side of history adds any files to the directory z/ in the mean
time, we can provide the hint that they should be moved to y/.
Th
From: Elijah Newren
Transform the setup "tests" to setup functions, and have the actual
tests call the setup functions. Advantages:
* Should make life easier for people working with webby CI/PR builds
who have to abuse mice (and their own index finger as well) in
order to s
From: Elijah Newren
Dscho noted a few things making this function hard to follow.
Restructure it a bit and add comments to make it easier to follow. The
restructurings include:
* There was a special case if-check at the end of the function
checking whether someone just renamed a file
Sorry for the long delay before getting back to this; the other stuff
I was working on took longer than expected.
On Mon, Oct 14, 2019 at 3:42 AM Johannes Schindelin
wrote:
> On Sat, 12 Oct 2019, Elijah Newren wrote:
> > On Sat, Oct 12, 2019 at 1:37 PM Johannes Schindelin
&
On Mon, Oct 21, 2019 at 1:50 PM Derrick Stolee wrote:
> I ran a few of the performance tests against the Linux repository
> using v2.22.0, v2.23.0, and the new v2.24.0-rc0. I thought it worth
> pointing out that the drastic performance improvements are due to
> turning on the commit-graph by defa
On Tue, Oct 15, 2019 at 6:56 AM Derrick Stolee via GitGitGadget
wrote:
> Updates in V4:
>
> * Updated hashmap API usage to respond to ew/hashmap
>
>
> * Responded to detailed review by Elijah. Thanks!
>
>
> * Marked the feature as experimental in git-sparse-checkout.txt the same
>way that g
On Tue, Oct 15, 2019 at 6:56 AM Derrick Stolee via GitGitGadget
wrote:
> +DESCRIPTION
> +---
> +
> +Initialize and modify the sparse-checkout configuration, which reduces
> +the checkout to a set of directories given by a list of prefixes.
> +
> +THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR
On Tue, Oct 15, 2019 at 6:25 PM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> >> * en/merge-recursive-directory-rename-fixes (2019-10-12) 2 commits
> >> (merged to 'next' on 2019-10-15 at ebfdc3ff7b)
> >> + merge-recursive: fix
On Tue, Oct 15, 2019 at 10:39 AM Johannes Schindelin
wrote:
>
> Hi Elijah,
>
> On Tue, 15 Oct 2019, Elijah Newren wrote:
>
> > On Tue, Oct 15, 2019 at 2:04 AM Junio C Hamano wrote:
> > > * en/fast-imexport-nested-tags (2019-10-04) 8 commits
> > > (merge
On Tue, Oct 15, 2019 at 2:04 AM Junio C Hamano wrote:
> * en/fast-imexport-nested-tags (2019-10-04) 8 commits
> (merged to 'next' on 2019-10-07 at 3e75779e10)
> + fast-export: handle nested tags
> + t9350: add tests for tags of things other than a commit
> + fast-export: allow user to request
Hi Dscho,
Thanks for the reviews!
On Sat, Oct 12, 2019 at 1:37 PM Johannes Schindelin
wrote:
> On Fri, 11 Oct 2019, Elijah Newren via GitGitGadget wrote:
>
[...]
> > @@ -1980,6 +1990,25 @@ static void get_renamed_dir_portion(const char
> > *old_path, co
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
wrote:
>
> This series makes the sparse-checkout feature more user-friendly. While
> there, I also present a way to use a limited set of patterns to gain a
> significant performance boost in very large repositories.
>
> Sparse-checkout
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
wrote:
>
> From: Derrick Stolee
>
> During the development of the sparse-checkout "cone mode" feature,
> an incorrect placement of the initializer for "use_cone_patterns = 1"
> caused warnings to show up when a .gitignore file was pre
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
wrote:
>
> From: Derrick Stolee
>
> If two 'git sparse-checkout set' subcommands are launched at the
> same time, the behavior can be unexpected as they compete to write
> the sparse-checkout file and update the working directory.
>
>
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
wrote:
>
> From: Derrick Stolee
>
> The sparse-checkout builtin used 'git read-tree -mu HEAD' to update the
> skip-worktree bits in the index and to update the working directory.
> This extra process is overly complex, and prone to fa
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
wrote:
>
> From: Derrick Stolee
>
> The read-tree builtin has a --verbose option that signals to show
> progress and other data while updating the index. Update this to
> be on by default when stderr is a terminal window.
>
> This wil
On Fri, Oct 11, 2019 at 3:26 PM Elijah Newren wrote:
>
> On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
> Looks good, thanks for the fixes. I'm still slightly worried about
> folks not looking at the docs and calling sparse-checkout set without
> calling
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
wrote:
>
> From: Derrick Stolee
>
> The 'git sparse-checkout set' subcommand takes a list of patterns
> and places them in the sparse-checkout file. Then, it updates the
> working directory to match those patterns. For a large list of
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
wrote:
>
> From: Derrick Stolee
>
> The 'git sparse-checkout set' subcommand takes a list of patterns
> as arguments and writes them to the sparse-checkout file. Then, it
> updates the working directory using 'git read-tree -mu HEAD'.
On Mon, Oct 7, 2019 at 11:26 AM Derrick Stolee wrote:
>
> On 10/5/2019 8:30 PM, Elijah Newren wrote:
> > On Sat, Oct 5, 2019 at 3:44 PM Elijah Newren wrote:
> >>
> >> On Thu, Sep 19, 2019 at 3:07 PM Derrick Stolee via GitGitGadget
> >> wrote:
> >&g
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
wrote:
> During the 'git sparse-checkout init' call, we must first look
> to see if HEAD is valid, since 'git clone' does not have a valid
> HEAD.
...does not have a valid HEAD by the time git_sparse_checkout_init() is called?
> The
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
wrote:
> ++
> +The init subcommand also enables the 'extensions.worktreeConfig' setting
> +and sets the `core.sparseCheckout` setting in the worktree-specific config
> +file. This prevents the sparse-checkout feature from interfering w
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget
wrote:
> +SPARSE CHECKOUT
> +
> +
> +"Sparse checkout" allows populating the working directory sparsely.
> +It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell
> +Git whether a file in the working di
From: Elijah Newren
We allow renaming all entries in e.g. a directory named z/ into a
directory named y/ to be detected as a z/ -> y/ rename, so that if the
other side of history adds any files to the directory z/ in the mean
time, we can provide the hint that they should be moved to y/.
Th
From: Elijah Newren
Dscho noted a few things making this function hard to follow.
Restructure it a bit and add comments to make it easier to follow. The
restructurings include:
* There was a special case if-check at the end of the function
checking whether someone just renamed a file
directory
First patch best viewed with a --histogram diff, which I sadly don't know
how to make gitgitgadget generate.
Elijah Newren (2):
merge-recursive: clean up get_renamed_dir_portion()
merge-recursive: fix merging a subdirectory into the root directory
merge-recurs
On Fri, Oct 11, 2019 at 9:42 AM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> >> * en/fast-imexport-nested-tags (2019-10-04) 8 commits
> >> (merged to 'next' on 2019-10-07 at 3e75779e10)
> >> + fast-export: handle nested tags
> >
// Dropping a few folks from the cc list as the thread is so old that
I think it should just be the normal git mailing list.
Hi Dscho,
On Wed, Oct 9, 2019 at 1:39 PM Johannes Schindelin
wrote:
>
> Hi Elijah,
>
> sorry about the blast from the past, but I just stumbled over something
> I could no
On Fri, Oct 11, 2019 at 12:35 AM Junio C Hamano wrote:
> [Cooking]
[...]
> * en/fast-imexport-nested-tags (2019-10-04) 8 commits
> (merged to 'next' on 2019-10-07 at 3e75779e10)
> + fast-export: handle nested tags
> + t9350: add tests for tags of things other than a commit
> + fast-export:
gt; > Acked-by: Jonathan Tan
> > Acked-by: Thomas Gummerer
> > Acked-by: brian m. carlson
> > Acked-by: Elijah Newren
> >
> > Junio, would you mind picking it up, please?
>
> I trust you enough that I won't go back to the cited messages to
> double che
On Mon, Oct 7, 2019 at 7:36 PM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> > In commit 208e69a4ebce ("merge-recursive: fix the diff3 common ancestor
>
> I think the above was an earlier incarntion of what is now known as
> 8e4ec337 ("merge-recursive: f
On Mon, Oct 7, 2019 at 11:52 PM Josef Wolf wrote:
>
> Hello,
>
> This is a repost, since the original message seems to have been lost somehow.
>
>
> I am trying to add a file to an arbitrary branch without touching the current
> worktree with as little overhead as possible. This should work no mat
On Mon, Oct 7, 2019 at 10:05 AM Semyon Kirnosenko wrote:
>
> On 2019-10-07 20:43, SZEDER Gábor wrote:
> > On Mon, Oct 07, 2019 at 07:14:25PM +0400, Semyon Kirnosenko wrote:
> >> I have a question about log command.
> >> Probably I'm just missing something but anyway.
> >> I can illustrate the ques
l()
This resulted in garbage strings being printed for the virtual merge
bases, which was visible in git.git by just merging commit b744c3af07
into commit 6d8cb22a4f. There are two ways to fix this: set
opt->ancestor to NULL after using it to avoid re-use, or add a
!opt->priv->call_depth
On Thu, Sep 19, 2019 at 1:45 PM Derrick Stolee via GitGitGadget
wrote:
>
> From: Derrick Stolee
>
> The sparse-checkout feature can have quadratic performance as
> the number of patterns and number of entries in the index grow.
> If there are 1,000 patterns and 1,000,000 entries, this time can
>
On Thu, Sep 19, 2019 at 10:15 AM Jeff Hostetler via GitGitGadget
wrote:
>
> From: Jeff Hostetler
>
> When Git updates the working directory with the sparse-checkout
> feature enabled, the unpack_trees() method calls clear_ce_flags()
> to update the skip-wortree bits on the cache entries. This
> c
On Thu, Sep 19, 2019 at 1:46 PM Derrick Stolee via GitGitGadget
wrote:
>
> From: Derrick Stolee
>
> The instructions for disabling a sparse-checkout to a full
> working directory are complicated and non-intuitive. Add a
> subcommand, 'git sparse-checkout disable', to perform those
> steps for the
On Sat, Oct 5, 2019 at 3:44 PM Elijah Newren wrote:
>
> On Thu, Sep 19, 2019 at 3:07 PM Derrick Stolee via GitGitGadget
> wrote:
> > +static int write_patterns_and_update(struct pattern_list *pl)
> > +{
> > + char *sparse_filename;
> > + FILE *fp;
On Thu, Sep 19, 2019 at 3:07 PM Derrick Stolee via GitGitGadget
wrote:
> +static int write_patterns_and_update(struct pattern_list *pl)
> +{
> + char *sparse_filename;
> + FILE *fp;
> +
> + sparse_filename = get_sparse_checkout_filename();
> + fp = fopen(sparse_filename, "w
On Thu, Sep 19, 2019 at 3:06 PM Derrick Stolee via GitGitGadget
wrote:
> During the 'git sparse-checkout init' call, we must first look
> to see if HEAD is valid, or else we will fail while trying to
> update the working directory. The first checkout will actually
> update the working directory c
On Thu, Sep 19, 2019 at 3:06 PM Derrick Stolee via GitGitGadget
wrote:
>
> From: Derrick Stolee
>
> Getting started with a sparse-checkout file can be daunting. Help
> users start their sparse enlistment using 'git sparse-checkout init'.
> This will set 'core.sparseCheckout=true' in their config,
On Thu, Sep 19, 2019 at 1:45 PM Derrick Stolee via GitGitGadget
wrote:
>
> From: Derrick Stolee
>
> The sparse-checkout feature is mostly hidden to users, as its
> only documentation is supplementary information in the docs for
> 'git read-tree'. In addition, users need to know how to edit the
>
On Fri, Oct 4, 2019 at 2:29 AM Phillip Wood wrote:
>
> Hi Rohit
>
> On 07/09/2019 12:50, Rohit Ashiwal wrote:
> > There are two backends available for rebasing, viz, the am and the
> > interactive. Naturally, there shall be some features that are
> > implemented in one but not in the other. One su
On Fri, Oct 4, 2019 at 4:49 AM Phillip Wood wrote:
>
> Hi Junio
>
> On 03/10/2019 06:04, 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
On Wed, Oct 2, 2019 at 10:22 PM Junio C Hamano wrote:
>
> * en/fast-imexport-nested-tags (2019-10-02) 8 commits
> - fast-export: handle nested tags
> - t9350: add tests for tags of things other than a commit
> - fast-export: allow user to request tags be marked with --mark-tags
> - fast-export
Signed-off-by: Elijah Newren
---
builtin/fast-export.c | 30 ++
t/t9350-fast-export.sh | 2 +-
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d32e1e9327..58a74de42a 100644
--- a/builtin/fast
fast-import has support for both an --import-marks flag and an
--import-marks-if-exists flag; the latter of which will not die() if the
file does not exist. fast-export only had support for an --import-marks
flag; add an --import-marks-if-exists flag for consistency.
Signed-off-by: Elijah Newren
Multiple changes here:
* add a test for a tag of a blob
* add a test for a tag of a tag of a commit
* add a comment to the tests for (possibly nested) tags of trees,
making it clear that these tests are doing much less than you might
expect
Signed-off-by: Elijah Newren
---
t/t9350
tag has already been
imported when using --export-marks and --import-marks.
Fix these problems by allowing an optional mark label for tags.
Signed-off-by: Elijah Newren
---
Documentation/git-fast-import.txt | 1 +
fast-import.c | 3 ++-
t/t9300-fast-import.sh
-off-by: Elijah Newren
---
Documentation/git-fast-export.txt | 17 +
builtin/fast-export.c | 7 +++
t/t9350-fast-export.sh| 14 ++
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-fast-export.txt
b
ither way nested tags imply the need to delete temporary inner tag
references.
Helped-by: René Scharfe
Signed-off-by: Elijah Newren
---
fast-import.c | 27 +++
t/t9300-fast-import.sh | 13 +
2 files changed, 40 insertions(+)
diff --git a/fast-impor
ts to their most recent non-pruned ancestor.
Signed-off-by: Elijah Newren
---
Documentation/git-fast-import.txt | 22 +++
fast-import.c | 62 ++-
t/t9300-fast-import.sh| 5 +++
3 files changed, 79 insertions(+), 10 deletions(-)
can finally handle the git.git repo.
Changes since v2 (full range-diff below):
- Code cleanup of patch 2 suggested by René
Elijah Newren (8):
fast-export: fix exporting a tag and nothing else
fast-import: fix handling of deleted tags
fast-import: allow tags to be identified by mark labels
runing is not wanted. (It is slightly weird that
--reference-excluded-parents isn't the default with a separate
--prune-excluded-parents flag, but backward compatibility concerns
resulted in the current defaults.)
Signed-off-by: Elijah Newren
---
builtin/fast-export.c | 7 ++-
t/
On Wed, Oct 2, 2019 at 1:10 PM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> > I see you picked up this corrected series in pu; thanks. However,
> > your merge commit, 2a99d6b6ff7c ("Merge branch
> > 'en/fast-imexport-nested-tags' into pu"
On Tue, Oct 1, 2019 at 11:33 PM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> > * other commands (archive, bisect, clean?, gitk, shortlog, blame,
> > fsck?, etc.) likely need to pay attention to sparsity patterns as
> > well, but there are some special cases:
&
Hi Junio,
On Mon, Sep 30, 2019 at 2:10 PM Elijah Newren wrote:
>
> This series improves the incremental export story for fast-export and
> fast-import (--export-marks and --import-marks fell a bit short),
> fixes a couple small export/import bugs, and enables handling nested
On Tue, Oct 1, 2019 at 12:39 PM Elijah Newren wrote:
>
> On Tue, Oct 1, 2019 at 12:35 PM Denton Liu wrote:
> >
> > Hi Elijah,
> >
> > Sorry for dragging out this thread for so long...
> >
> > On Tue, Oct 01, 2019 at 11:55:24AM -0700, Elijah Newren wro
On Tue, Oct 1, 2019 at 12:35 PM Denton Liu wrote:
>
> Hi Elijah,
>
> Sorry for dragging out this thread for so long...
>
> On Tue, Oct 01, 2019 at 11:55:24AM -0700, Elijah Newren wrote:
>
> [...]
>
> > diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
e only reproduced
for some folks and not others and provided the testcase, and I looked
through the remainder of the series and noted the do_match_pathspec()
call that should have the same check.
Co-authored-by: Denton Liu
Co-authored-by: SZEDER Gábor
Signed-off-by: Elijah Newren
---
Note: Applie
On Tue, Oct 1, 2019 at 11:41 AM Denton Liu wrote:
>
> Hi Elijah,
>
> On Tue, Oct 01, 2019 at 11:30:05AM -0700, Elijah Newren wrote:
>
> [...]
>
> > diff --git a/dir.c b/dir.c
> > index 7ff79170fc..bd39b86be4 100644
> > --- a/dir.c
> > +++
e only reproduced
for some folks and not others and provided the testcase, and I looked
through the remainder of the series and noted the do_match_pathspec()
call that should have the same check.
Co-authored-by: Denton Liu
Co-authored-by: SZEDER Gábor
Signed-off-by: Elijah Newren
---
Note: Applie
one merge base, set the label
to:
"constructed merge base"
Note that callers of merge_recursive_generic() include the builtin
commands git-am (in combination with git apply --build-fake-ancestor),
git-merge-recursive, and git-stash.
Helped-by: Jeff King
Signed-off-by: Elijah New
On Tue, Oct 1, 2019 at 9:48 AM Derrick Stolee wrote:
>
> On 9/19/2019 10:43 AM, Derrick Stolee via GitGitGadget wrote:
> > This series makes the sparse-checkout feature more user-friendly. While
> > there, I also present a way to use a limited set of patterns to gain a
> > significant performance
On Tue, Oct 1, 2019 at 6:30 AM Bert Wesarg wrote:
>
> Hi,
>
> On Tue, Oct 1, 2019 at 3:06 PM Matheus Tavares Bernardino
> wrote:
> >
> > Hi,
> >
> > During Git Summit it was mentioned that git-grep searches outside
> > sparsity pattern which is not aligned with user expectation. I took a
> > quic
On Mon, Sep 30, 2019 at 3:31 PM Denton Liu wrote:
>
> Hi Elijah,
>
> On Mon, Sep 30, 2019 at 12:11:06PM -0700, Elijah Newren wrote:
> > Commits 404ebceda01c ("dir: also check directories for matching
> > pathspecs", 2019-09-17) and 89a1f4aaf765 ("dir: if our
one merge base, set the label
to:
"constructed merge base"
Note that callers of merge_recursive_generic() include the builtin
commands git-am (in combination with git apply --build-fake-ancestor),
git-merge-recursive, and git-stash.
Reported-by: Jeff King
Signed-off-by: Elijah
On Mon, Sep 30, 2019 at 3:55 PM Elijah Newren wrote:
>
> In commit 743474cbfa8b ("merge-recursive: provide a better label for
> diff3 common ancestor", 2019-08-17), the label for the common ancestor
> was changed from always being
>
> "merged common ance
;constructed merge base"
Note that users of merge_recursive_generic include the builtin commands
git-am (in combination with git apply --build-fake-ancestor),
git-merge-recursive, and git-stash.
Reported-by: Jeff King
Signed-off-by: Elijah Newren
---
Applies to the top of en/merge-recursive-
Multiple changes here:
* add a test for a tag of a blob
* add a test for a tag of a tag of a commit
* add a comment to the tests for (possibly nested) tags of trees,
making it clear that these tests are doing much less than you might
expect
Signed-off-by: Elijah Newren
---
t/t9350
can finally handle the git.git repo.
Changes since v1 (full range-diff below):
- Fixed an issue integrating with next/pu (in particular, with
jk/fast-import-history-bugfix)
Elijah Newren (8):
fast-export: fix exporting a tag and nothing else
fast-import: fix handling of deleted tags
fast-import has support for both an --import-marks flag and an
--import-marks-if-exists flag; the latter of which will not die() if the
file does not exist. fast-export only had support for an --import-marks
flag; add an --import-marks-if-exists flag for consistency.
Signed-off-by: Elijah Newren
-off-by: Elijah Newren
---
Documentation/git-fast-export.txt | 17 +
builtin/fast-export.c | 7 +++
t/t9350-fast-export.sh| 14 ++
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-fast-export.txt
b
Signed-off-by: Elijah Newren
---
builtin/fast-export.c | 30 ++
t/t9350-fast-export.sh | 2 +-
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d32e1e9327..58a74de42a 100644
--- a/builtin/fast
runing is not wanted. (It is slightly weird that
--reference-excluded-parents isn't the default with a separate
--prune-excluded-parents flag, but backward compatibility concerns
resulted in the current defaults.)
Signed-off-by: Elijah Newren
---
builtin/fast-export.c | 7 ++-
t/
tag has already been
imported when using --export-marks and --import-marks.
Fix these problems by allowing an optional mark label for tags.
Signed-off-by: Elijah Newren
---
Documentation/git-fast-import.txt | 1 +
fast-import.c | 3 ++-
t/t9300-fast-import.sh
ts to their most recent non-pruned ancestor.
Signed-off-by: Elijah Newren
---
Documentation/git-fast-import.txt | 22 +++
fast-import.c | 62 ++-
t/t9300-fast-import.sh| 5 +++
3 files changed, 79 insertions(+), 10 deletions(-)
ither way nested tags imply the need to delete temporary inner tag
references.
Signed-off-by: Elijah Newren
---
fast-import.c | 29 +
t/t9300-fast-import.sh | 13 +
2 files changed, 42 insertions(+)
diff --git a/fast-import.c b/fast-import.c
to the slight differences in logic used (well, that and the
slightly unusual fact that we don't want empty pathspecs to remove
untracked directories by default).
Helped-by: Denton Liu
Helped-by: SZEDER Gábor
Signed-off-by: Elijah Newren
---
This patch applies on top of en/clean-n
Hi Denton,
On Thu, Sep 26, 2019 at 1:35 PM Denton Liu wrote:
>
> On Wed, Sep 25, 2019 at 02:55:30PM -0700, Denton Liu wrote:
> > Looks correct to me. I don't see why this wouldn't reproduce. I'll send
> > you more information if I figure anything else out.
>
> I looked into it a little more and I
particular, there's not much discussion of enforcement or
> responsibilities, and I think those are important for the "making people
> comfortable" goal). But maybe there are bits we'd like to pick out for
> other documents; not so much "_what_ we expect" as &quo
Hi Denton,
On Wed, Sep 25, 2019 at 1:39 PM Denton Liu wrote:
>
> Hi Elijah,
>
> I ran into a segfault on MacOS. I managed to bisect it down to
> 404ebceda0 (dir: also check directories for matching pathspecs,
> 2019-09-17), which should be the patch in the parent thread. The test
> case below wor
Multiple changes here:
* add a test for a tag of a blob
* add a test for a tag of a tag of a commit
* add a comment to the tests for (possibly nested) tags of trees,
making it clear that these tests are doing much less than you might
expect
Signed-off-by: Elijah Newren
---
t/t9350
can finally handle the git.git repo.
Elijah Newren (8):
fast-export: fix exporting a tag and nothing else
fast-import: fix handling of deleted tags
fast-import: allow tags to be identified by mark labels
fast-import: add support for new 'alias' command
fast-export: add support fo
Signed-off-by: Elijah Newren
---
builtin/fast-export.c | 30 ++
t/t9350-fast-export.sh | 2 +-
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index d32e1e9327..58a74de42a 100644
--- a/builtin/fast
fast-import has support for both an --import-marks flag and an
--import-marks-if-exists flag; the latter of which will not die() if the
file does not exist. fast-export only had support for an --import-marks
flag; add an --import-marks-if-exists flag for consistency.
Signed-off-by: Elijah Newren
ts to their most recent non-pruned ancestor.
Signed-off-by: Elijah Newren
---
Documentation/git-fast-import.txt | 22 +++
fast-import.c | 62 ++-
t/t9300-fast-import.sh| 5 +++
3 files changed, 79 insertions(+), 10 deletions(-)
tag has already been
imported when using --export-marks and --import-marks.
Fix these problems by allowing an optional mark label for tags.
Signed-off-by: Elijah Newren
---
Documentation/git-fast-import.txt | 1 +
fast-import.c | 3 ++-
t/t9300-fast-import.sh
runing is not wanted. (It is slightly weird that
--reference-excluded-parents isn't the default with a separate
--prune-excluded-parents flag, but backward compatibility concerns
resulted in the current defaults.)
Signed-off-by: Elijah Newren
---
builtin/fast-export.c | 7 ++-
t/
-off-by: Elijah Newren
---
Documentation/git-fast-export.txt | 17 +
builtin/fast-export.c | 7 +++
t/t9350-fast-export.sh| 14 ++
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-fast-export.txt
b
ither way nested tags imply the need to delete temporary inner tag
references.
Signed-off-by: Elijah Newren
---
fast-import.c | 29 +
t/t9300-fast-import.sh | 13 +
2 files changed, 42 insertions(+)
diff --git a/fast-import.c b/fast-import.c
On Fri, Sep 20, 2019 at 3:07 PM CB Bailey wrote:
>
> From: CB Bailey
>
> Signed-off-by: CB Bailey
> ---
> t/t4038-diff-combined.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh
> index d4afe12554..b9d876efa2 100755
>
On Thu, Sep 19, 2019 at 11:37 AM Derrick Stolee wrote:
>
> During the Virtual Git Contributors' Summit, Dscho brought up the topic of
> "Inclusion & Diversity". We discussed ideas for how to make the community
> more welcoming to new contributors of all kinds. Let's discuss some of
> the ideas we
sometimes cause dir_in_way() to return true.
>
> Teach dir_in_way() to also check for symlinks in leading paths before
> reporting whether a directory is in the way.
>
> Helped-by: Elijah Newren
> Signed-off-by: Jonathan Tan
> ---
> Changes from v1:
>
> - Used has_sym
On Wed, Sep 18, 2019 at 6:55 AM Derrick Stolee wrote:
>
> On 8/23/2019 7:30 PM, Elijah Newren wrote:
> > On Tue, Aug 20, 2019 at 8:12 AM Derrick Stolee via GitGitGadget
> > wrote:
> >>
...
> >> diff --git a/t/t1091-sparse-checkout-builtin.sh
> >> b/
quot;In
particular, the presence of a symlink should be treated much the same
as the presence of a file; since dir_in_way() is only checking to see
if there is a directory in the way, we don't want symlinks in leading
paths to sometimes cause dir_in_way() to return true."
>
> Helpe
ve to those flags), it only fixes the handling when given
a single -f. See
https://public-inbox.org/git/20190905212043.gc32...@szeder.dev/ for more
discussion of the -ffd[X?] bugs.
Signed-off-by: Elijah Newren
---
Documentation/git-clean.txt | 6 +++---
builtin/clean.c | 2 ++
dir.c
1 - 100 of 1788 matches
Mail list logo
