After running the "Git 2.20-rc1" testsuite here on a raspi,
the only TC that failed was t5570.
When the "grep" was run on daemon.log, the file was empty (?).
When inspecting it later, it was filled, and grep would have found
the "extended.attribute" it was looking for.
The following fixes it,
From: Pedro de Lyra
Signed-off-by: Pedro de Lyra
---
According to POSIX manual pages, the open() system call's mode argument
specifies the file mode bits to be applied when a new file is created. If
neither O_CREAT nor O_TMPFILE is specified, then mode is ignored. So I guess
that 0 argument
On Sun, Nov 25 2018, Torsten Bögershausen wrote:
> On Sun, Nov 25, 2018 at 05:28:35AM +0100, Torsten Bögershausen wrote:
>> On Sat, Nov 24, 2018 at 08:33:37PM +0100, Ævar Arnfjörð Bjarmason wrote:
>> >
>> > On Wed, Sep 05 2018, Ævar Arnfjörð Bjarmason wrote:
>> >
>> > > On Wed, Sep 05 2018,
Am 24.11.18 um 23:07 schrieb Johannes Sixt:
> I don't think that there is anything to fix. If you have a file with
> CRLF in it, but you did not declare to Git that CRLF is the expected
> end-of-line indicator, then the CR *is* trailing whitespace (because
> the line ends at LF), and 'git diff'
Dearest ,
Its really good to see your Prompt Response it show how Responsible and
diligent you will be in handling the sum of $10.5 MILLION if placed in your
care and for
investment Purposes in your Country .
These said Funds have being placed in Safekeeping in DEUTSCHE BANK in SOUTH
AFRICA
d98b2c5fce ("test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/",
2016-07-21) added an exception to the test suite for FreeBSD because the
tests assume functionality not provided by its base unzip tool.
NetBSD shares that limitation and provides a package that could be used
instead so all
otherwise will default to /usr/bin/perl which wouldn't normally exist
Signed-off-by: Carlo Marcelo Arenas Belón
---
config.mak.uname | 1 +
1 file changed, 1 insertion(+)
diff --git a/config.mak.uname b/config.mak.uname
index 59ce03819b..d2edb723f4 100644
--- a/config.mak.uname
+++
56ee96572a ("t5004: resurrect original empty tar archive test", 2013-05-09)
added a test to try to detect and workaround issues with the standard tar
from BSD, but at least in NetBSD would be better to instead require GNU tar
which is available from pkgsrc
Signed-off-by: Carlo Marcelo Arenas
the semantics of how mkdir -p should work, specially when using -m are
not standard and in this case NetBSD will assume that the permision
should not be changed, breaking the test
-p is technically not needed either, but will be cleared in a future
patch eventhough it could be considered an
prevents the following warning :
utf8.c: In function 'reencode_string_iconv':
utf8.c:486:28: warning: passing argument 2 of 'iconv' from incompatible pointer
type [-Wincompatible-pointer-types]
size_t cnt = iconv(conv, , , , );
^
In file included from
this "fixes" test 23 (proper error on directory "files") from t1308
other BSD (OpenBSD, MirBSD) likely also affected but they will be
fixed in a different series
the optional 'configure' sets this automatically and is probably what
most users from this platform had been doing as a workaround
NetBSD added a BSD licensed reimplementation of GNU libintl to
its base at least since release 4.0 (mid 2012) and git can be
configured to build with it.
Signed-off-by: Carlo Marcelo Arenas Belón
---
INSTALL | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/INSTALL
Likely still missing changes as it only completes a run with a minimal
number of dependencies but open for feedback
Requires pkgsrc packages for gmake, perl, bash and curl and completes a run
$ gmake SHELL_PATH=/usr/pkg/bin/bash NO_PYTHON=1 CURL_DIR=/usr/pkg test
Carlo Marcelo Arenas Belón
On Sun, Nov 25, 2018 at 11:19 AM Carlo Arenas wrote:
>
> Signed-off-by: Carlo Marcelo Arenas Belón
>
> clang with -Wpedantic also catch this (at least with Apple LLVM
> version 10.0.0); recent versions of gcc also include that flag and at
> least 8.2.0 shows a warning for it, so it might be
Signed-off-by: Carlo Marcelo Arenas Belón
clang with -Wpedantic also catch this (at least with Apple LLVM
version 10.0.0); recent versions of gcc also include that flag and at
least 8.2.0 shows a warning for it, so it might be worth adding it to
developer mode (maybe under the pedantic DEVOPTS),
On Sun, Nov 25, 2018 at 05:28:35AM +0100, Torsten Bögershausen wrote:
> On Sat, Nov 24, 2018 at 08:33:37PM +0100, Ævar Arnfjörð Bjarmason wrote:
> >
> > On Wed, Sep 05 2018, Ævar Arnfjörð Bjarmason wrote:
> >
> > > On Wed, Sep 05 2018, Eric Sunshine wrote:
>
> []
>
> > > SunCC used to be ahead
This function files_reflog_path returns void, which usually means
"return;" not returning "void value" from another function.
Reported-by: Ævar Arnfjörð Bjarmason
Signed-off-by: Nguyễn Thái Ngọc Duy
---
refs/files-backend.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
On Sat, Nov 24, 2018 at 08:33:37PM +0100, Ævar Arnfjörð Bjarmason wrote:
>
> On Wed, Sep 05 2018, Ævar Arnfjörð Bjarmason wrote:
>
> > On Wed, Sep 05 2018, Eric Sunshine wrote:
[]
> > SunCC used to be ahead of GCC & Clang when it came to certain classes of
> > warnings, but e.g. now everything
On 11/24/18 10:41 AM, Konstantin Khomoutov wrote:
On Sat, Nov 24, 2018 at 05:57:24PM +0300, Konstantin Khomoutov wrote:
On Sat, Nov 24, 2018 at 09:37:06AM -0500, David Mandelberg wrote:
It seems that git is overwriting my local files on merge if they're in
.gitignore.
[...]
The .gitignore
Jeff King writes:
> I do also think in the long run we should be fixing the "unreachable
> always become loose" issues.
I think I've seen an idea of collecting them into a garbage pack
floated for at least a few times here. What are the downsides? We
no longer will know when these unreachable
Ævar Arnfjörð Bjarmason writes:
> On Sun, Oct 21 2018, Nguyễn Thái Ngọc Duy wrote:
>
> This change has a regression in 2.20:
>
>> [...]
>> static void files_reflog_path(struct files_ref_store *refs,
>>struct strbuf *sb,
>>const char
Ævar Arnfjörð Bjarmason writes:
> There's no easy out of the box way to do exactly what you've
> described. A few things come to mind:
> ...
Wouldn't it suffice to have a cron job that runs something like
D=$(date +"%Y-%m-%d")
git fetch $serving "refs/*:refs/backup-$D/*"
on
Ævar Arnfjörð Bjarmason writes:
>> * "git rebase" and "git rebase -i" have been reimplemented in C.
>
> Here's another regression in the C version (and rc1),...
> I wasn't trying to stress test rebase. I was just wanting to rebase a
> history I was about to force-push after cleaning it up,
On Fri, Nov 23 2018, Guilhem Bonnefille wrote:
> I'm managing many bare repositories for development teams.
>
> One service we want to offer is to let developers retrieve old state
> of the repository up to 30 days. For example, one developer
> (accidently) removed (push -f) a branch/tag and
I've had access to the GCC Compile Farm for testing on various
architectures for a while. Around the 2.19.0 release I submitted some
patches / bug reports found there.
I've now improved this to run it via GitLab CI & made the output
accessible. Outline of how this works at
Am 24.11.18 um 15:51 schrieb Frank Schäfer:
Am 23.11.18 um 22:47 schrieb Johannes Sixt:
Am 23.11.18 um 19:19 schrieb Frank Schäfer:
The CR marker ^M doesn't show up in '-' lines of diffs when the ending
of the removed line is CR+LF.
It shows up as expected in '-' lines when the ending of the
On Wed, Nov 21 2018, Junio C Hamano wrote:
> * "git rebase" and "git rebase -i" have been reimplemented in C.
Here's another regression in the C version (and rc1), note: the
sha1collisiondetection is just a stand in for "some repo":
(
rm -rf /tmp/repo &&
git init
On Wed, Sep 05 2018, Ævar Arnfjörð Bjarmason wrote:
> On Wed, Sep 05 2018, Eric Sunshine wrote:
>
>> On Wed, Sep 5, 2018 at 4:29 AM Ævar Arnfjörð Bjarmason
>> wrote:
>>> I recently gained access to a Solaris 10 SPARC (5.10) box and discovered
>>> that the chainlint.sed implementation in
On Sun, Oct 21 2018, Nguyễn Thái Ngọc Duy wrote:
This change has a regression in 2.20:
> [...]
> static void files_reflog_path(struct files_ref_store *refs,
> struct strbuf *sb,
> const char *refname)
> @@ -158,6 +178,9 @@ static void
Hi,
I hope this is the right place for this answer. If not, plaese point me
to a more appropriate place.
A project "P2" [2] forked from another project "P1" [1] quite some
time ago, both repos share a common history up to some point. After this
point, P2 cherry-picked commits from P1, but did
On Sat, Nov 24, 2018 at 05:57:24PM +0300, Konstantin Khomoutov wrote:
> On Sat, Nov 24, 2018 at 09:37:06AM -0500, David Mandelberg wrote:
>
> > > > It seems that git is overwriting my local files on merge if they're in
> > > > .gitignore.
> [...]
> > > The .gitignore file is to list "ignored and
On Sat, Nov 24, 2018 at 03:51:26PM +0100, Frank Schäfer wrote:
[]
>
> Hmm... is CR-only line termination supported at all ?
> E.g. 'eol' can be set to 'lf' or 'crlf' but not 'cr'...
>
No, CR-only is not supported, because:
Nobody was implementing it, and that is probably because
the only
On Sat, Nov 24, 2018 at 09:37:06AM -0500, David Mandelberg wrote:
> > > It seems that git is overwriting my local files on merge if they're in
> > > .gitignore.
[...]
> > The .gitignore file is to list "ignored and expendable" class of
> > files; there is no "ignored but precious class" in Git.
>
Am 23.11.18 um 22:47 schrieb Johannes Sixt:
> Am 23.11.18 um 19:19 schrieb Frank Schäfer:
>> The CR marker ^M doesn't show up in '-' lines of diffs when the ending
>> of the removed line is CR+LF.
>> It shows up as expected in '-' lines when the ending of the removed line
>> is CR only.
>> It also
On 11/23/18 11:22 PM, Junio C Hamano wrote:
David Mandelberg writes:
It seems that git is overwriting my local files on merge if they're in
.gitignore. See command transcript below. I searched `git help config`
and Google, but I couldn't find any way to prevent it. Am I missing
something?
If http-backend dies because of errors, started upload-pack or
receive-pack are not killed and waited, but rather stay running for somtime
until they exits because of closed stdin. It may be undesirable in working
environment, and it also causes occasional failure of t5562, because the
processes
On Sat, Nov 24, 2018 at 04:47:19PM +0900, Junio C Hamano wrote:
> I do agree that forcing the parent to wait, like you described in
> the comment, would be far more preferrable,
It looks like it can be done as simple as:
--- a/http-backend.c
+++ b/http-backend.c
@@ -486,6 +486,8 @@ static void
On Sat, Nov 24, 2018 at 04:47:19PM +0900, Junio C Hamano wrote:
> I do agree that forcing the parent to wait, like you described in
> the comment, would be far more preferrable, [...]
Stray processes can sometimes have funny effects on an outer test
harness, too. E.g., I think I've seen hangs
On Fri, Nov 23, 2018 at 01:38:21AM +0200, Max Kirillov wrote:
> From: Jeff King
>
> Some systems do not have perl installed to /usr/bin. Use the variable
> from the build settiings, and call perl directly than via shebang.
>
> Signed-off-by: Max Kirillov
> ---
> Submitting. Could you
On Thu, Nov 22, 2018 at 07:36:54PM +0100, Ævar Arnfjörð Bjarmason wrote:
> > Yeah, my intent had been to circle back around to this, but I just
> > hadn't gotten to it. I'm still pondering a config option or similar,
> > though I remain unconvinced that the cases in which you've showed it
> >
On Sat, Nov 24, 2018 at 11:11:36AM +0900, Junio C Hamano wrote:
> > However, note that the cache-load for finding abbreviations _must_ have
> > the complete list. And has been loading it for some time. So if you run
> > "git-fetch", for example, you've already been running this code for
> >
On Sat, Nov 24 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> Change the narrow test added in 31e2617a5f ("format-patch: add
>> --range-diff option to embed diff in cover letter", 2018-07-22) to
>> test the full output. This test would have spotted a regression in the
>>
Some expected failures of git-http-backend leaves running its children
(receive-pack or upload-pack) which still hold opened descriptors
to act.err and with some probability they live long enough to write
there their failure messages after next test has already truncated
the files. This causes
Since 7cb6ac1e4b ("diff: diff_aligned_abbrev: remove ellipsis after
abbreviated SHA-1 value", 2017-12-03), the "--raw" format of diff
does not add ellipses in an attempt to align the output, but the
documentation was not updated to reflect this.
Signed-off-by: Greg Hurrell
---
The
On Sat, Nov 24, 2018 at 04:47:19PM +0900, Junio C Hamano wrote:
> Junio C Hamano writes:
> a better workaround might be to write into unique output filenames
> (act1.out, act2.out, etc.); that way, you do not have to worry about
> the output file for the next request getting clobbered by a stale
Some expected failures of git-http-backend leaves running its children
(receive-pack or upload-pack) which still hold opened descriptors
to act.err and with some probability they live long enough to write
there their failure messages after next test has already truncated
the files. This causes
Junio C Hamano writes:
> Max Kirillov writes:
>
>> diff --git a/t/t5562-http-backend-content-length.sh
>> b/t/t5562-http-backend-content-length.sh
>> index 90d890d02f..bb53f82c0c 100755
>> --- a/t/t5562-http-backend-content-length.sh
>> +++ b/t/t5562-http-backend-content-length.sh
>> @@ -25,6
Max Kirillov writes:
> diff --git a/t/t5562-http-backend-content-length.sh
> b/t/t5562-http-backend-content-length.sh
> index 90d890d02f..bb53f82c0c 100755
> --- a/t/t5562-http-backend-content-length.sh
> +++ b/t/t5562-http-backend-content-length.sh
> @@ -25,6 +25,8 @@ test_http_env() {
>
Some expected failures of git-http-backend leave running its children
(receive-pack or upload-pack) which still hold opened descriptors
to act.err and with some probability they live long enough to write
their failure messages after next test has already truncated
the files. This causes occasional
David Mandelberg writes:
> It seems that git is overwriting my local files on merge if they're in
> .gitignore. See command transcript below. I searched `git help config`
> and Google, but I couldn't find any way to prevent it. Am I missing
> something? (The reason I care about ignored files is
Junio C Hamano writes:
> Ævar Arnfjörð Bjarmason writes:
>
>> if (rev->rdiff1) {
>> +struct diff_options opts;
>> +memcpy(, >diffopt, sizeof(opts));
>> +opts.output_format &= ~(DIFF_FORMAT_DIFFSTAT |
>> DIFF_FORMAT_SUMMARY);
>> +
>>
Ævar Arnfjörð Bjarmason writes:
> Change the narrow test added in 31e2617a5f ("format-patch: add
> --range-diff option to embed diff in cover letter", 2018-07-22) to
> test the full output. This test would have spotted a regression in the
> output if it wasn't beating around the bush and tested
Hi,
It seems that git is overwriting my local files on merge if they're in
.gitignore. See command transcript below. I searched `git help config`
and Google, but I couldn't find any way to prevent it. Am I missing
something? (The reason I care about ignored files is that I'm using git
with a
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> The `%lld` format is supported on Linux and macOS, but not on Windows.
> This issue has been reported ten days ago (Message-ID:
> nycvar.qro.7.76.6.1811121300520...@tvgsbejvaqbjf.bet), but the
> corresponding topic
Thanks for a patch.
Greg Hurrell writes:
> Commit 7cb6ac1e4b made the diff format omit ellipses by default, but
> there is still this place in the documentation where we show examples of
> output with ellipses.
We prefer to cite an existing commit with its title and date these
days, not just
Jeff King writes:
>> +if ((o->pickaxe_opts & DIFF_PICKAXE_KIND_G) &&
>> +((!textconv_one && diff_filespec_is_binary(o->repo, p->one)) ||
>> + (!textconv_two && diff_filespec_is_binary(o->repo, p->two
>> +return 0;
>
> If the user passes "-a" to treat binary
Ævar Arnfjörð Bjarmason writes:
> On Wed, Nov 21 2018, Thomas Braun wrote:
>
>> The -S option of log looks for differences that changes the
>> number of occurrences of the specified string (i.e. addition/deletion)
>> in a file.
>>
> ...
> This should just be part of 1/2 since the behavior is
Ævar Arnfjörð Bjarmason writes:
> if (rev->rdiff1) {
> + struct diff_options opts;
> + memcpy(, >diffopt, sizeof(opts));
> + opts.output_format &= ~(DIFF_FORMAT_DIFFSTAT |
> DIFF_FORMAT_SUMMARY);
> +
> fprintf_ln(rev->diffopt.file, "%s",
Jeff King writes:
> Yeah, my intent had been to circle back around to this, but I just
> hadn't gotten to it. I'm still pondering a config option or similar,
> though I remain unconvinced that the cases in which you've showed it
> being slow are actually realistic or worth worrying about (and
Denton Liu writes:
> I just realised that there is a slight problem with the proposed change.
> When we do a merge and there are no merge conflicts, at the end of the
> merge, we get dropped into an editor with this text:
>
> Merge branch 'master' into new
>
> # Please enter a commit
Johannes Schindelin writes:
> To fix this, I prepared a GitGitGadget PR
> (https://github.com/gitgitgadget/git/pull/87) and will submit it as soon
> as I am satisfied that the build works.
Thanks. This won't be in the upcoming release anyway, so we can fix
it up without "oops, let's pile
Am 23.11.18 um 19:19 schrieb Frank Schäfer:
The CR marker ^M doesn't show up in '-' lines of diffs when the ending
of the removed line is CR+LF.
It shows up as expected in '-' lines when the ending of the removed line
is CR only.
It also always shows up as expected in '+' lines.
Is your
The CR marker ^M doesn't show up in '-' lines of diffs when the ending
of the removed line is CR+LF.
It shows up as expected in '-' lines when the ending of the removed line
is CR only.
It also always shows up as expected in '+' lines.
These are the diffs of the 6 possible line ending changes:
Tested-by: Carlo Marcelo Arenas Belón
IMHO leaving the shebang might be better if only for consistency but
could go eitherway
Carlo
On Thu, Nov 22, 2018 at 3:43 PM Max Kirillov wrote:
> also edited the test to include only push_plain case,
> and repeat it several times, to avoid running irrelevant
> cases, the failure never happened again.
as I explained previously[1] and as odd as it might seem the
push_plain case ONLY
On Fri, 23 Nov 2018 at 11:13, Johannes Schindelin
wrote:
> On Mon, 30 Oct 2017, Pranit Bauva wrote:
>
> > On Fri, Oct 27, 2017 at 10:58 PM, Martin Ågren
> > wrote:
> > > On 27 October 2017 at 17:06, Pranit Bauva wrote:
> > >> +static void free_terms(struct bisect_terms *terms)
> > >> +{
> > >>
Hi Carlo,
On Thu, 22 Nov 2018, Carlo Marcelo Arenas Belón wrote:
> Subject: [PATCH] entry: remove windows fallback to inode checking
>
> this test is really FS specific, so is better to avoid any compiled
> assumptions about the platform and let the user drive the fallback
> through
Hi Peff,
On Thu, 22 Nov 2018, Jeff King wrote:
> On Thu, Nov 22, 2018 at 01:48:53PM +0100, Johannes Schindelin wrote:
>
> > So YMMV with git-s. My rule of thumb is: if I want to use this
> > myself only, I'll make it an alias. If I want to ship it (e.g. with Git
> > for Windows), I'll make it a
From: Phillip Wood
When using --color-moved-ws=allow-indentation-change allow lines with
the same indentation change to be grouped across blank lines. For now
this only works if the blank lines have been moved as well, not for
blocks that have just had their indentation changed.
This completes
From: Phillip Wood
Add documentation for --no-color-moved.
Signed-off-by: Phillip Wood
---
Documentation/diff-options.txt | 4
1 file changed, 4 insertions(+)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 0378cd574e..151690f814 100644
---
From: Phillip Wood
Most of the messages and documentation use 'whitespace' rather than
'white space' or 'white spaces' convert to latter two to the former for
consistency.
Signed-off-by: Phillip Wood
---
Documentation/diff-options.txt | 4 ++--
Documentation/git-cat-file.txt | 8
From: Phillip Wood
Allow --no-color-moved-ws and --color-moved-ws=no to cancel any previous
--color-moved-ws option.
Signed-off-by: Phillip Wood
---
Documentation/diff-options.txt | 7 +++
diff.c | 6 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff
From: Phillip Wood
'diff --color-moved-ws=allow-indentation-change' can highlight lines
that have internal whitespace changes rather than indentation
changes. For example in commit 1a07e59c3e ("Update messages in
preparation for i18n", 2018-07-21) the lines
- die (_("must end with
From: Phillip Wood
When running
git diff --color-moved-ws=allow-indentation-change v2.18.0 v2.19.0
cmp_in_block_with_wsd() is called 694908327 times. Of those 42.7%
return after comparing a and b. By comparing the lengths first we can
return early in all but 0.03% of those cases without
From: Phillip Wood
Currently when using --color-moved=zebra the color of moved blocks
depends on the number of lines separating them. This means that adding
an odd number of unmoved lines between blocks that are already separated
by one or more unmoved lines will change the color of subsequent
From: Phillip Wood
Thanks to Stefan for his feedback on v1. I've updated patches 2 & 8 in
response to those comments - see the range-diff below for details (the
patch numbers are off by one in the range diff, I think because the
first patch is unchanged and so it was used as the merge base by
From: Phillip Wood
'diff --color-moved-ws=allow-indentation-change' can color lines as
moved when they are in fact different. For example in commit
1a07e59c3e ("Update messages in preparation for i18n", 2018-07-21) the
lines
- die (_("must end with a color"));
+
From: Phillip Wood
Currently diff --color-moved-ws=allow-indentation-change does not
support indentation that contains a mix of tabs and spaces. For
example in commit 546f70f377 ("convert.h: drop 'extern' from function
declaration", 2018-06-30) the function parameters in the following
lines are
Hi,
I'm managing many bare repositories for development teams.
One service we want to offer is to let developers retrieve old state
of the repository up to 30 days. For example, one developer
(accidently) removed (push -f) a branch/tag and realize few days later
(after vacations) that it was an
Hi Pranit,
(Cc:ing Tanushree because they will try to pick up this patch series as
part of the Outreachy program.)
On Mon, 30 Oct 2017, Pranit Bauva wrote:
> On Fri, Oct 27, 2017 at 10:58 PM, Martin Ågren wrote:
> > On 27 October 2017 at 17:06, Pranit Bauva wrote:
> >> +static void
Hi Paul,
On Thu, 22 Nov 2018, Paul Gureghian wrote:
> I installed 2.19.2 on windows 7 , 32 bit and it wont launch.
This has been reported on Gitter and fixed in
https://github.com/git-for-windows/MINGW-packages/commit/deb0395d031401ffe55024fb066267e2ea8d032b
For the time being, please either
Outlook
Prezado usuário da conta,
Alguns de seus e-mails recebidos foram colocados em status pendente devido à
recente atualização em nosso banco de dados. Para receber suas mensagens,
Clique no link abaixo para entrar e aguardar a resposta do Webmail.
CLIQUE
Jeff King wrote:
> On Thu, Nov 22, 2018 at 11:58:36AM +0100, Greg Hurrell wrote:
>
> > diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
> > index 706916c94c..33776459d0 100644
> > --- a/Documentation/diff-format.txt
> > +++ b/Documentation/diff-format.txt
> > @@ -26,12
Commit 7cb6ac1e4b made the diff format omit ellipses by default, but
there is still this place in the documentation where we show examples of
output with ellipses.
The GIT_PRINT_SHA1_ELLIPSIS environment variable can be used, for now,
to bring back the old output format, but that is already
Outlook
Prezado usuário da conta,
Alguns de seus e-mails recebidos foram colocados em status pendente devido à
recente atualização em nosso banco de dados. Para receber suas mensagens,
Clique no link abaixo para entrar e aguardar a resposta do Webmail.
CLIQUE
I installed 2.19.2 on windows 7 , 32 bit and it wont launch.
Hi GB,
On Fri, 23 Nov 2018 at 04:23, Mgr Georg Black wrote:
>
> Hello everyone.I red git manual but I can't figure out how to propagate
> critical change from master branch to long live develop branch. I red chapter
> about rebasing that I think could solve it but at the end of this chapter is
On Thu, Nov 22, 2018 at 11:17:22AM -0500, Jeff King wrote:
> The script I use is at:
>
> https://github.com/peff/git/blob/meta/stress
>
> which you invoke like "/path/to/stress t5562" from the top-level of a
> git.git checkout. It basically just runs a loop of twice as many
> simultaneous
From: Jeff King
Some systems do not have perl installed to /usr/bin. Use the variable
from the build settiings, and call perl directly than via shebang.
Signed-off-by: Max Kirillov
---
Submitting. Could you sign-off? Also removed shebang from the script as it is
not needed
Add stash show to the helper and delete the show_stash, have_stash,
assert_stash_like, is_stash_like and parse_flags_and_rev functions
from the shell script now that they are no longer needed.
In shell version, although `git stash show` accepts `--index` and
`--quiet` options, it ignores them. In
The old shell script `git-stash.sh` was removed and replaced
entirely by `builtin/stash.c`. In order to do that, `create` and
`push` were adapted to work without `stash.sh`. For example, before
this commit, `git stash create` called `git stash--helper create
--message "$*"`. If it called `git
Add stash store to the helper and delete the store_stash function
from the shell script.
Signed-off-by: Paul-Sebastian Ungureanu
---
builtin/stash--helper.c | 62 +
git-stash.sh| 43 ++--
2 files changed, 64
Add stash create to the helper.
Signed-off-by: Paul-Sebastian Ungureanu
---
builtin/stash--helper.c | 451 +++-
git-stash.sh| 2 +-
2 files changed, 451 insertions(+), 2 deletions(-)
diff --git a/builtin/stash--helper.c
Compared to `get_oid()`, `get_oidf()` has as parameters
a pointer to `object_id`, a printf format string and
additional arguments. This will help simplify the code
in subsequent commits.
Original-idea-by: Johannes Schindelin
Signed-off-by: Paul-Sebastian Ungureanu
---
cache.h | 1 +
Implement `strbuf_join_argv()` to join arguments
into a strbuf.
Signed-off-by: Paul-Sebastian Ungureanu
---
strbuf.c | 15 +++
strbuf.h | 7 +++
2 files changed, 22 insertions(+)
diff --git a/strbuf.c b/strbuf.c
index f6a6cf78b9..82e90f1dfe 100644
--- a/strbuf.c
+++ b/strbuf.c
From: Joel Teichroeb
Add the drop and clear commands to the builtin helper. These two
are each simple, but are being added together as they are quite
related.
We have to unfortunately keep the drop and clear functions in the
shell script as functions are called with parameters internally
that
This commits introduces a optimization by avoiding calling the
same functions again. For example, `git stash push -u`
would call at some points the following functions:
* `check_changes()` (inside `do_push_stash()`)
* `do_create_stash()`, which calls: `check_changes()` and
From: Joel Teichroeb
Add stash pop to the helper and delete the pop_stash, drop_stash,
assert_stash_ref functions from the shell script now that they
are no longer needed.
Signed-off-by: Joel Teichroeb
Signed-off-by: Paul-Sebastian Ungureanu
---
builtin/stash--helper.c | 39
There is a change in behaviour with this commit. When there was
no initial commit, the shell version of stash would still display
a message. This commit makes `push` to not display any message if
`--quiet` or `-q` is specified. Add tests for `--quiet`.
Signed-off-by: Paul-Sebastian Ungureanu
---
From: Joel Teichroeb
Add stash branch to the helper and delete the apply_to_branch
function from the shell script.
Checkout does not currently provide a function for checking out
a branch as cmd_checkout does a large amount of sanity checks
first that we require here.
Signed-off-by: Joel
801 - 900 of 197272 matches
Mail list logo
