On Wed, Oct 31, 2018 at 7:01 AM Derrick Stolee wrote:
>
> On 10/19/2018 3:31 PM, Elijah Newren wrote:
> > +test_expect_success "setup nested conflicts" '
>
> nit: should these test names be single-quoted? I see you using double-quotes
> in PATCH 1/8 as well, but that seems to be because there are
On Wed, Oct 31, 2018 at 6:57 AM Derrick Stolee wrote:
>
> On 10/31/2018 9:53 AM, Derrick Stolee wrote:
> > On 10/19/2018 3:31 PM, Elijah Newren wrote:
> >> +#if 0 // #if-0-ing avoids unused function warning; will make live in
> >> next commit
> >> +static int handle_file_collision(struct merge_opt
On Wed, Oct 31, 2018 at 5:05 AM Derrick Stolee wrote:
>
> On 10/31/2018 2:04 AM, Elijah Newren wrote:
> > On Tue, Oct 30, 2018 at 7:16 AM Derrick Stolee via GitGitGadget
> > wrote:
> >>
> >> As reported earlier [1], the add_missing_tags() method in remote.c has
> >> quadratic performance. Some of
"Johannes Schindelin via GitGitGadget"
writes:
> The `--preserve-merges` mode of the `rebase` command is slated to be
> deprecated soon, ...
Is everybody on board on this statement? I vaguely recall that some
people wanted to have something different from what rebase-merges
does (e.g. wrt first
Hello,
I have a client from Syrian who will like to invest with your
company. My client is willing to invest $4 Million. Can I have
your company website to show to my client your company so that
they will check and decide if they will invest there funds with
you as joint partner.
This inf
"brian m. carlson" writes:
> I need to do a reroll to address some other issues people brought up, so
> I can remove this line.
OK. I actually do not feel too strongly about this one, by the way.
"Derrick Stolee via GitGitGadget" writes:
> This patch series performs a decently-sized refactoring of the revision-walk
> machinery. Well, "refactoring" is probably the wrong word, as I don't
> actually remove the old code. Instead, when we see certain options in the
> 'rev_info' struct, we redi
Ævar Arnfjörð Bjarmason writes:
>> On the other hand, I do not think I mind all that much if a src that
>> is a tag object to automatically go to refs/tags/ (having a tag
>> object in refs/remotes/** is rare enough to matter in the first
>> place).
>
> Yeah maybe this is going too far. I don't th
Ævar Arnfjörð Bjarmason writes:
> Mark the tests where "git fsck" fails at the end with extra test code
> to check the fsck output. There fsck.{err,out} has been created for
> us.
>
> A later change will add the support for GIT_TEST_FSCK_TESTS. They're
> being added first to ensure the test suit
From: Phillip Wood
Add read_author_script() to sequencer.c based on the implementation in
builtin/am.c and update read_am_author_script() to use
read_author_script(). The sequencer code that reads the author script
will be updated in the next commit.
Signed-off-by: Phillip Wood
Signed-off-by: J
From: Phillip Wood
If there are errors in a user edited author-script there was no
indication of what was wrong. This commit adds some specific error messages
depending on the problem. It also relaxes the requirement that the
variables appear in a specific order in the file to match the behavior
Phillip Wood writes:
> From: Phillip Wood
>
> Sorry for the confusion with v3, here are the updated patches.
>
> Thanks to Junio for the feedback on v2. I've updated patch 4 based on
> those comments, the rest are unchanged.
The mistake of overwriting -1 (i.e. earlier we detected dup) with
the
Johannes Schindelin writes:
> Indeed, the patch in question regards something I consider outside Git for
> Windows' realm. As Chris said, you can run this script from a PowerShell
> prompt, without any Git Bash (and without Git's Perl) involved.
>
> I am fine with this patch, as long as the autho
Duy Nguyen writes:
>> -__git_format_patch_options="
>> - --stdout --attach --no-attach --thread --thread= --no-thread
>> - --numbered --start-number --numbered-files --keep-subject --signoff
>> - --signature --no-signature --in-reply-to= --cc= --full-index --binary
>> - --
Ævar Arnfjörð Bjarmason 于2018年10月30日周二 上午1:43写道：
> On Mon, Oct 29 2018, Ævar Arnfjörð Bjarmason wrote:
> Unlike the rest of our stack where we need to support however many years
> old tools we can freely rely on bleeding-edge gettext features, since
> the only person we need to convince to upgrade
Good day,
My name is Annable Katherine Grosvenor, I'm 57yrs old, a widow, no kids, from
the United Kingdom, I'm very sorry to bother you with this message but it is
very important for me that I send out this message because I am very sick and
at the point of death, I'm diagnosed with Ovarian Ca
Alexander Mills writes:
> I have been confused about the need for --force-with-lease after rebasing
>
> Imagine I have a feature branch:
>
> git checkout --no-track -b 'feature' 'origin/dev'
> git push -u origin feature
>
> I do some work, and then I rebase against origin/dev to keep up to
> date
On Wed, Oct 31, 2018 at 12:13:06PM -0700, Alexander Mills wrote:
> I have been confused about the need for --force-with-lease after rebasing
>
> Imagine I have a feature branch:
>
> git checkout --no-track -b 'feature' 'origin/dev'
> git push -u origin feature
>
> I do some work, and then I reba
On Wed, Oct 31, 2018 at 12:03:53PM -0400, Jeff King wrote:
> Since 959dfcf42f (smart-http: Really never use Expect: 100-continue,
> 2011-03-14), we try to avoid sending "Expect" headers, since some
> proxies apparently don't handle them well. There we have to explicitly
> tell curl not to use them.
Jeff King writes:
> On the other hand, if the rule were not "this affects the next
> placeholder" but had a true ending mark, then we could make a real
> parse-tree out of it, and format chunks of placeholders. E.g.:
>
> %(format:lpad=30,filename)%(subject) %(authordate)%(end)
>
> would pad an
Use File::Spec->devnull() for output redirection to avoid messages when
Windows version of Perl is first in path. The message 'The system cannot
find the path specified.' is displayed each time git is run to get colors.
Chris. Webster (1):
diff-highlight: Use correct /dev/null for UNIX and Windo
On Mon, Oct 29, 2018 at 09:39:33AM +0900, Junio C Hamano wrote:
> "brian m. carlson" writes:
> > This may not strictly be needed, but removing it makes the header no
> > longer self-contained, which blows up my (and others') in-editor
> > linting.
>
> That sounds like bending backwards to please
Sorry it's taken awhile for me to get back to this thread. I've been
keeping my open source contributions timeboxed, and had to work
through a bit of a backlog before this email thread got back to the
front of the queue.
> What would the command-line experience look like for this workflow? Be
> s
From: Steve Hoelzer
>From Visual Studio 2015 Code Analysis: Warning C28159 Consider using
'GetTickCount64' instead of 'GetTickCount'.
Reason: GetTickCount() overflows roughly every 49 days. Code that does
not take that into account can loop indefinitely. GetTickCount64()
operates on 64 bit value
This is yet another piece from the Git for Windows cake. It avoids a
wrap-around in the poll emulation on Windows that occurs every 49 days.
Steve Hoelzer (1):
poll: use GetTickCount64() to avoid wrap-around issues
compat/poll/poll.c | 10 +++---
1 file changed, 7 insertions(+), 3 deletion
On 10/31/2018 3:11 PM, Duy Nguyen wrote:
not really a review, just a couple quick notes..
Perfect! As an RFC, I'm more looking for high level thoughts/notes than
a style/syntax code review.
On Tue, Oct 30, 2018 at 9:40 PM Ben Peart wrote:
From: Ben Peart
On index load, clear/set
On Wed, Oct 31, 2018 at 01:38:59PM -0400, Eric Sunshine wrote:
> On Tue, Oct 30, 2018 at 07:23:38PM -0400, Jeff King wrote:
> > There are three ways to convince cat-file to stream a blob:
> >
> > - cat-file -p $blob
> >
> > - cat-file blob $blob
> >
> > - echo $batch | cat-file --batch
>
On Mon, Oct 29, 2018 at 06:05:34PM +0100, Anders Waldenborg wrote:
> I'll start by reworking my patch to handle %(trailers:key=X) (I'll
> assume keys never contain ')' or ','), and ignore any formatting until
> the way forward there is decided (see below).
IMHO that is probably an acceptable tra
On 10/30/2018 7:07 PM, Junio C Hamano wrote:
Ben Peart writes:
diff --git a/config.c b/config.c
index 4051e38823..96e05ee0f1 100644
--- a/config.c
+++ b/config.c
...
@@ -2307,6 +2311,37 @@ int git_config_get_index_threads(void)
return 0; /* auto */
}
+int git_config_get_virtual
From: Johannes Schindelin
The `--preserve-merges` mode of the `rebase` command is slated to be
deprecated soon, as the more powerful `--rebase-merges` mode is
available now, and the latter was designed with the express intent to
address the shortcomings of `--preserve-merges`' design (e.g. the
in
From: Johannes Schindelin
It is in general a good idea for regression test cases to be as
independent of each other as possible (with the one exception of an
initial `setup` test case, which is only a test case in Git's test suite
because it does not have a notion of a fixture or setup).
This pa
From: Johannes Schindelin
Originally, the `--preserve-merges` option of the `git rebase` command
piggy-backed on top of the `--interactive` feature. For that reason, the
early test cases were added to the very same test script that contains
the `git rebase -i` tests: `t3404-rebase-interactive.sh`
The --preserve-merges mode of the git rebase command is on its way out,
being superseded by the --rebase-merges mode. My plan is to contribute
patches to deprecate the former in favor of the latter before long.
In the meantime, it seems a bit pointless to keep running the git rebase -p
tests, in
> On Sep 24, 2018, at 7:24 PM, Elijah Newren wrote:
>
> On Sun, Sep 23, 2018 at 6:08 AM Lars Schneider
> wrote:
>>
>> Hi,
>>
>> I recently had to purge files from large Git repos (many files, many
>> commits).
>> The usual recommendation is to use `git filter-branch --index-filter` to
>>
I have been confused about the need for --force-with-lease after rebasing
Imagine I have a feature branch:
git checkout --no-track -b 'feature' 'origin/dev'
git push -u origin feature
I do some work, and then I rebase against origin/dev to keep up to
date with the integration branch.
git fetch
not really a review, just a couple quick notes..
On Tue, Oct 30, 2018 at 9:40 PM Ben Peart wrote:
>
> From: Ben Peart
>
> On index load, clear/set the skip worktree bits based on the virtual
> file system data. Use virtual file system data to update skip-worktree
> bit in unpack-trees. Use virt
On Wed, 31 Oct 2018 at 18:28, Eric Sunshine wrote:
>
> On Wed, Oct 31, 2018 at 10:54 AM Johannes Schindelin
> wrote:
> > ACK. Thanks for cleaning up after me,
>
> Looks good to me, as well. Thanks for working on it.
Thanks, both of you.
Martin
On Wed, Oct 31, 2018 at 12:07 AM james harvey wrote:
> I think these options can co-exist. I could be wrong, but I'm betting
> the code for "--color-moved" was only written with the typical full
> line(s) diff in mind, and wasn't written with "--word-diff" in mind.
I think it was brought up, bu
On Tue, Oct 30, 2018 at 7:06 PM james harvey wrote:
>
> If you use both "--word-diff" and "--color-moved", regardless of the
> order of arguments, "--word-diff" takes precedence and "--color-moved"
> isn't allowed to do anything.
The order of arguments doesn't matter here, as these just set inter
On Tue, Oct 30, 2018 at 07:23:38PM -0400, Jeff King wrote:
> There are three ways to convince cat-file to stream a blob:
>
> - cat-file -p $blob
>
> - cat-file blob $blob
>
> - echo $batch | cat-file --batch
>
> In the first two, we simply exit with the error code of
> streaw_blob_to_fd()
On Wed, Oct 31, 2018 at 10:54 AM Johannes Schindelin
wrote:
> On Tue, 30 Oct 2018, Martin Ågren wrote:
> > Rewrite the loop to a more idiomatic variant which doesn't muck with
> > `len` in the loop body. That should help compilers and human readers
> > figure out what is going on here. But do note
Since 959dfcf42f (smart-http: Really never use Expect: 100-continue,
2011-03-14), we try to avoid sending "Expect" headers, since some
proxies apparently don't handle them well. There we have to explicitly
tell curl not to use them.
The exception is large requests with GSSAPI, as explained in c80d
Gray:
On Tue, Oct 30, 2018 at 03:46:28AM +0100, Gray King wrote:
> * Before merge run `git log --format="%h %p %d" -n 20 --all --graph`:
>
> https://cfp.vim-cn.com/cbfq6
>
> * After merged run `git log --format="%h %p %d" -n 20 --all --graph`:
>
> https://cfp.vim-cn.com/cbfq7
I also cannot see
On 10/19/2018 3:31 PM, Elijah Newren wrote:
[snip]
+ char *new_path = NULL;
+ if (dir_in_way(b->path, !o->call_depth, 0)) {
+ new_path = unique_path(o, b->path, ci->branch2);
+ output(o, 1, _(
Hi Martin,
On Tue, 30 Oct 2018, Martin Ågren wrote:
> It came up in review [1, 2] that this non-idiomatic loop is a bit tricky.
> When we find a space, we set `len = i`, which gives us the answer we are
> looking for, but which also breaks out of the loop.
>
> It turns out that this loop can con
Hi Junio,
On Sat, 27 Oct 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Just one thing^W^Wa couple of things:
> >
> > It would probably make more sense to `hashmap_get_from_hash()` and
> > `strhash()` here (and `strhash()` should probably be used everywhere
> > instead of `memh
On Wed, Oct 31, 2018 at 11:23:48PM +0900, Junio C Hamano wrote:
> Torsten Bögershausen writes:
>
> >> +static int stream_blob(const struct object_id *oid)
> >
> > Sorry for nit-picking:
> > could this be renamed into stream_blob_to_stdout() ?
>
> I think that name makes sense, even though strea
Torsten Bögershausen writes:
>> +static int stream_blob(const struct object_id *oid)
>
> Sorry for nit-picking:
> could this be renamed into stream_blob_to_stdout() ?
I think that name makes sense, even though stream_blob() is just
fine for a fuction that takes a single parameter oid, as there i
On 10/19/2018 3:31 PM, Elijah Newren wrote:
+test_expect_success "setup nested conflicts" '
nit: should these test names be single-quoted? I see you using double-quotes
in PATCH 1/8 as well, but that seems to be because there are variables in
the test names.
...
+test_expect_failure "check n
On 10/31/2018 9:53 AM, Derrick Stolee wrote:
On 10/19/2018 3:31 PM, Elijah Newren wrote:
+#if 0 // #if-0-ing avoids unused function warning; will make live in
next commit
+static int handle_file_collision(struct merge_options *o,
+ const char *collide_path,
+ con
On 10/19/2018 3:31 PM, Elijah Newren wrote:
+#if 0 // #if-0-ing avoids unused function warning; will make live in next
commit
+static int handle_file_collision(struct merge_options *o,
+const char *collide_path,
+const char *prev_pa
On 10/16/2018 7:35 PM, Stefan Beller wrote:
@@ -482,14 +483,46 @@ void prepare_submodule_repo_env(struct argv_array *out)
DEFAULT_GIT_DIR_ENVIRONMENT);
}
-/* Helper function to display the submodule header line prior to the full
- * summary output. If it can locate
On Tue, Oct 30, 2018 at 07:23:38PM -0400, Jeff King wrote:
> There are three ways to convince cat-file to stream a blob:
>
> - cat-file -p $blob
>
> - cat-file blob $blob
>
> - echo $batch | cat-file --batch
>
> In the first two, we simply exit with the error code of
> streaw_blob_to_fd()
On 10/31/2018 8:54 AM, Ævar Arnfjörð Bjarmason wrote:
On Tue, Oct 30 2018, Junio C Hamano wrote:
Derrick Stolee writes:
In contrast, maximum generation numbers and corrected commit
dates both performed quite well. They are frequently the top
two performing indexes, and rarely significantly di
On Tue, Oct 30 2018, Junio C Hamano wrote:
> Derrick Stolee writes:
>> In contrast, maximum generation numbers and corrected commit
>> dates both performed quite well. They are frequently the top
>> two performing indexes, and rarely significantly different.
>>
>> The trade-off here now seems t
Add the ability to run the tests with GIT_TEST_FSCK=true in the
environment. If set we'll run "git fsck" at the end of every test, and
those tests that fail need to annotate what their failure was.
The goal is to detect regressions in fsck that our tests might
otherwise miss. We had one such regre
This new helper is a wrapper around the git_env_bool() function. There
are various GIT_TEST_* variables described in "Running tests with
special setups" in t/README that use git_env_bool().
A GIT_TEST_* variable implemented in shellscript won't have access to
the same semantics (historically we've
This goes on top Jeff's "cat-file: handle streaming failures
consistently" and implements the test mode I suggested in
https://public-inbox.org/git/877ehzksjd@evledraar.gmail.com/
In the process I didn't find any other bugs than the 2.12..2.19
regression which is already fixed, but as noted in
Mark the tests where "git fsck" fails at the end with extra test code
to check the fsck output. There fsck.{err,out} has been created for
us.
A later change will add the support for GIT_TEST_FSCK_TESTS. They're
being added first to ensure the test suite will never fail with
GIT_TEST_FSCK=true duri
On 10/29/2018 11:59 PM, Junio C Hamano wrote:
Derrick Stolee writes:
**V3: Corrected Commit Date.**
For a commit C, let its _corrected commit date_ (denoted by cdate(C))
be the maximum of the commit date of C and the commit dates of its
parents.
"maximum of the commit date of C and the correc
On 10/31/2018 2:04 AM, Elijah Newren wrote:
> On Tue, Oct 30, 2018 at 7:16 AM Derrick Stolee via GitGitGadget
> wrote:
>>
>> As reported earlier [1], the add_missing_tags() method in remote.c has
>> quadratic performance. Some of that performance is curbed due to the
>> generation-number cutoff
On 10/30/2018 11:35 PM, Junio C Hamano wrote:
"Derrick Stolee via GitGitGadget" writes:
+struct commit_list *get_reachable_subset(struct commit **from, int nr_from,
+struct commit **to, int nr_to,
+int reachable_fl
On 10/31/2018 2:07 AM, Elijah Newren wrote:
On Tue, Oct 30, 2018 at 7:16 AM Derrick Stolee via GitGitGadget
wrote:
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -688,3 +688,73 @@ int can_all_from_reach(struct commit_list *from, struct
commit_list *to,
object_array_clear(&from_objs);
Greetings,
I humbly solicit for your partnership to transfer €15 million Euros
into your personal or company’s account .Contact me for more detailed
explanation.
Kindly send me the followings
Full Names
Address
Occupation
Direct Mobile Telephone Lines
Nationality
Ahmed Zama
+22675844869
Hi,
On Wed, 31 Oct 2018, Junio C Hamano wrote:
> > From: chris
>
> Please make this line read like
>
> From: Chris Webster
>
> i.e. the author should be the person who is signing off that patch.
This is most likely recorded as the commit's author in the commit
object... Chris, to fix
Hi Junio,
On Wed, 31 Oct 2018, Junio C Hamano wrote:
> Chris Webster writes:
>
> >>> > Use File::Spec->devnull() for output redirection to avoid messages
> >>> > when Windows version of Perl is first in path. The message 'The
> >>>
> >>> Dscho, "Windows version of Perl is first in path" someho
Hi Junio,
On Wed, 31 Oct 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > An alternative approach which was rejected at the time (because it
> > interfered with the then-ongoing work to compile Git for Windows using
> > MS Visual C++) would patch the make_env
From: Phillip Wood
If there are errors in a user edited author-script there was no
indication of what was wrong. This commit adds some specific error messages
depending on the problem. It also relaxes the requirement that the
variables appear in a specific order in the file to match the behavior
From: Phillip Wood
Sorry for the confusion with v3, here are the updated patches.
Thanks to Junio for the feedback on v2. I've updated patch 4 based on
those comments, the rest are unchanged.
v1 cover letter:
This is a follow up to pw/rebase-i-author-script-fix, it reduces code
duplication and
From: Phillip Wood
Add read_author_script() to sequencer.c based on the implementation in
builtin/am.c and update read_am_author_script() to use
read_author_script(). The sequencer code that reads the author script
will be updated in the next commit.
Signed-off-by: Phillip Wood
---
Notes:
From: Phillip Wood
The caller is already prepared to handle errors returned from this
function so there is no need for it to die if it cannot read the file.
Suggested-by: Eric Sunshine
Signed-off-by: Phillip Wood
---
builtin/am.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -
From: Phillip Wood
Use the new function added in the last commit to read the author
script, updating read_env_script() and read_author_ident(). We now
have a single code path that reads the author script for am and all
flavors of rebase. This changes the behavior of read_env_script() as
previousl
From: Phillip Wood
Rename read_author_script() in preparation for adding a shared
read_author_script() function to libgit.
Signed-off-by: Phillip Wood
---
builtin/am.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index d42b725273..991d13f9
On 31/10/2018 02:50, Junio C Hamano wrote:
> Phillip Wood writes:
>
>> From: Phillip Wood
>>
>> Thanks to Junio for the feedback on v2. I've updated patch 4 based on
>> those comments, the rest are unchanged.
>
> Hmph, all these five patches seem to be identical to what I have in
> 'pu'. Did y
On Wed, Oct 31, 2018 at 12:27 AM Junio C Hamano wrote:
>
> james harvey writes:
>
> > If you use both "--word-diff" and "--color-moved", regardless of the
> > order of arguments, "--word-diff" takes precedence and "--color-moved"
> > isn't allowed to do anything.
> >
> > I think "--color-moved" s
75 matches
Mail list logo
