Dear Friend,
I am Mr.Arouna Sali the head of file department of Bank of
Africa(B.O.A) here in Burkina Faso / Ouagadougou. In my department we
discover an abandoned sum of (US$18 million US Dollars) in an account
that belongs to one of our foreign customer who died along with his
family in plane cr
On Fri, Dec 15, 2017 at 08:58:22AM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > I think (4) and (5) are the only things that actually change the
> > behavior in a meaningful way. But they're a bit more hacky and
> > repetitive than I'd like. Especially given that I'm not really sure
>
--update-shelve can now be specified multiple times on the
command-line, to update multiple shelved changelists in a single
submit.
This then means that a git patch series can be mirrored to a
sequence of shelved changelists, and (relatively easily) kept in
sync as changes are made in git.
Note t
This change lets you update several P4 changelists in sequence. Say
you have several git commits which are all somehow related. You would
start by shelving them (e.g. for a review), something like this:
git p4 submit --origin HEAD^2 --shelve
You then make changes to these commits (in git) and no
Dear Talented,
I am Talent Scout For BLUE SKY FILM STUDIO, Present Blue sky Studio a
Film Corporation Located in the United State, is Soliciting for the
Right to use Your Photo/Face and Personality as One of the Semi -Major
Role/ Character in our Upcoming ANIMATED Stereoscope 3D Movie-The Story
of
Unrecognized escape sequences are invalid in values:
$ git config -f - --list <
---
Documentation/config.txt | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index b18c0f97fe..f772186c44 100644
--- a/Documentati
Hi Kaartic,
On Thu, 21 Dec 2017, Kaartic Sivaraam wrote:
> I recently encountered that error when trying to do an interactive
> rebase after using filter-branch to remove a file completely in a
> repository. I bisected this issue which pointed at this patch. I'm not
> sure how it is related as I'
On 12/20/2017 11:14 AM, Jeff King wrote:
On Wed, Dec 20, 2017 at 02:42:43PM +, Jeff Hostetler wrote:
Extend stat_tracking_info() to return 1 when the branch is
not up to date with its upstream branch and only return 0
when they are equal.
This means that callers all need to be updated,
On 12/20/2017 11:26 AM, Jeff King wrote:
On Wed, Dec 20, 2017 at 02:42:44PM +, Jeff Hostetler wrote:
From: Jeff Hostetler
Teach "git status --short --branch" to use "--no-ahead-behind"
flag to skip computing ahead/behind counts for the branch and
its upstream and just report '[different
On Thursday 21 December 2017 02:09 AM, phillip.w...@talktalk.net wrote:
>
>
> Hi Kaartic
>
> I'm replying off list as I've only got access to webmail at the
> moment.
No issues brought the CCs including the list to ensure we don't miss things.
> Are you able to do a backtrace
On Thu, Dec 21, 2017 at 09:18:17AM -0500, Jeff Hostetler wrote:
> > This patch will affect "git status --porcelain", too. That's not
> > supposed to change in incompatible ways. I guess it's up for debate
> > whether callers are meant to handle any arbitrary string inside the []
> > (we already sh
If I am entering into undefined behavior territory with the renaming
then there might not be any point to pursue this further, but in any
case, script below:
Apologies up-front for the verbosity, there are probably a lot of
unnecessary steps and git shortcuts missed - I just wanted it to
exactly m
On Thu, 2017-12-21 at 15:06 +0100, Johannes Schindelin wrote:
> Hi Kaartic,
> I fear that the strace does not cover the `git-rebase` process nor the
> `git-rebase--helper` process (which must have been part of your run, as
> the commit affected only that part of the rebase operation).
>
Yep. It s
>Original Message
>From: kaartic.sivar...@gmail.com
>Date: 20/12/2017 18:33
>To: "Phillip Wood", "Git Mailing List"
>Cc: "Johannes Schindelin"
>Subj: Error in `git': free(): invalid pointer (was Re: [PATCH]
sequencer: improve config handling)
>
>I recently encountered that error when t
>Original Message
>From: ju...@pobox.com
>Date: 19/12/2017 22:00
>To:
>Subj: What's cooking in git.git (Dec 2017, #04; Tue, 19)
>* pw/sequencer-in-process-commit (2017-12-13) 10 commits
> (merged to 'next' on 2017-12-13 at ec4d2b9c84)
> + sequencer: improve config handling
> (merged to
On Thu, 2017-12-21 at 16:53 +, phillip.w...@talktalk.net wrote:
> Hm, There is a problem with sequencer_remove_state() which does
>
> free(opts->gpg_sign)
>
> however unless a gpg key was given on the commandline, opts->gpg is
> initialized to "" which is statically allocated.
>
> This un
On 12/21/2017 10:39 AM, Jeff King wrote:
On Thu, Dec 21, 2017 at 09:18:17AM -0500, Jeff Hostetler wrote:
This patch will affect "git status --porcelain", too. That's not
supposed to change in incompatible ways. I guess it's up for debate
whether callers are meant to handle any arbitrary strin
Am 20.12.2017 um 14:08 schrieb Jeff King:
> On Tue, Dec 19, 2017 at 10:33:55AM -0800, Junio C Hamano wrote:
>
>> Should we take the patch posted as-is and move forward?
>
> I suppose so. I don't really have anything against the patch. My main
> complaint was just that I don't think it's actually
On Wed, Dec 20, 2017 at 3:43 AM, Andreas Krey wrote:
> Hi everybody,
>
> we just stumbled over a situation in which a merge commits
> staged changes into the merge commit. This happens when the
> merged-in branch does have commits ('main') but has the same
> tree ('--allow-empty') as the merge bas
On Thu, Dec 21, 2017 at 8:21 AM, Andreas Urke wrote:
> If I am entering into undefined behavior territory with the renaming
> then there might not be any point to pursue this further, but in any
> case, script below:
>
> Apologies up-front for the verbosity, there are probably a lot of
> unnecessa
From: Jeff Hostetler
Created core.aheadbehind config setting and core_ahead_behind
global variable. This value defaults to true.
This value will be used in the next few commits as the default value
for the --ahead-behind parameter.
Signed-off-by: Jeff Hostetler
---
Documentation/config.txt |
From: Jeff Hostetler
Teach "git status --short --branch" to use "--no-ahead-behind"
flag to skip computing ahead/behind counts for the branch and
its upstream and just report '[different]'.
Signed-off-by: Jeff Hostetler
---
t/t6040-tracking-info.sh | 13 +
wt-status.c
From: Jeff Hostetler
Extend stat_tracking_info() return +1 when the branches are not equal
and to take a new "enum ahead_behind_flag" ABF_QUICK to avoid the
expensive ahead/behind computation when requested.
Signed-off-by: Jeff Hostetler
---
ref-filter.c | 4 ++--
remote.c | 24 ++
From: Jeff Hostetler
This is version 2 of my patch series to avoid expensive
ahead/behind calculations in status. This version addresses
Peff's comments on V1.
This version renames the command line parameter to have
positive sense "--ahead-behind" and avoids confusing double
negatives throughou
From: Jeff Hostetler
Teach "status --porcelain=v2 --branch" to omit detailed ahead/behind
information when "--no-ahead-behind" argument is used.
When "--no-ahead-behind" is given, the existing "branch.ab x y" line
is replaced with a new "branch.qab eq|neq" line.
This allows the user to omit the
From: Jeff Hostetler
Teach long (normal) status format to respect the --no-ahead-behind
argument and skip the possibly expensive ahead/behind computation
between the branch and the upstream.
Signed-off-by: Jeff Hostetler
---
builtin/checkout.c | 2 +-
remote.c | 16 +
builtin/merge.c contains this important requirement for merge strategies:
/*
* At this point, we need a real merge. No matter what strategy
* we use, it would operate on the index, possibly affecting the
* working tree, and when resolved cleanly, have the desired
The recursive merge strategy has some special handling when the tree for
the merge branch exactly matches the merge base, but that code path is
missing checks for the index having changes relative to HEAD. Add a
testcase covering this scenario.
Reported-by: Andreas Krey
Signed-off-by: Elijah New
index_has_changes() is a function we want to reuse outside of just am,
making it also available for merge-recursive and merge-ort.
Signed-off-by: Elijah Newren
---
builtin/am.c | 37 -
cache.h | 9 +
merge.c | 33
On Thu, 30 Nov 2017, Jeff King wrote:
> On Wed, Nov 29, 2017 at 07:54:30PM +, Ævar Arnfjörð Bjarmason wrote:
>
> > Replace the perl/Makefile.PL and the fallback perl/Makefile used under
> > NO_PERL_MAKEMAKER=NoThanks with a much simpler implementation heavily
> > inspired by how the i18n infra
On Thu, Dec 21, 2017 at 11:19 AM, Elijah Newren wrote:
> index_has_changes() is a function we want to reuse outside of just am,
> making it also available for merge-recursive and merge-ort.
>
> Signed-off-by: Elijah Newren
> ---
Note: These patches built on master, and merge cleanly with next an
Hi Jeff,
On 21/12/2017 20:09, Jeff Hostetler wrote:
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 9593bfa..c78d6be 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -895,6 +895,14 @@ core.abbrev::
> abbreviated object names to stay
Hi,
Jeff Hostetler wrote:
> Created core.aheadbehind config setting and core_ahead_behind
> global variable. This value defaults to true.
>
> This value will be used in the next few commits as the default value
> for the --ahead-behind parameter.
>
> Signed-off-by: Jeff Hostetler
> ---
> Docum
Jeff Hostetler wrote:
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -1239,7 +1239,7 @@ static void fill_remote_ref_details(struct used_atom
> *atom, const char *refname,
> *s = show_ref(&atom->u.remote_ref.refname, refname);
> else if (atom->u.remote_ref.option == RR_TRACK) {
Hi,
Jeff Hostetler wrote:
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -141,6 +141,7 @@ static int sequencer_in_use;
> static int use_editor = 1, include_status = 1;
> static int show_ignored_in_status, have_option_m;
> static struct strbuf message = STRBUF_INIT;
> +static int ahead_
From: Torsten Bögershausen
wc -l was used to count the number if lines in test scripts.
$ wc -l Makefile
gives a line like this:
105 Makefile
while Mac OS has 4 leading spaces:
105 Makefile
And this means that shell expressions like
test "$(wc -l
Alex Vandiver writes:
>> But I am not sure if this is a right direction to go in. If a .C
>> user of fsmonitor needs (does not need) things from dir.h, that file
>> can (does not need to) include dir.h itself.
>
> Hm; I was patterning based on existing .h files, which don't seem shy
> about pull
Alex Vandiver writes:
> The only current uses of this tool are in tests, which only examine
> the first ("no fsmonitor" / "fsmonitor last update ...") line. I find
> it useful as a brief summary view of the fsmonitor bits, but I suppose
> I'd also be happy with just presence/absence and a count
Hi Josef,
On 20/12/2017 12:43, Josef Wolf wrote:
>
>> $ git add -u
>> $ git reset
>
> This would be added after the "git checkout -m -B master FETCH_HEAD"
> command?
Yes, so it would be something like this:
git fetch origin master && #1
git checkout -m -B master F
Thanks for the detailed explanation. Although I am not too git savvy,
I believe I got the gist of it.
Regarding your question,
I would say the term "name" in an IT context makes me primarily think
of something that is specified by a user (as opposed to e.g. an "id"),
and can be altered by a user.
On Thu, Dec 21, 2017 at 2:08 PM, Junio C Hamano wrote:
> That sounds like a bit of revisionist history, but you weren't around
> back then, so...
>
> https://public-inbox.org/git/11793556371774-git-send-email-jun...@cox.net/#r
>
> is my summarization of discussions before that time. There is a
> m
On Thu, Dec 21, 2017 at 2:17 PM, Andreas Urke wrote:
> Thanks for the detailed explanation. Although I am not too git savvy,
> I believe I got the gist of it.
>
> Regarding your question,
> I would say the term "name" in an IT context makes me primarily think
> of something that is specified by a
尊敬的 gir...@yahoo.com 企业领导/公司负责人/业界专家，您好：
新材料为21世纪三大共性关键技术之一，已成为全球经济迅速增长的源动力和提升核心竞争力的战略焦点。材料作为制造业的基础，特别是新材料研究和产业发展的水平与规模，已经成为衡量一个国家科技进步和综合实力的重要标志。在新材料发展与应用中，复合材料占有相当重要的地位，特别广泛的应用在汽车、交通、风能、航空、航天、兵器、船舶、国防、机械、电子、化工、建筑、农业、渔业、纺织、运动器材等领域，一直是世界各国优先发展和竞争激烈的重要行业。
“JEC世界复合材料展览及会议”（JEC world Composi
43 matches
Mail list logo
