On Sun, Apr 07, 2019 at 07:47:51PM +0100, Thomas Gummerer wrote:
> struct stat_data and struct cache_time both use unsigned ints for all
> their members. However the format string for 'git ls-files --debug'
> currently uses %d for formatting these numbers. This means that we
> potentially print
On Tue, Apr 09, 2019 at 04:42:55PM -0700, Josh Steadmon wrote:
> > warning: reflog of 'HEAD' references pruned commits
> > warning: reflog of 'refs/heads/master' references pruned commits
> > fatal: unable to read 71905dfcd543b7cbb0b4b66fbd20379e67220557
> > error: last command exited with
Initially reported for GFW on version 2.20.1, I have tested with Linux Mint
Mate 19.1 Tessa which by default uses git version 2.17.1
It produces a config file with the relevant submodule entries looking like this:
[submodule]
active = .
[submodule "Submodule/Path"]
First time reporting a bug :) or at least what I think it may be.
There's a few similar cases I think I've seen in the past, but the one I'm sure
about is the semicolon instead of space between multiple branches, that should
be a syntax error if git merge can't accept that command .. if the peop
On Thu, Apr 11, 2019 at 3:56 AM Johannes Schindelin
wrote:
> > @@
> > + expression c;
> > ++expression r;
> > + expression s;
> > + @@
> > +-- get_commit_tree(c) = s
> > ++- repo_get_commit_tree(r, c) = s
> > + + c->maybe_tree = s
>
> I think this is wrong, and ad
In 7a36987fff ("send-email: add an auto option for transfer encoding",
2018-07-08), git send-email learned how to automatically determine the
transfer encoding for a patch. However, the only criterion considered
was the length of the lines.
Another case we need to consider is that of carriage retu
On Tue, Apr 09, 2019 at 05:10:43PM +0200, Ævar Arnfjörð Bjarmason wrote:
> I've found a case where turning bitmaps on does horrible things for
> bitmap "push" performance.
> [...]
> I can't share the repo, but I had a report where just a "git push" of a
> topic branch that was 2/58 ahead/behind to
On Wed, Apr 10, 2019 at 10:40:51PM +0200, Heinrich Schuchardt wrote:
> Sounds reasonable. But including the tests requested nothing I could
> easily shoulder.
>
> Just a quite different thought:
>
> 'auto' should discover a safe transfer encoding. Why does 'auto' not
> discover that a patch conta
Hi Junio,
On Wed, 10 Apr 2019, Junio C Hamano wrote:
> * jh/trace2-sid-fix (2019-04-01) 7 commits
> - trace2: make SIDs more unique
> - trace2: clarify UTC datetime formatting
> - trace2: report peak memory usage of the process
> - trace2: use system config for default trace2 settings
> - tr
Hi Phillip,
On Wed, 10 Apr 2019, Phillip Wood wrote:
> On 09/04/2019 19:08, Junio C Hamano wrote:
> > Here are the topics that have been cooking. Commits prefixed with
> > '-' are only in 'pu' (proposed updates) while commits prefixed with
> > '+' are in 'next'. The ones marked with '.' do not
Hi,
On Wed, 10 Apr 2019, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > On 04/10, Junio C Hamano wrote:
> >
> >> * tg/stash-in-c-show-default-to-p-fix (2019-03-21) 1 commit
> >> (merged to 'next' on 2019-04-10 at 9489a31a36)
> >> + stash: setup default diff output format if necessary
>
Hi Junio,
On Wed, 10 Apr 2019, Junio C Hamano wrote:
> * dl/warn-tagging-a-tag (2019-04-09) 2 commits
> - tag: advise on nested tags
> - tag: fix formatting
>
> "git tag" learned to give an advice suggesting it might be a
> mistake when creating an annotated or signed tag that points at
> an
Hi Junio,
On Wed, 10 Apr 2019, Junio C Hamano wrote:
> * nd/switch-and-restore (2019-04-02) 39 commits
> - doc: promote "git restore"
> - completion: support restore
> - SQUASH??? move -p test to 2071 from 2070
> - t: add tests for restore
> - restore: support --patch
> - restore: default t
Hi Duy,
On Sat, 6 Apr 2019, Nguyễn Thái Ngọc Duy wrote:
> 10: 68876a150f ! 11: 848456f59c commit.c: add repo_get_commit_tree()
> @@ -2,6 +2,11 @@
>
> commit.c: add repo_get_commit_tree()
>
> +Remove the implicit dependency on the_repository in this function.
> +It w
On 04/10, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > On 04/10, Junio C Hamano wrote:
> >
> >> * tg/stash-in-c-show-default-to-p-fix (2019-03-21) 1 commit
> >> (merged to 'next' on 2019-04-10 at 9489a31a36)
> >> + stash: setup default diff output format if necessary
> >> (this branc
On 4/10/19 5:48 AM, Junio C Hamano wrote:
Jonathan Nieder writes:
nit: I was confused when first reading this, since I read "the
configuration $target_xfer_encoding" as a single phrase. A comma
after "configuration" might help.
...
run-on sentence. I'm having trouble parsing this part.
I h
Hi, Thomas
Sorry for the late reply, but now that I submitted my GSoC proposal I
can finally come back to this series.
On Sun, Mar 31, 2019 at 3:12 PM Thomas Gummerer wrote:
>
> On 03/30, Matheus Tavares wrote:
> > Add the possibility of giving flags to dir_iterator_begin to initialize
> > a dir
Hi Alban
sorry for the slow reply, I think you're probably off-list for a while
by now
On 21/03/2019 21:13, Alban Gruin wrote:
Hi Phillip,
It’s nice to see your work on this on the list.
Le 19/03/2019 à 20:03, Phillip Wood a écrit :
From: Phillip Wood
In order to run `rebase -i` without
On Wed, Apr 10 2019, Barret Rhoden wrote:
> init_skiplist() took a file consisting of SHA-1s and comments and added
> the objects to an oidset. This functionality is useful for other
> commands.
This change would be much easier to review if you led with a commit
where you s/Invalid SHA-1/inval
On Wed, Apr 10 2019, Barret Rhoden wrote:
(Just skimming)
> revisions for commits that perform mass reformatting, and their users
> have the optional to ignore all of the commits in that file.
s/have the optional/have the option/
> +--ignore-revs-file ::
> + Ignore revisions listed in `fi
> * am/p4-branches-excludes (2019-04-02) 8 commits
> - git-p4: respect excluded paths when detecting branches
> - git-p4: add failing test for "git-p4: respect excluded paths when
> detecting branches"
> - git-p4: don't exclude other files with same prefix
> - git-p4: add failing test for "don
From: Johannes Schindelin
This is what the Perl version does, and therefore it is what the
built-in version should do, too.
Signed-off-by: Johannes Schindelin
---
add-interactive.c | 4 +++-
repository.c | 19 +++
repository.h | 7 +++
3 files changed, 29 insert
From: Johannes Schindelin
This imitates the code to show the help text from the Perl script
`git-add--interactive.perl` in the built-in version.
To make sure that it renders exactly like the Perl version of `git add
-i`, we also add a test case for that to `t3701-add-interactive.sh`.
Signed-off
From: Slavica Djukic
Just like in the Perl script `git-add--interactive.perl`, for each
command a unique prefix is determined (if there exists any within the
given parameters), and shown in the list, and accepted as a shortcut for
the command.
We use the prefix map implementation that we just ad
From: Slavica Djukic
The error messages as well as the unique prefixes are colored in `git
add -i` by default; We need to do the same in the built-in version.
Signed-off-by: Slavica Djukic
Signed-off-by: Johannes Schindelin
---
add-interactive.c | 40 +++-
From: Slavica Djukic
In the `git add -i` command, we show unique prefixes of the commands and
files, to give an indication what prefix would select them.
Naturally, the C implementation looks a lot different than the Perl
implementation: in Perl, a trie is much easier implemented, while we
alrea
From: Johannes Schindelin
With this change, we print out the same colored help text that the
Perl-based `git add -i` prints in the main loop when question mark is
entered.
Signed-off-by: Johannes Schindelin
---
add-interactive.c | 24 +++-
1 file changed, 23 insertions(+),
From: Johannes Schindelin
For simplicity, we only implemented the `status` command without colors.
This patch starts adding color, matching what the Perl script
`git-add--interactive.perl` does.
Original-Patch-By: Daniel Ferreira
Signed-off-by: Slavica Djukic
Signed-off-by: Johannes Schindelin
From: Johannes Schindelin
The reason why we did not start with the main loop to begin with is that
it is the first user of `list_and_choose()`, which uses the `list()`
function that we conveniently introduced for use by the `status`
command.
Apart from the "and choose" part, there are more diffe
From: Daniel Ferreira
This implements the `status` command of `git add -i`. The data
structures introduced in this commit will be extended as needed later.
At this point, we re-implement only part of the `list_and_choose()`
function of the Perl script `git-add--interactive.perl` and call it
`lis
From: Daniel Ferreira
Make the diffstat interface (namely, the diffstat_t struct and
compute_diffstat) no longer be internal to diff.c and allow it to be used
by other parts of git.
This is helpful for code that may want to easily extract information
from files using the diff machinery, while fl
From: Johannes Schindelin
This is hardly the first conversion of a Git command that is implemented
as a script to a built-in. So far, the most successful strategy for such
conversions has been to add a built-in helper and call that for more and
more functionality from the script, as more and more
This is the first leg on the long journey to a fully built-in git add -i
(next up: parts 2 [https://github.com/gitgitgadget/git/pull/171], 3
[https://github.com/gitgitgadget/git/pull/172], 4
[https://github.com/gitgitgadget/git/pull/173], 5
[https://github.com/gitgitgadget/git/pull/174], and 6
[ht
On Wed, Apr 10, 2019 at 9:08 AM Kurt Ablinger wrote:
>
> Hello,
>
> I am not sure if this can be problem - at least it is proably not correct:
>
> when adding a key to an empty section and deleting the key so that the
> section is empty again,
> every add adds the section-name again - example:
>
This patch set adds the ability to ignore a set of commits and their
changes when blaming. This can be used to ignore a commit deemed 'not
interesting,' such as reformatting.
The last patch in the series changes the heuristic by which ignored
lines are attributed to specific lines in the parent c
This replaces the heuristic used to identify lines from ignored commits
with one that finds likely candidate lines in the parent's version of
the file.
The old heuristic simply assigned lines in the target to the same line
number (plus offset) in the parent. The new function uses a
fingerprinting
fill_blame_origin() is a convenient place to store data that we will use
throughout the lifetime of a blame_origin. Some heuristics for
ignoring commits during a blame session can make use of this storage.
In particular, we will calculate a fingerprint for each line of a file
for blame_origins inv
init_skiplist() took a file consisting of SHA-1s and comments and added
the objects to an oidset. This functionality is useful for other
commands.
Signed-off-by: Barret Rhoden
---
fsck.c | 37 +
oidset.c| 35 ++
The same code for splitting a blame_entry at a particular line was used
twice in blame_chunk(), and I'll use the helper again in an upcoming
patch.
Signed-off-by: Barret Rhoden
---
blame.c | 44
1 file changed, 28 insertions(+), 16 deletions(-)
diff
When ignoring commits, the commit that is blamed might not be
responsible for the change. Users might want to know when a particular
line has a potentially inaccurate blame. Furthermore, they might never
want to see the object hash of an ignored commit.
This patch adds two config options to cont
Commits that make formatting changes or function renames are often not
interesting when blaming a file. A user may deem such a commit as 'not
interesting' and want to ignore and its changes it when assigning blame.
For example, say a file has the following git history / rev-list:
---O---A---X---
On Wed, Apr 10, 2019 at 05:56:48AM -0700, Johannes Schindelin via GitGitGadget
wrote:
> Probably in the endeavor to avoid the `calloc()` implied by
> `FLEX_ALLOC_STR()` (it is hard to know why exactly, the commit message
> of that commit is a bit parsimonious with information), it calls
> `malloc
Remove the mention of symlinks from the test description because
several tests that are not related to symlinks have been added since
this file was introduced long ago.
Signed-off-by: Kyle Meyer
---
t/t3000-ls-files-others.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/
On 4/9/2019 5:44 PM, Jonathan Tan wrote:
This is useful when investigating performance of pushes, and other times
when no progress information is written (because the pack is written to
stdout).
Signed-off-by: Jonathan Tan
---
We're trying to improve push performance, and it would be nice to
On Wed, Apr 10, 2019 at 11:51:03AM +, Kurt Ablinger wrote:
> Hello,
>
> I am not sure if this can be problem - at least it is proably not correct:
>
> when adding a key to an empty section and deleting the key so that the
> section is empty again,
> every add adds the section-name again - e
On 3/30/2019 3:51 AM, Ævar Arnfjörð Bjarmason wrote:
Add GIT_TR2_* to the whitelist of environment variables that we don't
clear when running the test suite.
This allows us to use the test suite to produce trace2 test data,
which is handy to e.g. write consumers that collate the trace data
it
Frankly, I am surprised it took me this long to discover this bug, as I am
running with the untracked cache for ages now.
But as of recent, I am running more and more long-running commands, mostly
rebases to keep what I call "ever-green" branches up to date, where Git for
Windows' patch thicket is
From: Johannes Schindelin
In f9e6c649589e (untracked cache: load from UNTR index extension,
2015-03-08), code was added to read back the untracked cache from an
index extension.
Probably in the endeavor to avoid the `calloc()` implied by
`FLEX_ALLOC_STR()` (it is hard to know why exactly, the co
Hello,
I am not sure if this can be problem - at least it is proably not correct:
when adding a key to an empty section and deleting the key so that the section
is empty again,
every add adds the section-name again - example:
git config gc.autoDetach false ; git config --unset gc.autoDetach ;
On Wed, Apr 10, 2019 at 06:41:05AM +, Robin H. Johnson wrote:
> A year ago, I raised
> as an issue,
> which lead to commit commit a56771a668dd4963675914bc5da0e1e015952dae.
>
> The exact same workload somewhere between 2.18.0 and 2.19.0 has caused
> the message to come back. I noticed it firs
Hi
After upgrading to 2.21 issuing this subtree command:
git subtree push --prefix ouverture Shared-Ouverture master
I get these errors:
C:/Program Files/Git/mingw64/libexec/git-core\git-subtree: line 636:
/mingw64/libexec/git-core/git: No such file or directory
C:/Program Files/Git/mingw64/li
On 09/04/2019 19:08, Junio C Hamano wrote:
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding o
On Tue, Apr 9, 2019 at 6:31 PM Junio C Hamano wrote:
> > @@ -193,9 +203,16 @@ static int remove_dirs(struct strbuf *path, const char
> > *prefix, int force_flag,
> >
> > strbuf_setlen(path, len);
> > strbuf_addstr(path, e->d_name);
> > - if (lstat(path->buf
> the pattern is matched against paths in the directory where the
> `.gitignore` file that has the pattern in it is in, and any of
> its subdirectories (recursively).
> the pattern will match in all directories relative to
> the `.gitignore` file, with infinite depth.
I could not catch the differ
55 matches
Mail list logo
