Junio C Hamano writes:
> Sergey Organov writes:
>
>> I think that "first-parent is special" is the way to go indeed for
>> porcelain, as it does make many thing easier and more convenient[*].
>
> Perhaps. However ...
>
>> [*] One example that immediately comes to mind is "git log -p" for a
>> m
Hi Everyone,
I'm working on a low-resource dev-board. It is missing a lot of
utilities to save space. I'm building Git 2.20 from sources. Make is
failing due to '/bin/sh: 1: msgfmt: not found'. I don't cross-compile
because that's a bigger pain in the ass than waiting for the native
build to finis
On Sat, Mar 23, 2019 at 08:25:28AM -0700, Denton Liu wrote:
> A common scenario is if a user is working on a topic branch and they
> wish to make some changes to intermediate commits or autosquashing, they
Sorry, small typo here:
s/autosquashing/autosquash/
-Denton
> would run something such as
On Sun, Mar 24, 2019 at 05:06:18PM -0700, Denton Liu wrote:
> Hi Junio,
>
> On Sun, Mar 24, 2019 at 10:20:28PM +0900, Junio C Hamano wrote:
> > Denton Liu writes:
> >
> > > A common scenario is if a user is working on a topic branch and they
> > > wish to make some changes to intermediate commit
On Sun, Mar 24, 2019 at 11:10 PM Alex Henrie wrote:
>
> I like the idea of a completely separate `git graph` command. This
> command would simply be a builtin alias for `git log --abbrev-commit
> --pretty=oneline`, like how `git reflog` is a builtin alias for `git
> log -g --abbrev-commit --pretty
On Sun, Mar 24, 2019 at 7:18 PM Rafael Ascensão wrote:
>
> But If we make the default to 'short' (or anything else), what should be
> done if the user has `format.pretty=` defined to something? Is `--graph`
> special to be allowed to not follow said configuration?
>
> It's inconsistent itself, and
mich...@platin.gs writes:
> From: Michael Platings
>
> Hi Git devs,
>
> Some of you may be familiar with the git-hyper-blame tool [1]. It's "useful if
> you have a commit that makes sweeping changes that are unlikely to be what you
> are looking for in a blame, such as mass reformatting or renami
Nguyễn Thái Ngọc Duy writes:
> The current wildmatch() call for includeIf's gitdir pattern does not
> pass the WM_PATHNAME flag. Without this flag, '*' is treated _almost_
> the same as '**' (because '*' also matches slashes) with one exception:
>
> '/**/' can match a single slash. The pattern '
Daniel Kahn Gillmor writes:
> What do you think of my updated proposal for tag.verifyNameMatch ?
Meh to slightly negative for hard-coding project-specific preference
to the core tools. "We give you --format so go wild in your project
to do verification your project likes." I think was the conc
Ævar Arnfjörð Bjarmason writes:
> On Sun, Mar 24 2019, Junio C Hamano wrote:
>
>> Ævar Arnfjörð Bjarmason writes:
>>
>>> The reason I'm raising this is that it seems like sweeping an existing
>>> issue under the rug. We document that the "sid" is "unique", and it's just:
>>>
>>> -
>>
>> If i
Hi Alex,
On Sun, Mar 24, 2019 at 04:37:25PM -0600, Alex Henrie wrote:
>
> Can we compromise and make --pretty=short the default for --graph?
>
I agree that `pretty=medium` is sometimes hard to read and, as of now,
`pretty=oneline` can be very misleading:
$ git log --graph --oneline todo~2.
Hi Junio,
On Sun, Mar 24, 2019 at 10:20:28PM +0900, Junio C Hamano wrote:
> Denton Liu writes:
>
> > A common scenario is if a user is working on a topic branch and they
> > wish to make some changes to intermediate commits or autosquashing, they
> > would run something such as
> >
> > git r
Hi Junio,
On Sun, Mar 24, 2019 at 10:15:31PM +0900, Junio C Hamano wrote:
> Denton Liu writes:
>
> > This series teaches rebase the --keep-base option.
> >
> > 'git rebase --keep-base ' is equivalent to
> > 'git rebase --onto ... ' or
> > 'git rebase --onto $(git merge-base HEAD) ' .
> >
> > Th
From: Michael Platings
---
blame.c| 352 +++--
blame.h| 1 +
builtin/blame.c| 3 +
t/t8020-blame-fuzzy.sh | 264 +
4 files changed, 609 insertions(+), 11 deletions(-)
crea
From: Michael Platings
Hi Git devs,
Some of you may be familiar with the git-hyper-blame tool [1]. It's "useful if
you have a commit that makes sweeping changes that are unlikely to be what you
are looking for in a blame, such as mass reformatting or renaming."
git-hyper-blame is useful but (a)
On Sun, Mar 24, 2019 at 7:03 AM Junio C Hamano wrote:
>
> Alex Henrie writes:
>
> > Having --pretty=medium as the default almost always makes the graph too
> > difficult to follow.
> >
> > Signed-off-by: Alex Henrie
> > ---
>
> I too thought that "--graph" should make "--oneline" the default
> b
When our '.travis.yml' was split into several 'ci/*' scripts [1], the
installation of the 'asciidoctor' gem somehow ended up in
'ci/test-documentation.sh'.
Install it in 'ci/install-dependencies.sh', where we install
everything else.
[1] 657343a602 (travis-ci: move Travis CI code into dedicated s
Asciidoctor versions v1.5.7 or later print the following warning while
building the documentation:
ASCIIDOC technical/api-config.html
asciidoctor: WARNING: api-config.txt: line 232: unterminated listing block
This highlight an issue (even with older Asciidoctor versions) where
the length
The release of Asciidoctor v2.0.0 two days ago broke our documentation
build job on Travis CI, where we 'gem install asciidoctor', which
always brings us the latest and (supposedly) greatest. Alas, we are
not ready for that just yet, because it removed support for DocBook
4.5, and we have been req
Asciidoctor versions v1.5.7 or later print the following warning while
building the documentation:
ASCIIDOC git-diff-tree.xml
asciidoctor: WARNING: diff-format.txt: line 2: unterminated listing block
This highlights an issue (even with older Asciidoctor versions) where
the "Raw output for
In our 'ci/*' build scripts we rely on 'set -e' aborting the build job
when a command exits with error, while in 'ci/test-documentation.sh'
we tried to check the emptiness of AsciiDoc's and Asciidoctor's
standard error with '! test -s stderr.log'. Unfortunately, the
combination of the two doesn't
Asciidoctor versions v1.5.7 or later print the following warning while
building the documentation:
ASCIIDOC technical/protocol-v2.html
asciidoctor: WARNING: protocol-v2.txt: line 38: unterminated listing block
This highlights an issue (even with older Asciidoctor versions) where
the 'Init
The first three patches fix formatting issues with Asciidoctor; they
are the same patches that I sent earlier today, except some commit
message updates (now they mention the Asciidoctor version which
started to issue the warning, and I fixed that missing half-sentence
in one of the commit messages)
On Fri, Mar 22, 2019 at 08:22:31PM -0300, Matheus Tavares wrote:
> From: Ævar Arnfjörð Bjarmason
>
> Add tests for what happens when we perform a local clone on a repo
> containing odd files at .git/object directory, such as symlinks to other
> dirs, or unknown files.
>
> I'm bending over backwa
On Sun, Mar 24 2019, jonathan chang wrote:
> On Mon, Mar 18, 2019 at 12:47 AM Ævar Arnfjörð Bjarmason
> wrote:
>>
>>
>> On Sun, Mar 17 2019, Jonathan Chang wrote:
>>
>> > The exit code of the upstream in a pipe is ignored thus we should avoid
>> > using it. By writing out the output of the git
On Sun, Mar 24 2019, Junio C Hamano wrote:
> Alex Henrie writes:
>
>> Having --pretty=medium as the default almost always makes the graph too
>> difficult to follow.
>>
>> Signed-off-by: Alex Henrie
>> ---
>
> I too thought that "--graph" should make "--oneline" the default
> back when I origi
On Fri, Mar 22, 2019 at 8:22 PM Matheus Tavares
wrote:
>
> From: Ævar Arnfjörð Bjarmason
>
> Add tests for what happens when we perform a local clone on a repo
> containing odd files at .git/object directory, such as symlinks to other
> dirs, or unknown files.
>
> I'm bending over backwards here
Hi,
Jeff King wrote:
> On Sat, Mar 23, 2019 at 03:27:56PM -0400, Todd Zullinger wrote:
>
>> I updated my system to asciidoctor-2.0.0 last night and now
>> I can't even generate the man pages properly, because the
>> docbook45 converter was removed. I'll have to see if I
>> missed some other requ
On Sun, Mar 24, 2019 at 04:52:19PM +0100, SZEDER Gábor wrote:
> Some more recent versions of Asciidoctor issue the following warning
> while building the documentation:
>
> ASCIIDOC technical/protocol-v2.html
> asciidoctor: WARNING: protocol-v2.txt: line 38: unterminated listing block
>
>
Some more recent versions of Asciidoctor issue the following warning
while building the documentation:
ASCIIDOC git-diff-tree.xml
asciidoctor: WARNING: diff-format.txt: line 2: unterminated listing block
This highlights an issue where the "Raw output format" header is not
rendered as a he
Some more recent versions of Asciidoctor issue the following warning
while building the documentation:
ASCIIDOC technical/protocol-v2.html
asciidoctor: WARNING: protocol-v2.txt: line 38: unterminated listing block
This highlights an issue where the 'Initial Client Request' header is
not r
Some more recent versions of Asciidoctor issue the following warning
while building the documentation:
ASCIIDOC technical/api-config.html
asciidoctor: WARNING: api-config.txt: line 232: unterminated listing block
This highlight an issue where the length of the '' lines
surrounding a c
On Sun 2019-03-24 21:26:13 +0900, Junio C Hamano wrote:
> Daniel Kahn Gillmor writes:
>
>> I don't personally have any use case for doing such a tag rename -- you
>> mention two:
>>
>> a) wanting to call tag "foo" that you found on remote "origin" by the
>> name of "origin/foo"
>>
>> b) want
On Fri, Mar 22 2019, Daniel Kahn Gillmor wrote:
> On Wed 2019-03-20 23:35:48 +0100, Ævar Arnfjörð Bjarmason wrote:
>> But e.g. if you've signed a v1.00 in foo.git, but also maintain bar.git
>> and have a v2.00 there, I can be fooled in foo.git with your proposed
>> change by having the v2.00 bar
On Sun, Mar 24 2019, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
>> The reason I'm raising this is that it seems like sweeping an existing
>> issue under the rug. We document that the "sid" is "unique", and it's just:
>>
>> -
>
> If it is just that, then it cannot be unique, c
Denton Liu writes:
> if (strstr(options.onto_name, "...")) {
> if (get_oid_mb(options.onto_name, &merge_base) < 0)
> + if (keep_base)
> + die(_("'%s': need exactly one merge base with branch"),
> + options.upstrea
Denton Liu writes:
> A common scenario is if a user is working on a topic branch and they
> wish to make some changes to intermediate commits or autosquashing, they
> would run something such as
>
> git rebase -i --onto master... master
>
> in order to preserve the merge base. This prevents
The current wildmatch() call for includeIf's gitdir pattern does not
pass the WM_PATHNAME flag. Without this flag, '*' is treated _almost_
the same as '**' (because '*' also matches slashes) with one exception:
'/**/' can match a single slash. The pattern 'foo/**/bar' matches
'foo/bar'.
But '/*/'
Denton Liu writes:
> This series teaches rebase the --keep-base option.
>
> 'git rebase --keep-base ' is equivalent to
> 'git rebase --onto ... ' or
> 'git rebase --onto $(git merge-base HEAD) ' .
>
> This seems to be a common case that people (including myself!) run
> into; I was able to find t
Alex Henrie writes:
> Having --pretty=medium as the default almost always makes the graph too
> difficult to follow.
>
> Signed-off-by: Alex Henrie
> ---
I too thought that "--graph" should make "--oneline" the default
back when I originally accepted the patch series that introduced the
"--grap
Nguyễn Thái Ngọc Duy writes:
> The current wildmatch() call for includeIf's gitdir pattern does not
> pass the WM_PATHNAME flag. Without this flag, '*' is treated _almost_
> the same as '**' (because '*' also matches slashes) with one exception:
>
> '/**/' can match a single slash. The pattern '
Johannes Schindelin writes:
> Sharp eyes, and a *very* good point. The double space is actually required
> for this patch to work as intended. I added the following explanation to
> the commit message:
>
> Note that `$(ALL_COMMANDS)` starts with a space, and that is rather
> crucial for t
Keith Smiley writes:
> In the case there are no files to stash, but the user asked to stash, we
> should exit 1 since the stashing failed.
> ---
Sorry, but I fail to see why this is a good change. Did you have
some script that wanted the exit code from "git stash" to indicate
if it had anything
Ævar Arnfjörð Bjarmason writes:
> The reason I'm raising this is that it seems like sweeping an existing
> issue under the rug. We document that the "sid" is "unique", and it's just:
>
> -
If it is just that, then it cannot be unique, can it?
Let's just fix the wrong doc and move on.
Daniel Kahn Gillmor writes:
> I don't personally have any use case for doing such a tag rename -- you
> mention two:
>
> a) wanting to call tag "foo" that you found on remote "origin" by the
> name of "origin/foo"
>
> b) wanting to call "v2.20.0" by the name "g2.20.0"
For the record, in th
On Sat, Mar 23, 2019 at 03:27:56PM -0400, Todd Zullinger wrote:
> I updated my system to asciidoctor-2.0.0 last night and now
> I can't even generate the man pages properly, because the
> docbook45 converter was removed. I'll have to see if I
> missed some other required update. :/
I ran into th
When we switched off CURLOPT_FAILONERROR in 17966c0a63 (http: avoid
disconnecting on 404s for loose objects, 2016-07-11), the fetch_object()
function started manually handling 404's. Since we now have
normalize_curl_result() for use elsewhere, we can use it here as well,
shortening the code.
Note
If the dumb-http walker encounters a 404 when fetching a loose object,
it then looks at any http-alternates for the object. The 404 check is
implemented by missing_target(), which checks not only the http code,
but also that we got an http error from the CURLcode.
That broke when we stopped using
We make some requests with CURLOPT_FAILONERROR and some without, and
then handle_curl_result() normalizes any failures to a uniform CURLcode.
There are some other code paths in the dumb-http walker which don't use
handle_curl_result(); let's pull the normalization into its own function
so it can b
On Sat, Mar 23, 2019 at 04:53:41AM -0400, Jeff King wrote:
> On Fri, Mar 22, 2019 at 04:50:34PM +, Eric Wong wrote:
>
> > > Weird. I had set http.maxrequests to "1" to give more readable output
> > > from GIT_CURL_VERBOSE, etc. It fails with that setting, but not with the
> > > default of 5.
On Mon, Mar 18, 2019 at 12:47 AM Ævar Arnfjörð Bjarmason
wrote:
>
>
> On Sun, Mar 17 2019, Jonathan Chang wrote:
>
> > The exit code of the upstream in a pipe is ignored thus we should avoid
> > using it. By writing out the output of the git command to a file, we can
> > test the exit codes of bot
On Sun, Mar 24, 2019 at 2:49 PM Christian Couder
wrote:
>
> The test_language_driver() function used to test the regexps is
> ...
> GIT_TEST_CMP which is usually either "diff -u" or "diff -c".
Thanks.
please provide some insights on the regex mentioned below:
+
+PATTERNS("shell",
+ /* Function
Hi Taylor,
On Fri, 22 Mar 2019, Taylor Blau wrote:
> On Wed, Mar 13, 2019 at 04:56:53AM -0700, Johannes Schindelin via
> GitGitGadget wrote:
> > From: Johannes Schindelin
> >
> > On Windows, for example, executables (must) have the extension `.exe`.
> > Our `check-docs` target was not prepared
On Sun, Mar 24, 2019 at 9:04 AM Kapil Jain wrote:
>
> On Sun, Mar 24, 2019 at 1:34 AM Christian Couder
> wrote:
> >
> > To save some work by people who could help you, it might be a good
> > idea to show the output of the failing test, for example the output of
> > `./t4034-diff-words.sh -i -v` o
Signed-off-by: Kapil Jain
---
The test passes now, but imo the regex is not working,
because the output of git diff with shell regex remains same
as earlier it was without shell regex.
without shell regex the output was shown as:
-$TEST_DIRECTORY
+$TEST_DIR
with shell regex the output should be
diff_opt_parse() is a heavy hammer to just set diff filter. But it's
the only way because of the diff_status_letters[] mapping. Add a new
API to set diff filter and use it in git-am. diff_opt_parse()'s only
remaining call site in revision.c will be gone soon and having it here
just because of git-a
While at there, move exit() back to the caller. It's easier to see the
flow that way than burying it in diff-no-index.c
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/diff.c | 21 +++--
diff-no-index.c | 49
diff.h
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index e1675a32ec..6029f8de2d 100644
--- a/diff.c
+++ b/diff.c
@@ -5022,6 +5022,18 @@ static int diff_opt_line_prefix(const struct option *opt,
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 50 +++--
parse-options.h | 3 ++-
2 files changed, 5 insertions(+), 48 deletions(-)
diff --git a/diff.c b/diff.c
index 6029f8de2d..8b65b03c0d 100644
--- a/diff.c
+++ b/diff.c
@@ -4573,50 +4573
This option is added in commit b73bcbac4a (diff: allow
--no-color-moved-ws - 2018-11-23) in pw/diff-color-moved-ws-fix. To ease
merge conflict resolution, re-implement the option handling here so that
the conflict could be resolved by taking this side of change.
Signed-off-by: Nguyễn Thái Ngọc Duy
Mark one more string for translation while at there
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 38 +-
1 file changed, 25 insertions(+), 13 deletions(-)
diff --git a/diff.c b/diff.c
index 8b65b03c0d..de6c09e95a 100644
--- a/diff.c
+++ b/diff.c
@@ -4841,6
Diff's internal option parsing is now done with 'struct option', which
makes it possible to combine all diff options to range-diff and parse
everything all at once. Parsing code becomes simpler, and we get a
looong 'git range-diff -h'
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/range-diff.c
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 35 ++-
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/diff.c b/diff.c
index de6c09e95a..1a24bbfb69 100644
--- a/diff.c
+++ b/diff.c
@@ -4862,6 +4862,20 @@ static int diff_opt_color_moved(const struc
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 23 +++
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/diff.c b/diff.c
index 574fc511ff..e1675a32ec 100644
--- a/diff.c
+++ b/diff.c
@@ -5010,6 +5010,18 @@ static int diff_opt_ignore_submodules(const struct
opti
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 37 -
1 file changed, 28 insertions(+), 9 deletions(-)
diff --git a/diff.c b/diff.c
index 6b19c97499..8f01fbc2c1 100644
--- a/diff.c
+++ b/diff.c
@@ -5056,6 +5056,28 @@ static int diff_opt_patience(const struct
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/diff.c b/diff.c
index 2b1d015553..6b19c97499 100644
--- a/diff.c
+++ b/diff.c
@@ -5283,6 +5283,8 @@ static void prep_parse_options(struct diff_options
*options)
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 23 +++
1 file changed, 3 insertions(+), 20 deletions(-)
diff --git a/diff.c b/diff.c
index 699f8605d0..849620aea5 100644
--- a/diff.c
+++ b/diff.c
@@ -4617,22 +4617,6 @@ static int opt_arg(const char *arg, int arg_short, const
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 8255db6966..2b1d015553 100644
--- a/diff.c
+++ b/diff.c
@@ -5238,6 +5238,9 @@ static void prep_parse_options(struct diff_options
*options)
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/diff.c b/diff.c
index 8f01fbc2c1..699f8605d0 100644
--- a/diff.c
+++ b/diff.c
@@ -5391,6 +5391,12 @@ static void prep_parse_options(struct diff_options
*options)
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 14 ++
parse-options.h | 3 ++-
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/diff.c b/diff.c
index 8d387280a4..574fc511ff 100644
--- a/diff.c
+++ b/diff.c
@@ -5255,6 +5255,12 @@ static void prep_parse_options
While at it, mark one more string for translation
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/diff.c b/diff.c
index 99871d2546..47146c33f5 100644
--- a/diff.c
+++ b/diff.c
@@ -4736,10 +4736,13 @@ static uns
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/diff.c b/diff.c
index 7bfdf08137..8255db6966 100644
--- a/diff.c
+++ b/diff.c
@@ -5352,6 +5352,12 @@ static void prep_parse_options(struct diff_options
*options)
Mark one more string for translation while at there.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/diff.c b/diff.c
index ce118bb326..7bfdf08137 100644
--- a/diff.c
+++ b/diff.c
@@ -4801,17 +4801,18 @@ s
v2 fixes some help text and commit messages. No major changes.
Nguyễn Thái Ngọc Duy (20):
diff-parseopt: convert --ws-error-highlight
diff-parseopt: convert --ita-[in]visible-in-index
diff-parseopt: convert -z
diff-parseopt: convert -l
diff-parseopt: convert -S|-G
diff-parseopt: conver
OPT__ABBREV() has the same behavior as the deleted code with one
difference: it does check for valid number and error out if not. And the
'40' change is self explanatory.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 12 +---
parse-options-cb.c | 4 ++--
2 files changed,
While at it, mark one more string for translation.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff.c | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/diff.c b/diff.c
index 849620aea5..99871d2546 100644
--- a/diff.c
+++ b/diff.c
@@ -4799,12 +4799,15 @@ static int di
On Sun, Mar 24, 2019 at 1:34 AM Christian Couder
wrote:
>
> To save some work by people who could help you, it might be a good
> idea to show the output of the failing test, for example the output of
> `./t4034-diff-words.sh -i -v` or `./t4034-diff-words.sh -i -v -x`.
Looks like i just needed to
On Sun, Mar 24, 2019 at 6:01 AM Klaatu wrote:
>
> Working with Git 2.21.0 on Linux:
>
> The git-add(1) man page says:
>
> "The optional configuration variable core.excludesFile indicates a path to a
> file containing patterns of file names to exclude from git-add"
>
> But if I do this:
>
> $ echo
Dear Sir/Ma’am,
We are an Web Design & Development company, comprising young and dynamic
professionals. We have executed a number of projects in the below mentioned
categories:
Website Design & Development
PHP & MySQL website application development
E-Commerce Applications/ Websites
Laravel & V
79 matches
Mail list logo
