Am 18.09.19 um 02:11 schrieb Kamil Domański:
> Create a '--count' option for ls-remote, based on the one from
> for-each-ref. This allows e.g. to return only the first result
> from a sorted list of refs.
>
> Signed-off-by: Kamil Domański
> ---
> Documentation/git-ls-remote.txt | 11 ---
Dear all,
I now deviate from my original plan of giving you mostly the two first
waves of propaganda-war, to work your way through shunning and driving
all hell-creatures into the desert.
There exist different kinds of fully-converged hell-creatures, and one
of them causes my colleagues too much
When grepping with --recurse-submodules, the object directory of the
submodule is added to the in-memory alternates list. This makes git need
to watch out for more packfiles which might bring bad consequences for
memory and performance.
Now that raw_object_store is a member of the struct repositor
diff_populate_filespec() accepts an struct repository "r" as parameter
but implicitly uses the_repository when calling read_object_file(). To
be more consistent, replace this call with
repo_read_object_file(r, ...).
Signed-off-by: Matheus Tavares
---
diff.c | 2 +-
1 file changed, 1 insertion(+)
parse_object_or_die() was added before parse_object() learned to handle
arbitrary repositories. Now that it did, let's also bring this behavior
improvement to the former, adding a struct repository argument. Also
adjust the callers and, while we are here, avoid using `oid_to_hex(oid)`
for the third
Make git-grep --recurse-submodules stop adding subrepos to the in-memory
alternates list and, instead, pass a reference to the subrepo struct
down to the threads.
This series is based on ew/hashmap (it uses the added container_of
macro).
There're some possibly needed changes I'm still unsure abou
Hi Jonathan,
On Tue, Sep 17, 2019 at 2:50 PM Jonathan Tan wrote:
>
> When the working tree has:
> - foo (symlink)
> - foo/bar (directory)
>
> and the user merges a commit that deletes the foo symlink and instead
> contains:
> - foo (directory)
> - foo/bar (file)
>
> the merge should happen wi
Create a '--count' option for ls-remote, based on the one from
for-each-ref. This allows e.g. to return only the first result
from a sorted list of refs.
Signed-off-by: Kamil Domański
---
Documentation/git-ls-remote.txt | 11 ---
builtin/ls-remote.c | 16
t/t
On Tue, Sep 17, 2019 at 02:50:40PM -0700, Jonathan Tan wrote:
> diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
> index ff641b348a..dfd617a845 100755
> --- a/t/t3030-merge-recursive.sh
> +++ b/t/t3030-merge-recursive.sh
> @@ -452,6 +452,33 @@ test_expect_success 'merge-recursiv
On Tue, Sep 17, 2019 at 01:50:51PM -0700, Denton Liu wrote:
[...]
> >
> > Bert Wesarg (2):
> > git-gui: convert new/amend commit radiobutton to checkbutton
> > git-gui: add horizontal scrollbar to commit buffer
> >
> >
> Yeah, I recall having to add has_symlink_leading_path() long time
> ago in different codepaths (including "apply"). It is not surprising
> to see a similar glitch remaining in merge-recursive (it's a tricky
> issue, and it's a tricky code).
Thanks for the pointer to has_symlink_leading_path() -
Junio C Hamano writes:
One more thing.
> Subject: Re: [PATCH] Rewrite feature to render hg-to-git compatible with
> python2.x and 3.x
Our commit titles typically begin with : prefix, e.g.
Subject: hg-to-git: make it compatibile with both Python 3 and Python 2
or something like that.
Jonathan Tan writes:
>> In any case, if the working tree has 'foo' as a symlink, Git should
>> not look at or get affected by what 'foo' points at.
>
> Git should not, but it does - there is a call in process_entry() that calls
> lstat() on "foo/bar", which indeed reports that "foo/bar" is a dire
Hervé Beraud writes:
> Rewrite features that are no longer supported (or recommended)
> in Python 3 in the script so that it can be used with both
> Python 2 and 3, namely:
>
> - print is not a statement; use print() function instead.
> - dict.has_key(key) is no more; use "key in dict" instead.
>
> Jonathan Tan writes:
>
> > When the working tree has:
> > - foo (symlink)
> > - foo/bar (directory)
>
> Whoa, wait. I assume, since this is about merge, the assumption is
> that the working tree is clean with respect to the index, so 'foo'
> is a symbolic link that is in the index. Now, if
Jonathan Tan writes:
> When the working tree has:
> - foo (symlink)
> - foo/bar (directory)
Whoa, wait. I assume, since this is about merge, the assumption is
that the working tree is clean with respect to the index, so 'foo'
is a symbolic link that is in the index. Now, if foo is a symlink,
Junio C Hamano writes:
> This would make this in line with pt_{pt,br}.po, existing locales
> with country code in them.
>
> Reviewed-by: Junio C Hamano
Paul, I've applied this to a clone of gitk locally and merged it
(resutling in 2a4ac71ffb that should be reachable from 'master'), as
it was br
When the working tree has:
- foo (symlink)
- foo/bar (directory)
and the user merges a commit that deletes the foo symlink and instead
contains:
- foo (directory)
- foo/bar (file)
the merge should happen without requiring user intervention. However,
this does not happen.
In merge_trees(), pr
Hi Pratyush,
Since you're the maintainer now, you should submit a patch to
Documentation/SubmittingPatches to change
- `git-gui/` comes from git-gui project, maintained by Pat Thoyts:
git://repo.or.cz/git-gui.git
to have your own information.
On Wed, Sep 18, 2019 at 01:
Dear all,
Our bosses do not give us the necessary DNA-data or an equivalent,
necessary for perfect convergence-KPIs (KPI=sensor).
We therefore need a burn-in-phase, until you can apply the new
knowledge gained from these emails, and need to now shut-down parts of
the world so we can sleep.
Cheers
Hi Junio,
There were some topics and discussion related to git-gui in flight. Most
of them have been stabilized, and merged in. So I think it's a good time
to pull in those changes.
---
The following changes since commit
5ab72271e16ac23c269f5019a74a7b1d65170e47:
Merge remote-tracking branch
Currently, in the event that a submodule's upstream URL changes, users
have to manually alter the URL in the .gitmodules file then run
`git submodule sync`. Let's make that process easier.
Teach submodule the set-url subcommand which will automatically change
the `submodule.$name.url` property in
Thanks for the explanation James :) Just wanted to understand if there
was any strong reason. As Emily said, we can easily move/mirror if we
find the need.
Thanks for starting up this project! If you need any help let me know
Emily Shaffer escreveu no dia terça,
17/09/2019 à(s) 20:32:
>
> On Tue
On Tue, Sep 17, 2019 at 03:22:38PM -0400, James Ramsay wrote:
> On 13 Sep 2019, at 10:05, pedro rijo wrote:
>
> > Just a minor question: since we have git-scm, pro-git, and git
> > translations in github, why not keep in the same place, under the same
> > organization? I just find it easier to fin
On 13 Sep 2019, at 10:05, pedro rijo wrote:
Just a minor question: since we have git-scm, pro-git, and git
translations in github, why not keep in the same place, under the same
organization? I just find it easier to find than having repos
scattered across different git hosting services
It was
Jeff King writes:
> It's a good idea to parse as much as we can in step 1, in order to catch
> problems early (e.g., a blob size limit that isn't a number). But one
> thing we _shouldn't_ do is resolve any oids at that step (e.g., for
> sparse-file contents specified by oid). In the case of a fet
Dear all,
The recent revelations require more information, to get through the
following weeks.
1. The world is segmented and mixed-up in heaven-people and
fully-converged hell-creatures.
2. Hell-creatures have the community-constraint "I will never deprive
myself of this weapon", meaning they nev
On Mon, 16 Sep 2019 at 22:46, Johannes Sixt wrote:
>
> Am 16.09.19 um 21:58 schrieb Junio C Hamano:
> > I wonder if the result becomes even clearer if we dropped "instead
> > of the usual output". It is a given that presence of an option
> > would change the behaviour, so "instead of the usual" d
Hello all,
Discussions following our last email showed that Sippenhaft (the
spatial component of law, multiplied with integrated guilt as the
temporal component, for nonzero volume or "splash-damage" in the worst
case) is necessary to justify the Alzheimer's-treatment.
Mind that Vogelfreiheit (th
Zeger-Jan van de Weg writes:
> Subject: Re: [PATCH 1/1] Git config allows value setting from stdin
Probably something like this, with the ":" prefix.
config: learn the --stdin option to take args from the standard input
> When setting values in the git config, the value is part of the
Denton Liu writes:
> When running make from a clean environment, all of the *.po files should
> be converted into *.msg files. After that, when make is run without any
> changes, make should not do anything.
>
> After beffae768a (gitk: Add Chinese (zh_CN) translation, 2017-03-11),
> zh_CN.po was
Users expect files in a nested git repository to be left alone unless
sufficiently forced (with two -f's). Unfortunately, in certain
circumstances, git would delete both tracked (and possibly dirty) files
and untracked files within a nested repository. To explain how this
happens, let's contrast
The way match_pathspec_item() handles names and pathspecs with trailing
slash characters, in conjunction with special options like
DO_MATCH_DIRECTORY and DO_MATCH_LEADING_PATHSPEC were non-obvious, and
broken until this patch series. Add a table in a comment explaining the
intent of how these work
cmd_clean() had the following code structure:
struct strbuf abs_path = STRBUF_INIT;
for_each_string_list_item(item, &del_list) {
strbuf_addstr(&abs_path, prefix);
strbuf_addstr(&abs_path, item->string);
PROCESS(&abs_path);
strbuf_reset(&abs_path);
}
whe
For git clean, if a directory is entirely untracked and the user did not
specify -d (corresponding to DIR_SHOW_IGNORED_TOO), then we usually do
not want to remove that directory and thus do not recurse into it.
However, if the user manually specified specific (or even globbed) paths
somewhere under
The specific checks done in match_pathspec_item for the DO_MATCH_SUBMODULE
case are useful for other cases which have nothing to do with submodules.
Rename this constant; a subsequent commit will make use of this change.
Signed-off-by: Elijah Newren
---
dir.c | 6 +++---
1 file changed, 3 insert
For a pathspec like 'foo/bar' comparing against a path named "foo/",
namelen will be 4, and match[namelen] will be 'b'. The correct location
of the directory separator is namelen-1.
However, other callers of match_pathspec_item() such as builtin/grep.c's
submodule_path_match() will compare agains
Signed-off-by: Elijah Newren
---
dir.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dir.c b/dir.c
index d021c908e5..a9168bed96 100644
--- a/dir.c
+++ b/dir.c
@@ -139,7 +139,7 @@ static size_t common_prefix_len(const struct pathspec
*pathspec)
* ":(icase)path" is t
Signed-off-by: Elijah Newren
---
builtin/clean.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/clean.c b/builtin/clean.c
index 3a7a63ae71..6030842f3a 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -158,7 +158,8 @@ static int remove_dirs(struct strbuf *path,
This patch series fixes a few issues with git-clean:
* Failure to clean when multiple pathspecs are specified, reported both
in April 2018[1] and again in May 2019[2].
* Failure to preserve both tracked and untracked files within a nested
Git repository reported a few weeks ago by SZEDE
Someone brought me a testcase where multiple git-clean invocations were
required to clean out unwanted files:
mkdir d{1,2}
touch d{1,2}/ut
touch d1/t && git add d1/t
With this setup, the user would need to run
git clean -ffd */ut
twice to delete both ut files.
A little testing showed some
Even if a directory doesn't match a pathspec, it is possible, depending
on the precise pathspecs, that some file underneath it might. So we
special case and recurse into the directory for such situations. However,
we previously always added any untracked directory that we recursed into
to the lis
The -d flag pre-dated git-clean's ability to have paths specified. As
such, the default for git-clean was to only remove untracked files in
the current directory, and -d existed to allow it to recurse into
subdirectories.
The interaction of paths and the -d option appears to not have been
careful
It appears that the wrong option got included in the list of what will
cause git-clean to actually take action. Correct the list.
Signed-off-by: Elijah Newren
---
Documentation/git-clean.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-clean.txt b/Docume
Hello all,
Please excuse that this propaganda-war is (in parts) real-time due to
privacy-deprivation.
We are right now forced to deal with the revival of Alzheimer-rulers
(wir waren lange "unter ihrer Fuchtel"), like Adolf Hitler was one.
They atrophy in the presence of information-overflow, and t
SZEDER Gábor writes:
> On Mon, Sep 16, 2019 at 01:57:14PM -0700, Junio C Hamano wrote:
>> Queued; thanks.
>
> Nit: it would be nicer to queue this series on top of
> 'dl/compat-cleanup', because 'make coccicheck' errors out suggesting
> transformations in 'compat/mingw.c' that have only been appl
On Mon, Sep 16, 2019 at 5:09 PM Jonathan Nieder wrote:
>
> Jonathan Tan wrote:
>
> > This was raised by a coworker at $DAYJOB. I run the following script:
> [reproduction recipe from (*) snipped]
> > The cherry-pick must be manually resolved, when I would expect it to
> > happen without needing us
On Mon, Sep 16, 2019 at 3:15 PM SZEDER Gábor wrote:
>
> On Mon, Sep 16, 2019 at 02:47:07PM -0700, Jonathan Tan wrote:
> > This was raised by a coworker at $DAYJOB. I run the following script:
> >
> > $GIT init test && cd test
> > ln -s . foo
> > mkdir bar && touch bar/file
> > $GIT add foo
On Mon, Sep 16, 2019 at 4:09 PM Jonathan Tan wrote:
>
> This was raised by a coworker at $DAYJOB. I run the following script:
>
> $GIT init test && cd test
> ln -s . foo
> mkdir bar && touch bar/file
> $GIT add foo bar/file
> $GIT commit -m "foo symlink"
>
> $GIT checkout -b branch1
>
Dear Sir,
My name is Patrick Lewis, I am the Partnership Director of the famous
brand John Lewis Plc.
John Lewis Plc is is a UK's largest multi-channel retailer with over
50 shops furnished with European products.
Could you also send to us all information required to become one of
your regula
Hi Emily and Dscho,
On Tue, Sep 17, 2019 at 1:28 PM Johannes Schindelin
wrote:
> On Mon, 16 Sep 2019, Emily Shaffer wrote:
>
> > Jonathan Tan, Jonathan Nieder, Josh Steadmon and I met on Friday to
> > talk about projects and we came up with a trimmed list; not sure what
> > more needs to be done
The shebang for a python script should be "/usr/bin/env python" and not
"/usr/bin/python". On some OSes like AIX, python default path is not under
"/usr/bin" ("/opt/freeware/bin" for AIX).
Note the main reason behind this change is that AIX rpm will add a
dependency on "/usr/bin/python" instead of
Dear Friend,
I am Ms Lisa Hugh work with the department of Audit and accounting manager here
in the Bank,
There is this fund that was keep in my custody years ago,please i need your
assistance for the transferring of thIs fund to your bank account for both of
us benefit for life time invest
Rewrite features that are no longer supported (or recommended)
in Python 3 in the script so that it can be used with both
Python 2 and 3, namely:
- print is not a statement; use print() function instead.
- dict.has_key(key) is no more; use "key in dict" instead.
- map(lambda ..., collection) is no
When adding or updating configuration values using git-config, the
values could all be observed by different processes as these are passed
as arguments. In some environments all commands executed are also all
logged. When the value contains secrets, this is a side effect that
would be great to avoi
When setting values in the git config, the value is part of the
arguments for execution. This potentially leaks the value through
logging, or other programs like `ps`.
Prior to this change, there was no option to do this. This change adds
the `--stdin` to be combined with `--add`. When passed, the
On Tue, Sep 17, 2019 at 06:47:38AM -0400, Derrick Stolee wrote:
>
> On 9/16/2019 6:36 PM, SZEDER Gábor wrote:
> > On Mon, Aug 26, 2019 at 09:29:58AM -0700, Garima Singh via GitGitGadget
> > wrote:
> >> From: Garima Singh
> >>
> >> Add --[no-]progress to git commit-graph write and verify.
> >> Th
On Tue, Sep 17, 2019 at 01:23:18PM +0200, Johannes Schindelin wrote:
> Also, things like the code tracing via `-x` (which relies on Bash
> functionality in order to work properly,
Not really.
> and which _still_ does not work
> as intended if your test case evaluates a lazy prereq that has not be
Just saw this[0] issue discussed about GNU Make. It seems Make don't
play with path with spaces (at all). I guess my best solution is just
to make a symbolic link so there's a path without spaces.
I guess this issue can be ignored.
[0] http://savannah.gnu.org/bugs/?712
Best regards,
Birger
Hi Emily,
On Mon, 16 Sep 2019, Emily Shaffer wrote:
> Jonathan Tan, Jonathan Nieder, Josh Steadmon and I met on Friday to
> talk about projects and we came up with a trimmed list; not sure what
> more needs to be done to make them into fully-fledged proposals.
Thank you for doing this!
> For st
Hi,
I ran into som issues when compiling git-gui on Windows. Turns out
that the "sharedir" variable gets an incorrect value when "gitexecdir"
contains a space.
For instance when
gitexecdir is set to "/c/Program Files/Git/mingw64/libexec",
sharedir becomes "/c/ Files/Git/mingw64/share".
Perhaps
Hello all,
As we just manufactured two poles (good=Ruhrpott, bad=Bavaria), we
must now warn you of bipolar people.
Bipolar people arrange each and every decision upon two poles, gaining
a 1D-manifold with every decision, producing a 1D-score for it on the
1D-manifold.
They even accept and get dera
On 9/16/2019 6:36 PM, SZEDER Gábor wrote:
> On Mon, Aug 26, 2019 at 09:29:58AM -0700, Garima Singh via GitGitGadget wrote:
>> From: Garima Singh
>>
>> Add --[no-]progress to git commit-graph write and verify.
>> The progress feature was introduced in 7b0f229
>> ("commit-graph write: add progress
Hello all,
We just figured you can not settle in Bavaria, "Ruhrpott" with "Glück
auf, joy on top" is still the only safe bet for unsafe sex in Germany,
due to the ages-old Reinheitsgebot.
Reinheitsgebot: Don't touch this. We always ruined it in the past,
dying or getting ill.
Don't produce imbre
POSIX rm(1) accepts both -r and -R, so we accept -R here by analogy
with that and with commands like cp(1) + ls(1) + grep(1), where on
many or all platforms it’s the only way to recurse. For completeness
with GNU coreutils, we also accept --recursive here.
5c387428f10c2 introduces a mechanism that
Lieber Freund,
Ich bin Herr Manuel Franco, der Mega Winner von 768,41 Millionen US-Dollar im
Mega Millions Jackpot. Wenn Sie diese E-Mail erhalten, wurde Ihre E-Mail nach
einem Dreh ausgewählt. Ich habe den größten Teil meines Vermögens an eine Reihe
von Wohltätigkeitsorganisationen und Organis
[Cc-ing brian, because I can vaguely remember (or misremember?) that
he cares about GnuPG.]
On Mon, Sep 16, 2019 at 04:51:49PM -0700, Denton Liu wrote:
> I just wanted to report that t7030 is flaky. I first noticed this on
> Szeder's Travis job[1]. I was also able to reproduce this on my Macbook
>
When running make from a clean environment, all of the *.po files should
be converted into *.msg files. After that, when make is run without any
changes, make should not do anything.
After beffae768a (gitk: Add Chinese (zh_CN) translation, 2017-03-11),
zh_CN.po was introduced. When make was run, a
On Mon, Sep 16, 2019 at 01:57:14PM -0700, Junio C Hamano wrote:
> Queued; thanks.
Nit: it would be nicer to queue this series on top of
'dl/compat-cleanup', because 'make coccicheck' errors out suggesting
transformations in 'compat/mingw.c' that have only been applied in
that series.
69 matches
Mail list logo
