On Fri, Oct 19, 2018 at 11:06:25AM +0900, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
> > On Mon, Oct 15, 2018 at 03:12:00AM -0700, Johannes Schindelin via
> > GitGitGadget wrote:
> >> diff --git a/ci/lib.sh b/ci/lib.sh
> >> index 06970f7213..8532555b4e 100755
> >> --- a/ci/lib.sh
> >> +++
SZEDER Gábor writes:
>> >> +if test true = "$TRAVIS"
>> >> +then
>> >> +...
>> >> + export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
>> >> + export GIT_TEST_OPTS="--verbose-log -x --immediate"
>> >> +fi
>> > ...
>
> $GIT_PROVE_OPTS and $GIT_TEST_OPTS, however, are only used in
>
SZEDER Gábor writes:
>> if (entry)
>> -fprintf(out, "\n%c Branch %s\n", comment_line_char,
>> entry->string);
>> +strbuf_addf(out, "\n%c Branch %s\n", comment_line_char,
>> entry->string);
>> else
>> -
On Thu, Oct 18 2018, Ævar Arnfjörð Bjarmason wrote:
> +static void init_cmd_history(struct strbuf *env, struct string_list
> *cmd_list)
> +{
> + const char *old = getenv(COMMAND_HISTORY_ENVIRONMENT);
> + struct strbuf **cmd_history, **ptr;
> +
> + if (!old || !*old)
> +
Dear International Sales & Marketing Director,
Zhejiang Wuchuan Industrial Co., Ltd
Hello, this is Eiichi Hasegawa from GIFTEX TOKYO Show Management.
Are you interested in meeting more buyers in Japan?
If yes, GIFTEX TOKYO 2019 [January], Japan's leading trade fair for gifts,
lifestyle goods &
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
Two large set of topics on
Stefan Beller writes:
> This rerolls sb/more-repo-in-api.
> It applies on nd/the-index merged with ds/reachable and is available via
> git fetch https://github.com/stefanbeller/git object-store-final-3
Thanks. Luckily we have both of these prerequisites in 'master'
now, o hopefully this
On 10/19/2018 2:02 AM, Junio C Hamano wrote:
* ds/ci-commit-graph-and-midx (2018-10-19) 1 commit
- ci: add optional test variables
One of our CI tests to run with "unusual/experimental/random"
settings now also uses commti-graph and midx.
Will merge to 'next'.
On Fri, Oct 19, 2018 at 03:02:22PM +0900, Junio C Hamano wrote:
> Two large set of topics on "rebase in C" and "rebase -i in C" are
> now in 'next'.
I see occasional failures in 't5520-pull.sh':
expecting success:
test_config rebase.autostash true &&
test_pull_autostash --rebase
Hi Luca,
On Thu, 18 Oct 2018, Luca Weiss wrote:
> See subject, would be quite useful to have this. ("Countermand commit.gpgSign
> configuration variable that is set to force each and every commit to be
> signed.")
Have you tried the built-in rebase? It's already available in `next`, and
it is
Hi there,
tested on both, git 2.18 and git 2.19.1:
moving a file with `git mv` from a project to a submodule results in an
**undefined state** of the local repository.
It breaks up the submodule (it's still in .gitmodules, but not
accessable via `git submodule`), and is not reversible on local
On Fri, Oct 19, 2018 at 12:12 PM Ben Peart wrote:
> Add a reset.quiet config setting that sets the default value of the --quiet
> flag when running the reset command. This enables users to change the
> default behavior to take advantage of the performance advantages of
> avoiding the scan for
On Fri, Oct 19, 2018 at 12:36:44PM -0400, Eric Sunshine wrote:
> On Fri, Oct 19, 2018 at 12:12 PM Ben Peart wrote:
> > Add a reset.quiet config setting that sets the default value of the --quiet
> > flag when running the reset command. This enables users to change the
> > default behavior to
> +test_expect_success 'diff --no-index from repo subdir with absolute paths' '
I was late looking at the test, and was about to propose to guard it to run only
on Windows (as this test seems of little use in other OS), but after thinking
about it I think we should keep it as-is, as there may be
On 10/19/2018 1:11 PM, Jeff King wrote:
On Fri, Oct 19, 2018 at 01:10:34PM -0400, Eric Sunshine wrote:
On Fri, Oct 19, 2018 at 12:46 PM Jeff King wrote:
On Fri, Oct 19, 2018 at 12:36:44PM -0400, Eric Sunshine wrote:
How does the user reverse this for a particular git-reset invocation?
Hi Peff,
On Fri, Oct 19, 2018 at 10:18 AM Jeff King wrote:
>
> Hi Elijah,
>
> Playing with -Wunused-parameters, I notice there are several functions
> with unused parameters in merge-recursive.c. The patch below drops them
> all. We know they're not being used, so it can't make anything _worse_,
Hi,
Le 19/10/2018 à 14:46, SZEDER Gábor a écrit :
> On Fri, Oct 19, 2018 at 03:02:22PM +0900, Junio C Hamano wrote:
>> Two large set of topics on "rebase in C" and "rebase -i in C" are
>> now in 'next'.
>
> I see occasional failures in 't5520-pull.sh':
>
> […]
>
> When running t5520 in a loop,
--with-tree=
When using --error-unmatch to expand the user supplied (i.e.
path pattern) arguments to paths, pretend that paths which were
removed in the index since the named are still present.
Using this option with -s or -u options does not
On Mon, Sep 03, 2018 at 08:09:27PM +0200, Nguyễn Thái Ngọc Duy wrote:
> diff --git a/submodule.c b/submodule.c
> index 50cbf5f13e..c0c1224760 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -766,7 +766,8 @@ static void collect_changed_submodules_cb(struct
> diff_queue_struct *q,
> * have a
On Fri, Oct 19, 2018 at 7:52 AM Nguyễn Thái Ngọc Duy wrote:
>
> Stefan I see you start removing more references of the_repository in
> another series (haven't really looked at it yet) so this is just heads
> up so we could coordinate if needed. Still WIP, not really ready for
> review yet.
I'll
From: Ben Peart
This itteration avoids the refresh_index() call completely if 'quiet'.
The advantage of this is that "git refresh" without any pathspec is also
significantly sped up.
Also added a notification if finding unstaged changes after reset takes
longer than 2 seconds to make users
From: Ben Peart
When git reset is run with the --quiet flag, don't bother finding any
additional unstaged changes as they won't be output anyway. This speeds up
the git reset command by avoiding having to lstat() every file looking for
changes that aren't going to be reported anyway.
The
From: Ben Peart
refresh_index() is done after a reset command as an optimization. Because
it can be an expensive call, warn the user if it takes more than 2 seconds
and tell them how to avoid it using the --quiet command line option or
reset.quiet config setting.
Signed-off-by: Ben Peart
---
On Wed, Oct 10, 2018 at 11:59:38AM -0400, Ben Peart wrote:
> +static unsigned long load_cache_entries_threaded(struct index_state *istate,
> const char *mmap, size_t mmap_size,
> + unsigned long src_offset, int nr_threads, struct
> index_entry_offset_table *ieot)
The
On Fri, Oct 19, 2018 at 06:53:01PM +0200, Duy Nguyen wrote:
> > OK, that all makes sense. I need to either drop it or mark it unused to
> > satisfy -Wunused-parameters.
>
> Aha! I thought you looked deeply into this and was very confused. How
> could you have found the time :D
To be fair,
git diff can be invoked with absolute paths. Typically, this triggers
the --no-index case. Then the absolute paths remain in the file names
that are printed in the output.
There is one peculiarity, though: When the command is invoked from a
a sub-directory in a repository, then it is attempted to
On Fri, Oct 19, 2018 at 12:46 PM Jeff King wrote:
> On Fri, Oct 19, 2018 at 12:36:44PM -0400, Eric Sunshine wrote:
> > How does the user reverse this for a particular git-reset invocation?
> > There is no --no-quiet or --verbose option.
> >
> > Perhaps you want to use OPT__VERBOSITY() instead of
On 10/19/2018 12:46 PM, Jeff King wrote:
On Fri, Oct 19, 2018 at 12:36:44PM -0400, Eric Sunshine wrote:
On Fri, Oct 19, 2018 at 12:12 PM Ben Peart wrote:
Add a reset.quiet config setting that sets the default value of the --quiet
flag when running the reset command. This enables users to
On Fri, Oct 19, 2018 at 01:10:34PM -0400, Eric Sunshine wrote:
> On Fri, Oct 19, 2018 at 12:46 PM Jeff King wrote:
> > On Fri, Oct 19, 2018 at 12:36:44PM -0400, Eric Sunshine wrote:
> > > How does the user reverse this for a particular git-reset invocation?
> > > There is no --no-quiet or
On Fri, Oct 19, 2018 at 6:42 PM Jeff King wrote:
> > > I don't see anything in the "Kill the_index, final part" series that
> > > would need it.
> >
> > Yeah. Killing the_index is just the first small step (didn't look that
> > small when I started). Now it's all about the_repository ;-) and we
>
> >
> > Yeah. Killing the_index is just the first small step (didn't look that
> > small when I started). Now it's all about the_repository ;-) and we
> > have like 400 references of it just in library code.
>
> I suspect it is much worse than that, even. There are many spots that
> likely are
Commit 174d131fc9 (submodule.c: remove implicit dependency on
the_index - 2018-09-21) makes collect_changed_submodules() take a
"struct index_state *" as argument even if it's not really used. My
bad.
Instead of deleting this argument and fixing up all call sites. Let's
take this opportunity to
On Fri, Oct 19, 2018 at 6:20 PM Jeff King wrote:
>
> On Mon, Sep 03, 2018 at 08:09:27PM +0200, Nguyễn Thái Ngọc Duy wrote:
>
> > diff --git a/submodule.c b/submodule.c
> > index 50cbf5f13e..c0c1224760 100644
> > --- a/submodule.c
> > +++ b/submodule.c
> > @@ -766,7 +766,8 @@ static void
On Fri, Oct 19, 2018 at 06:33:30PM +0200, Duy Nguyen wrote:
> > This function doesn't actually make use of the newly added "istate" (nor
> > does it use the_index, so there's not a spot that forgot to get
> > converted). Is this in preparation for more refactoring, or is it just a
> > mistake and
On Fri, Oct 19, 2018 at 10:34 AM Nguyễn Thái Ngọc Duy wrote:
>
>
> struct collect_changed_submodules_cb_data {
> + struct repository *repo;
This slightly overlaps with sb/submodule-recursive-fetch-gets-the-tip,
but we can have this patch on its own as I have to rebuild that
series, will
From: Ben Peart
Add a reset.quiet config setting that sets the default value of the --quiet
flag when running the reset command. This enables users to change the
default behavior to take advantage of the performance advantages of
avoiding the scan for unstaged changes after reset. Defaults to
At a checkpoint, fast-import resets all branches and tags on disk to the
OID that we have in memory. If --force is not given, only branch resets
that result in fast forwards with respect to the state on disk are
allowed.
With this approach, even for refs that fast-import has not been
commanded to
On Fri, Oct 19, 2018 at 12:42:38PM -0400, Jeff King wrote:
> On Fri, Oct 19, 2018 at 06:33:30PM +0200, Duy Nguyen wrote:
>
> > > This function doesn't actually make use of the newly added "istate" (nor
> > > does it use the_index, so there's not a spot that forgot to get
> > > converted). Is this
Hi Elijah,
Playing with -Wunused-parameters, I notice there are several functions
with unused parameters in merge-recursive.c. The patch below drops them
all. We know they're not being used, so it can't make anything _worse_,
but this is a good opportunity to confirm that they don't represent
Am 19.10.18 um 08:02 schrieb Junio C Hamano:
* js/diff-notice-has-drive-prefix (2018-10-19) 1 commit
- diff: don't attempt to strip prefix from absolute Windows paths
"git diff /a/b/c /a/d/f" noticed these are full paths with shared
leading prefix "/a", but failed to notice a similar fact
On Fri, Oct 19, 2018 at 10:58:19AM -0700, Elijah Newren wrote:
> > In most cases I've been trying to determine the "bug versus cruft" thing
> > myself, but I fear that merge-recursive exceeds my abilities here. ;)
>
> These ones all look like cruft to me. I dug through them and tried
> looking
Each section in a protocol v2 response is followed by either a DELIM
packet (indicating more sections to follow) or a FLUSH packet
(indicating none to follow). But when parsing the "acknowledgments"
section, do_fetch_pack_v2() is liberal in accepting both, but determines
whether to continue
On Fri, Oct 19, 2018 at 01:23:06PM -0400, Ben Peart wrote:
> > > Okay. In any case, --no-quiet probably ought to be mentioned alongside
> > > the "reset.quiet" option (and perhaps in git-reset.txt to as a way to
> > > reverse "reset.quiet").
> [...]
> Makes sense. I'll update the docs to say:
>
On Fri, Oct 19, 2018 at 5:43 AM Juergen Vogl wrote:
>
> Hi there,
>
> tested on both, git 2.18 and git 2.19.1:
>
> moving a file with `git mv` from a project to a submodule results in an
> **undefined state** of the local repository.
Luckily we do have a submodule in git.git itself, so we can
> In push_submodule(), because we do not actually need access to objects
> in the submodule, do not invoke add_submodule_odb().
> (for_each_remote_ref_submodule() does not require access to those
> objects, and the actual push is done by spawning another process,
> which handles object access by
On Thu, Oct 18, 2018 at 09:03:22AM -0400, Derrick Stolee wrote:
> We should coordinate before incrementing the version number. I was working
> on making the file formats incremental (think split-index) but couldn't come
> up with a way to do it without incrementing the file format. It would be
>
On 10/18/2018 10:31 PM, Junio C Hamano wrote:
"Derrick Stolee via GitGitGadget" writes:
I originally reported this fix [1] after playing around with the trace2
series for measuring performance. Since trace2 isn't merging quickly, I
pulled the performance fix patch out and am sending it on
> This converts the 'show_submodule_header' function to use
> the repository API properly, such that the submodule objects
> are not added to the main object store.
There is also a side effect in that the submodule now needs to pass all
the checks done by repo_init() instead of merely having the
On Thu, Oct 18, 2018 at 10:57:39PM +, Ævar Arnfjörð Bjarmason wrote:
> Add detection for aliasing loops in cases where one of the aliases
> re-invokes git as a shell command. This catches cases like:
>
> [alias]
> foo = !git bar
> bar = !git foo
>
> Before this change running
This makes the rename/add conflict handling make use of the new
handle_file_collision() function, which fixes several bugs and improves
things for the rename/add case significantly. Previously, rename/add
would:
* Not leave any higher order stage entries in the index, making it
appear as
There are three conflict types that represent two (possibly entirely
unrelated) files colliding at the same location:
* add/add
* rename/add
* rename/rename(2to1)
These three conflict types already share more similarity than might be
immediately apparent from their description: (1) the
When we have a rename/rename(1to2) conflict, each of the renames can
collide with a file addition. Each of these rename/add conflicts suffered
from the same kinds of problems that normal rename/add suffered from.
Make the code use handle_file_conflicts() as well so that we get all the
same fixes
Add testcases dealing with file collisions for the following types of
conflicts:
* add/add
* rename/add
* rename/rename(2to1)
All these conflict types simplify down to two files "colliding"
and should thus be handled similarly. This means that rename/add and
rename/rename(2to1) conflicts
This makes the rename/rename(2to1) conflicts use the new
handle_file_collision() function. Since that function was based
originally on the rename/rename(2to1) handling code, the main
differences here are in what was added. In particular:
* Instead of storing files at collide_path~HEAD and
When a single file is renamed, it can also be modified, yielding the
possibility of that renamed file having content conflicts. If two
different such files are renamed into the same location, then two-way
merging those files may result in nested conflicts. Add a testcase that
makes sure we get
This results in no-net change of behavior, it simply ensures that all
file-collision conflict handling types are being handled the same by
calling the same function.
Signed-off-by: Elijah Newren
---
merge-recursive.c | 29 +
1 file changed, 21 insertions(+), 8
Later patches in this series will modify file collision conflict
handling (e.g. from rename/add and rename/rename(2to1) conflicts) so
that multiply nested conflict markers can arise even before considering
conflicts in the virtual merge base. Including the virtual merge base
will provide a way to
This series depends on en/merge-cleanup-more and is built on that
series. (It merges cleanly to master, next, and pu).
This series makes all the "file collision" conflict types be handled
consistently; making them all behave like add/add (as suggested by
Jonathan[1] and Junio[2]). These types
Stefan Beller wrote:
> Maybe for now we can do with just an update of the documentation/bugs
> section and say we cannot move files in and out of submodules?
I think we have some existing logic to prevent "git add"-ing a file
within a submodule to the superproject, for example.
So "git mv"
On Fri, Oct 19, 2018 at 10:28:22AM +0200, Ævar Arnfjörð Bjarmason wrote:
> > - string_list_append(_list, *argv[0]);
> > + add_cmd_history(, _list, *argv[0]);
> >
> > /*
> > * It could be an alias -- this works around the insanity
>
> Just to sanity
When passing both --remote and --output to git-archive, initialize the
archivers before attempting to determine the format from the output
filename. Without initialization, the format cannot be determined.
Signed-off-by: Josh Steadmon
---
builtin/archive.c | 5 -
1 file changed, 4
Currently, git-archive does not properly determine the desired archive
format when both --output and --remote are provided, because
run_remote_archiver() does not initialize the archivers prior to calling
archive_format_from_filename(). This results in the remote archiver
always returning a TAR
On Sun, Oct 14, 2018 at 4:25 PM Junio C Hamano wrote:
>
> Matthew DeVore writes:
>
> > -List commits that are reachable by following the `parent` links from the
> > -given commit(s), but exclude commits that are reachable from the one(s)
> > -given with a '{caret}' in front of them. The output
On Thu, Oct 18, 2018 at 03:12:09PM -0500, Mahmoud Al-Qudsi wrote:
> Hello again all,
>
> I think I've previously broached this subject before, but I think I perhaps
> wasn't clear enough about what I was trying to do or why I feel that git is at
> fault here.
>
> (I'm running git 2.19.1)
>
>
On 20 Oct 2018, at 00:26, Duy Nguyen wrote:
>Which way should we go? I'm leaning towards the second one...
Not sure how much my opinion is worth, but the second option does feel more
friendly (from a usage perspective) as well as more straight-forward (from a
re-implementation perspective).
On Fri, Oct 19, 2018 at 04:19:27PM -0700, stead...@google.com wrote:
> Currently, git-archive does not properly determine the desired archive
> format when both --output and --remote are provided, because
> run_remote_archiver() does not initialize the archivers prior to calling
>
At a checkpoint, fast-import resets all branches and tags on disk to the
OID that we have in memory. If --force is not given, only branch resets
that result in fast forwards with respect to the state on disk are
allowed.
With this approach, even for refs that fast-import has not been
commanded to
On Fri, Oct 19, 2018 at 04:19:28PM -0700, stead...@google.com wrote:
> diff --git a/builtin/archive.c b/builtin/archive.c
> index e74f675390..dd3283a247 100644
> --- a/builtin/archive.c
> +++ b/builtin/archive.c
> @@ -45,7 +45,10 @@ static int run_remote_archiver(int argc, const char **argv,
>
On Thu, Oct 11, 2018 at 05:19:06AM -0500, dana wrote:
> Hello,
>
> I'm a contributor to ripgrep, which is a grep-like tool that supports using
> gitignore files to control which files are searched in a repo (or any other
> directory tree). ripgrep's support for the patterns in these files is
Hello,
Unfortunately I do not have for such step. On one of our internal
repositories it is failing but unreliably when fetching from remote.
--
Arturas Moskvinas
On Wed, Oct 17, 2018 at 11:53 PM Jonathan Tan wrote:
>
> > No changes are needed in mirrored repository. Crash happens both with
>
On Thu, Oct 18, 2018 at 6:02 PM Joshua Watt wrote:
> On Thu, 2018-10-18 at 17:53 -0400, Eric Sunshine wrote:
> > On Thu, Oct 18, 2018 at 5:16 PM Joshua Watt
> > wrote:
> > Implementation complexity aside, spelling the option --no-smtp-auth
> > might be more intuitive and consistent than
Note that the_hash_algo stays, even if we can easily replace it with
repo->hash_algo. My reason is I still believe tying hash_algo to a
struct repository is a wrong move. But if I'm wrong, we can always go
for another round of conversion.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Signed-off-by: Nguyễn Thái Ngọc Duy
---
list-objects-filter.c | 7 +--
list-objects-filter.h | 1 +
list-objects.c| 3 +++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/list-objects-filter.c b/list-objects-filter.c
index a0ba78b20c..8825e2a5ab 100644
---
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/notes.c | 2 +-
notes-merge.c | 12 +++-
notes-merge.h | 6 +-
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/builtin/notes.c b/builtin/notes.c
index c05cd004ab..d8bd01656a 100644
--- a/builtin/notes.c
+++
Since we're going to pass 'struct repository *' around most of the
time instead of 'struct index_state *' because most sequencer.c
operations need more than just the index, the_repository is replaced
as well in the functions that now take 'struct repository
*'. the_repository is still present in
Signed-off-by: Nguyễn Thái Ngọc Duy
---
notes-merge.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/notes-merge.c b/notes-merge.c
index c3bee1a87d..b6a998bfd4 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -558,7 +558,7 @@ int notes_merge(struct notes_merge_options
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/commit.c | 2 +-
builtin/describe.c | 2 +-
builtin/diff.c | 2 +-
cache.h| 6 --
read-cache.c | 14 --
repository.h | 6 ++
wt-status.c| 2 +-
7 files changed, 18 insertions(+), 16
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/am.c | 6 +++---
cache.h | 6 +++---
merge-recursive.c | 2 +-
read-cache.c | 12 +---
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index 65e10a5eb3..37b52be7db 100644
This kills the_index dependency in get_oid_with_context() but for
get_oid() and friends, they still assume the_repository (which also
means the_index).
Unfortunately the widespread use of get_oid() will make it hard to
make the conversion now. We probably will add repo_get_oid() at some
point and
note, there's still another hidden dependency related to this: even
though we pass a repo to transport_push() we still use
is_bare_repository() which pretty much assumes the_repository (and
some other global state).
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/push.c | 3 ++-
transport.c
read_index() shares the same problem as hold_locked_index(): it
assumes $GIT_DIR/index. Move all call sites to repo_read_index()
instead. read_index_preload() and read_index_unmerged() are also
killed as a consequence.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
apply.c | 2 +-
blame.c
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/am.c | 2 +-
builtin/checkout.c| 2 +-
builtin/merge-recursive.c | 2 +-
builtin/merge.c | 2 +-
merge-recursive.c | 151 +-
merge-recursive.h | 6 +-
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/checkout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index acdafc6e4c..38b28c20e2 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -284,7 +284,7 @@ static int
>From now on, by default index compat macros are off because they could
hide the_index dependency. Only those in builtin can use it (and even
so should be avoided if possible).
Signed-off-by: Nguyễn Thái Ngọc Duy
---
attr.c | 1 -
builtin/add.c
Similar to NO_THE_INDEX_COMPATIBILITY_MACROS, this switch is now off
by default. It remains here just to make it easier to merge in-flight
topics where the old functions are still used. Then you can just stick
#define USE_THE_REPOSITORY_COMPATIBILITY_MACROS
at the beginning of those files.
Stefan I see you start removing more references of the_repository in
another series (haven't really looked at it yet) so this is just heads
up so we could coordinate if needed. Still WIP, not really ready for
review yet.
This series removes use of the_index outside builtin/ and t/helper/.
The
Signed-off-by: Nguyễn Thái Ngọc Duy
---
merge-recursive.c | 45 -
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 184945ae67..ad0a5b0202 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
hold_locked_index() assumes the index path at $GIT_DIR/index. This is
not good for places that take an arbitrary index_state instead of
the_index, which is basically everywhere except builtin/.
Replace it with repo_hold_locked_index(). hold_locked_index() remains
as a wrapper around
Signed-off-by: Nguyễn Thái Ngọc Duy
---
list-objects.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/list-objects.c b/list-objects.c
index f9d36dabf2..c3a1a9b004 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -51,7 +51,7 @@ static void process_blob(struct
Signed-off-by: Nguyễn Thái Ngọc Duy
---
ref-filter.c | 2 +-
wt-status.c | 18 ++
wt-status.h | 4 +++-
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 2a05619211..d6d3923eb2 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/commit.c | 2 +-
builtin/pull.c | 3 +-
sequencer.c | 6 ++--
wt-status.c | 77 +++-
wt-status.h | 17 +++
5 files changed, 62 insertions(+), 43 deletions(-)
diff --git
On 10/19/2018 1:24 AM, Junio C Hamano wrote:
"Derrick Stolee via GitGitGadget" writes:
We can also re-run the performance tests from commit 4fbcca4e
"commit-reach: make can_all_from_reach... linear".
Performance was measured on the Linux repository using
'test-tool reach can_all_from_reach'.
On Fri, Oct 19, 2018 at 05:16:46PM +0900, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
> >>if (entry)
> >> - fprintf(out, "\n%c Branch %s\n", comment_line_char,
> >> entry->string);
> >> + strbuf_addf(out, "\n%c Branch %s\n", comment_line_char,
>
On Thu, Oct 18 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>>> sites could do the same polling and mirroring. I am just too lazy
>>> to open a new account at yet another hosting site to add that for
>>> loop, but I may choose to when I am absolutely bored and nothing
>>>
94 matches
Mail list logo
