Denton Liu writes:
> Before, when we had the following graph,
>
> A---B---C (master)
> \
>D (side)
This is minor, but comparing the above with below
> F---G topic
> /
> A---B---C---D---E master
you'll notice that branches g
"Randall S. Becker" writes:
> As a suggestion, with people who know how to escape stuff properly
> (or not), perhaps we can select the alternate behaviour explicitly
> using a core.sshIgnoreEscape=true/false option. Thoughts on that?
The semantics of prepare_shell_cmd() is, regardless of any "fu
Jeff King writes:
> What about command-line options that influence the outcome? It sounds
> like this is the same problem we have in lots of other places (like say,
> compiler flags being updated), that we solve by generating the proposed
> file output unconditionally and comparing it to what's o
Barret Rhoden writes:
> Though the old heuristic is pretty basic - really just a couple lines
> -
> and it may help to see it before looking at a more complicated
> version.
OK, then.
Thanks.
Votre boîte aux lettres a dépassé le Quota / Limit défini par l'équipe de
messagerie.
Il se peut que vous ne puissiez pas envoyer ou recevoir de nouveaux courriels
jusqu'à ce que vous réactivez votre courrier Web.
Pour valider, cliquez sur: https://qqs11.wufoo.com/forms/zsq8b7z1cmlazj/
Cent
On April 15, 2019 17:14, Andreas Schwab wrote:
> On Apr 15 2019, "Randall S. Becker" wrote:
>
> > on virtually any platform at my disposal (Windows, Ubuntu, MacOS, the
> > older NonStop variant), and have that work with no problem. Somewhere
> > after get_ssh_command(), the command is being inter
When rebase is run on a branch that can be fast-forwarded, this should
automatically be done. Create test to ensure this behavior happens.
There are some cases that currently don't pass. The first case is where
a feature and master have diverged, running
"git rebase master... master" causes a full
A common scenario is if a user is working on a topic branch and they
wish to make some changes to intermediate commits or autosquash, they
would run something such as
git rebase -i --onto master... master
in order to preserve the merge base. This is useful when contributing a
patch series
Thanks for the example, Ævar, it clarified a lot. I think that _now_
we're on the same page. ;)
I made can_fast_forward detect this case and now, it should behave as
expected. The change can be seen in 4/5. Hopefully this saves you some
work later.
---
This patchset now depends "[PATCH 1/8] test
Signed-off-by: Denton Liu
---
t/t3431-rebase-fork-point.sh | 53
1 file changed, 53 insertions(+)
create mode 100755 t/t3431-rebase-fork-point.sh
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
new file mode 100755
index 00..
Before, when we rebased with a --fork-point invocation where the
fork-point wasn't empty, we would be setting options.restrict_revision.
The fast-forward logic would automatically declare that the rebase was
not fast-forwardable if it was set. However, this was painting with a
very broad brush.
Re
Before, when we had the following graph,
A---B---C (master)
\
D (side)
running 'git rebase --onto master... master side' would result in D
being always rebased, no matter what. However, the desired behavior is
that rebase should notice that this is fast-forwardabl
On Mon, Apr 15, 2019 at 11:04:16PM +0200, Damien Robert wrote:
> In ref-filter.c, when processing the atom %(push:track), the
> ahead/behind values are computed using `stat_tracking_info` which refers
> to the upstream branch.
Good catch. I think this has been broken since %(push) was added in
29
Am 15.04.19 um 23:15 schrieb Thomas Gummerer:
> This sounds roughly like what Barret Rhoden (added to Cc) has been
> working on. I haven't followed that patch series in detail, but you
> can have a look at it atthe latest iteration at
> https://public-inbox.org/git/20190410162409.117264-1-b...@goo
> My main concerns:
> - Can your version reach outside of a diff chunk?
Currently no. It's optimised for reformatting and renaming, both of
which preserve ordering. I could look into allowing disordered matches
where the similarity is high, while still being biased towards ordered
matches. If you
On Sat, Apr 13, 2019 at 10:16:46PM +, brian m. carlson wrote:
> > The alternative is that we could use a special token like ":zlib" or
> > something to indicate that the internal implementation should be used
> > (and then tweak the baked-in default, too). That might be less
> > surprising for
On Sun, Apr 14, 2019 at 12:01:10AM +0200, René Scharfe wrote:
> >> As we already link to the zlib library, we can perform the compression
> >> without even requiring gzip on the host machine.
> >
> > Very cool. It's nice to drop a dependency, and this should be a bit more
> > efficient, too.
>
>
Am 15.04.19 um 21:20 schrieb Randall S. Becker:
> What is strange is that GIT_SSH_COMMAND='/usr/bin/ssh -v' should not
> execute if we are just looking at an object path. It should be broken
> into '/usr/bin/ssh' and '-v' otherwise spawn* or exec* will not
> execute it. I'm still trying to understa
On 04/15, Christian González wrote:
> Hello git community,
>
> I'm completely new here, and maybe my request is dumb, has already a
> better solution, or I did not fully understand git. Please tell my if
> so. I stumbled upon this idea while following the django developers
> mailing list, people t
On Apr 15 2019, "Randall S. Becker" wrote:
> on virtually any platform at my disposal (Windows, Ubuntu, MacOS, the
> older NonStop variant), and have that work with no problem. Somewhere
> after get_ssh_command(), the command is being interpreted it its parts
> either as a shell or something else
> [1/7]: t5516: drop ok=sigpipe from unreachable-want tests
> [2/7]: t5530: check protocol response for "not our ref"
> [3/7]: upload-pack: send ERR packet for non-tip objects
> [4/7]: pkt-line: prepare buffer before handling ERR packets
> [5/7]: fetch: use free_refs()
> [6/7]: remote.c
In ref-filter.c, when processing the atom %(push:track), the
ahead/behind values are computed using `stat_tracking_info` which refers
to the upstream branch.
Fix that by introducing a new function `stat_push_info` in remote.c
(exported in remote.h), which does the same thing but for the push
branc
Dear git developers,
Testing the behaviour of git with respect to pushing and pulling, I noticed
that %(push:track) in git for-each-ref reported the wrong value (ie the
upstream's value rather than the push one).
This patch fixes that.
Please tell me if you would prefer I split this patch in two
Hello git community,
I'm completely new here, and maybe my request is dumb, has already a
better solution, or I did not fully understand git. Please tell my if
so. I stumbled upon this idea while following the django developers
mailing list, people there discussing whether nor not to adopt *black*
From: Jeff Hostetler
Update tr2_tbuf_utc_datetime to generate extended UTC format.
Update tr2_tgt_event target to use extended format in 'time' columns.
Signed-off-by: Jeff Hostetler
---
Documentation/technical/api-trace2.txt | 12 ++--
trace2/tr2_tbuf.c | 4 ++--
From: Jeff Hostetler
Teach Windows version of git to report peak memory usage
during exit() processing.
Signed-off-by: Jeff Hostetler
---
common-main.c| 2 +-
compat/win32/trace2_win32_process_info.c | 50 ++--
trace2.c
From: Jeff Hostetler
Update SID component construction to use the current UTC datetime
and a portion of the SHA1 of the hostname.
Use an simplified date/time format to make it easier to use the
SID component as a logfile filename.
Signed-off-by: Jeff Hostetler
---
Documentation/technical/api-
From: Jeff Hostetler
Create trace2_initialize_clock() and call from main() to capture
process start time in isolation and before other sub-systems are
ready.
Signed-off-by: Jeff Hostetler
---
Documentation/technical/api-trace2.txt | 12 ++--
common-main.c | 2 ++
From: Jeff Hostetler
Add elapsed process time to "start" event to measure
the performance of early process startup.
Signed-off-by: Jeff Hostetler
---
Documentation/technical/api-trace2.txt | 11 ++-
t/t0211-trace2-perf.sh | 12 ++--
trace2.c
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
Documentation/config.txt | 2 +
Documentation/config/trace2.txt| 56 +
Documentation/technical/api-trace2.txt | 151 ++---
Documentation/trace2-target-values.txt | 10 ++
4 files changed
From: Jeff Hostetler
Created an even lighter version of read_early_config() that
only looks at system and global config settings. It omits
repo-local, worktree-local, and command-line settings.
Signed-off-by: Jeff Hostetler
---
config.c | 23 ---
config.h | 4
2 file
From: Jeff Hostetler
Initialize opts structure in repo_read_config().
This change fixes a crash in later commit after a new field is added
to the structure.
In commit 3b256228a66f8587661481ef3e08259864f3ba2a, repo_read_config()
was added. It only initializes 3 fields in the opts structure. It
From: Jeff Hostetler
Teach git to read the system and global config files for
default Trace2 settings. This allows system-wide Trace2 settings to
be installed and inherited to make it easier to manage a collection of
systems.
The original GIT_TR2* environment variables are loaded afterwards and
From: Jeff Hostetler
Teach Git to resolve the executable directory before initializing
Trace2. This allows the system configuration directory to be
discovered earlier (because it is sometimes relative to the prefix
or runtime-prefix).
This will be used by the next commit to allow trace2 setting
Version 4 fixes a few clang-format warnings and simplifies the PID field in
the SID.
Jeff Hostetler (10):
config: initialize opts structure in repo_read_config()
trace2: refactor setting process starting time
trace2: add absolute elapsed time to start event
trace2: find exec-dir before tra
On 04/15, Johannes Schindelin wrote:
> Hi Thomas,
>
> On Sun, 14 Apr 2019, Thomas Gummerer wrote:
>
> > @@ -99,10 +90,10 @@ modified file Documentation/git-revert.txt
>
> A better example might be a .c file, as the function name is often a
> pretty useful piece of information.
Yeah, maybe w
'git submodule update' will fetch new commits from the submodule remote
if the SHA-1 recorded in the superproject is not found. This was not
mentioned in the documentation.
---
Documentation/git-submodule.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-s
On 04/15, Johannes Schindelin wrote:
> Hi Eric,
>
> On Sun, 14 Apr 2019, Eric Sunshine wrote:
>
> > On Sun, Apr 14, 2019 at 5:10 PM Thomas Gummerer
> > wrote:
> > > [...]
> > > Introduce a new range diff hunk header, that's enclosed by "##",
> > > similar to how line numbers in diff hunks are e
On April 13, 2019 17:48, SZEDER Gábor wrote:
> On Sat, Apr 13, 2019 at 10:39:35PM +0200, Ævar Arnfjörð Bjarmason wrote:
> > On Sat, Apr 13 2019, Randall S. Becker wrote:
> >
> > > I am encountering a problem on one of our NonStop platform variants
> > > where the GIT_SSH_COMMAND string is not being
On 04/15, Denton Liu wrote:
[...]
> -extern int write_archive_entries(struct archiver_args *args,
> write_archive_entry_fn_t write_entry);
> -extern void *object_file_to_archive(const struct archiver_args *args,
> +int write_archive_entries(struct archiver_args *args,
> write_archive_entry_fn_t
On 04/15, Johannes Schindelin wrote:
> Hi Thomas,
>
>
> On Sun, 14 Apr 2019, Thomas Gummerer wrote:
> > diff --git a/range-diff.c b/range-diff.c
> > index 9242b8975f..f365141ade 100644
> > --- a/range-diff.c
> > +++ b/range-diff.c
> > @@ -102,9 +102,12 @@ static int read_patches(const char *range
On 04/15, Johannes Schindelin wrote:
> Hi Eric,
>
> On Sun, 14 Apr 2019, Eric Sunshine wrote:
>
> > On Sun, Apr 14, 2019 at 5:09 PM Thomas Gummerer
> > wrote:
> > > [...]
> > > However it can still be useful to have the function name that 'git
> > > diff' extracts as additional context for the
On 04/15, Johannes Schindelin wrote:
> Hi Thomas,
>
> On Sun, 14 Apr 2019, Thomas Gummerer wrote:
>
> > Add the section headers we introduced in the previous commit to the
> > outer diff's hunk headers. This makes it easier to understand which
> > change we are actually looking at. For example
Since function declarations already implicitly imply extern, create a
Coccinelle rule which removes the redundant extern.
Signed-off-by: Denton Liu
---
contrib/coccinelle/noextern.cocci | 6 ++
1 file changed, 6 insertions(+)
create mode 100644 contrib/coccinelle/noextern.cocci
diff --git
Hi all, thanks for the feedback.
I didn't realise that Coccinelle could be used to remove modifiers but
turns out I was wrong. However, Coccinelle seems to choke whenever
there's an __attribute__ or when there are varargs and I couldn't figure
out how to work around that. As a result, this patchse
There has been a push to remove extern from function declarations.
Finish the job by removing all instances of "extern" for function
declarations in headers using sed.
This was done by running the following on my system with sed 4.2.2:
$ git ls-files \*.{c,h} | xargs sed -i'' -e 's/^\(\s*\)ex
> >> ... then leave it in your example, perhaps?
> >>
> >
> > Good point. :) I had wanted to avoid including my own name/email in the
> > tutorial; I used a throwaway "Git Contributor " for the
> > example.
> > ...
> >> Keep a sample sign-off by "A U Thor " here.
>
>
> No, use "A U Thor " as I su
user$ git checkout -b "environment-logging"
Switched to a new branch ' environment-logging'
user$ git status
On branch environment-logging
nothing to commit, working tree clean
user$ git checkout develop
Switched to branch 'develop'
Your branch is up to date with 'origin/develop'.
user$ git branch
On 2/13/2019 11:37 PM, Jeff King wrote:
> +static void *lookup_object_by_type(struct repository *r,
> +const struct object_id *oid,
> +enum object_type type)
> +{
> + switch (type) {
> + case OBJ_COMMIT:
> + return
On Mon, Apr 15, 2019 at 12:16:51AM -0400, Eric Sunshine wrote:
> On Sun, Apr 14, 2019 at 11:10 PM Junio C Hamano wrote:
> > Eric Sunshine writes:
> > >> +Documentation/GIT-EXCLUDED-PROGRAMS: Makefile config.mak.uname
> > >> + $(QUIET_GEN)echo "EXCLUDED_PROGRAMS := $(EXCLUDED_PROGRAMS)" >$@
Hi Robin,
On Fri, 12 Apr 2019, Robin H. Johnson wrote:
> Looking at git-rebase--preserve-merges.sh for this message, I think that
> should be a separate patch to make it respect --quiet.
Please note that `git rebase --preserve-merges` will be deprecated as of
the next Git version (see https://gi
Hi Jonathan,
On Thu, 11 Apr 2019, Jonathan Nieder wrote:
> Jeff Hostetler wrote:
>
> > Initialize opts structure in repo_read_config().
>
> Good find.
Heh, it really was our CI that found it, and it was I (with valgrind's
help) who identified the problem and proposed the fix. So: thank you!
> I
On 2/5/2019 2:52 PM, Ævar Arnfjörð Bjarmason wrote:
> From: William Hubbs
> -const char *fmt_name(const char *name, const char *email)
> +const char *fmt_name(enum want_ident whose_ident)
> {
> - return fmt_ident(name, email, NULL, IDENT_STRICT | IDENT_NO_DATE);
> + char *name = NULL;
> +
On 1/26/2019 7:35 PM, Nguyễn Thái Ngọc Duy wrote:
> @@ -238,7 +249,10 @@ static enum parse_opt_result parse_short_opt(struct
> parse_opt_ctx_t *p,
> len++;
> arg = xmemdupz(p->opt, len);
> p->opt = p->opt[len] ? p->opt + len : NULL;
> -
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> The `git serve` built-in was introduced in ed10cb952d31 (serve:
> introduce git-serve, 2018-03-15) as a backend to serve Git protocol v2,
> probably originally intended to be spawned by `git upload-pack`.
>
> However,
On 4/13/19 11:54 PM, Junio C Hamano wrote:
Two thoughts.
- Unless the 'old heuristic' is still available as an option after
this step, a series that first begins with the 'old heuristic'
and then later replaces it with the 'new heuristic' feels
somewhat wasteful of reviewer resourc
Hi -
On 4/14/19 7:27 AM, Michael Platings wrote:
On Sun, 14 Apr 2019 at 11:24, Junio C Hamano wrote:
If you only enable blame.markIgnoredLines then the hash for
"unblamable" lines appears as e.g. "*3252488f5" - this doesn't seem
right to me because the commit *wasn't* ignored,
I think you mi
Johannes Schindelin writes:
> Hi Junio,
>
> On Mon, 15 Apr 2019, Junio C Hamano wrote:
>
>> Junio C Hamano writes:
>>
>>
>> > Do you mean more like
>> > ...
>> > I think I can agree with either of the two positions...
>>
>> I am guessing from the earlier iteration that you wanted to say
>> "unle
On 4/10/19 3:00 PM, Ævar Arnfjörð Bjarmason wrote:
[snip]
+ split[0].unblamable = e->unblamable;
+ split[1].unblamable = e->unblamable;
+ split[2].unblamable = e->unblamable;
I wonder what the comfort level for people in general is before turning
this sort of thing into a for
On 4/14/19 6:42 AM, Michael Platings wrote:
+ the `blame.ignoreRevsFile` config option. An empty file name, `""`, will
+ clear the list of revs from previously processed files.
Maybe I haven't read this carefully enough but the use-case for this
doesn't seem to be explained, you need t
On 4/10/19 3:04 PM, Ævar Arnfjörð Bjarmason wrote:
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 l
Hi Michael -
On 4/14/19 5:10 PM, Michael Platings wrote:
Hi Barret,
This works pretty well for the typical reformatting use case now. I've
run it over every commit of every .c file in the git project root,
both forwards and backwards with every combination of -w/-M/-C and
can't get it to crash
Hi Duy,
On Sat, 13 Apr 2019, Nguyễn Thái Ngọc Duy wrote:
> diff --git a/commit.h b/commit.h
> index 42728c2906..7342727e46 100644
> --- a/commit.h
> +++ b/commit.h
> @@ -143,9 +143,15 @@ void repo_unuse_commit_buffer(struct repository *r,
> struct object_id *get_commit_tree_oid(const struct comm
Hi Junio,
On Mon, 15 Apr 2019, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>
> > Do you mean more like
> > ...
> > I think I can agree with either of the two positions...
>
> I am guessing from the earlier iteration that you wanted to say
> "unless it is given explicitly, we turn it on".
>
Hi Junio,
On Sun, 14 Apr 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > diff --git a/t/test-lib.sh b/t/test-lib.sh
> > index 562c57e685..f1a0fea4e1 100644
> > --- a/t/test-lib.sh
> > +++ b/t/test-lib.sh
> > @@ -57,6 +57,13 @@ fi
> > . "$GIT_BUILD_DIR"/GIT-B
Hi Eric,
On Sun, 14 Apr 2019, Eric Sunshine wrote:
> On Sun, Apr 14, 2019 at 5:10 PM Thomas Gummerer wrote:
> > [...]
> > Introduce a new range diff hunk header, that's enclosed by "##",
> > similar to how line numbers in diff hunks are enclosed by "@@", and
> > give human readable information o
Hi Eric,
On Sun, 14 Apr 2019, Eric Sunshine wrote:
> On Sun, Apr 14, 2019 at 5:09 PM Thomas Gummerer wrote:
> > [...]
> > However it can still be useful to have the function name that 'git
> > diff' extracts as additional context for the change.
> > [...]
> > Signed-off-by: Thomas Gummerer
> >
On Mon, Apr 15, 2019 at 9:37 PM Johannes Schindelin
wrote:
>
> It seems not to have made it into the js/macos-gettext-build branch,
> though. Would you terribly mind picking it up, please?
I think they are separately queued, so that they can graduate in any order,
even if/when one of them turns o
Hi Thomas,
On Sun, 14 Apr 2019, Thomas Gummerer wrote:
> When postprocessing the inner diff in range-diff, we currently replace
> the whole hunk header line with just "@@". This matches how 'git
> tbdiff' used to handle hunk headers as well.
>
> Most likely this is being done because line numbe
Hi Thomas,
On Sun, 14 Apr 2019, Thomas Gummerer wrote:
> @@ -99,10 +90,10 @@ modified file Documentation/git-revert.txt
A better example might be a .c file, as the function name is often a
pretty useful piece of information.
Read: I think it should be part of the outer hunk header.
Also, t
Hi Thomas,
On Sun, 14 Apr 2019, Thomas Gummerer wrote:
> Add the section headers we introduced in the previous commit to the
> outer diff's hunk headers. This makes it easier to understand which
> change we are actually looking at. For example an outer hunk header
> might now look like:
>
>
Hi Junio,
On Sat, 13 Apr 2019, Junio C Hamano wrote:
> Thomas Gummerer writes:
>
> > I'm not sure what the right solution for this is. I think one thing
> > I'd like range-diff to do is to add the filename, or some context
> > (e.g. is this part of the commit message etc.) to the @@ line (not
>
Hi Junio,
On Sun, 14 Apr 2019, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin
>
> Most notably, it seems that macOS' APFS does not allow that.
>
> Signed-off-by: Johannes Schindelin
This is actually a quite important fix, really, as it makes *every* CI
build fail in th
On Mon, Apr 15, 2019 at 12:30 PM Junio C Hamano wrote:
>
> Junio C Hamano writes:
>
> > Christian Couder writes:
> >
> >> This patch series is based on:
> >>
> >> 763fb763b8 (Merge branch 'jt/batch-fetch-blobs-in-diff' into jch,
> >> 2019-04-08)
> >>
> >> to avoid issues with jt/batch-fetch-blo
On Mon, Apr 15, 2019 at 11:27 AM Junio C Hamano wrote:
>
> Christian Couder writes:
>
> > This patch series is based on:
> >
> > 763fb763b8 (Merge branch 'jt/batch-fetch-blobs-in-diff' into jch,
> > 2019-04-08)
> >
> > to avoid issues with jt/batch-fetch-blobs-in-diff.
>
> Yuck. As an experienc
Junio C Hamano writes:
> Christian Couder writes:
>
>> This patch series is based on:
>>
>> 763fb763b8 (Merge branch 'jt/batch-fetch-blobs-in-diff' into jch, 2019-04-08)
>>
>> to avoid issues with jt/batch-fetch-blobs-in-diff.
> ...
> If you really need to depend on another topic or two, please
On Mon, Apr 15, 2019 at 01:48:31PM +0900, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
> > ... therefore these should be 'test_i18ngrep'. This applies to the
> > other tests in this patch series as well.
> > ...
>
> Hmph. That would mean the following is needed, but I suspect that
> 6cdccfce
Christian Couder writes:
> This patch series is based on:
>
> 763fb763b8 (Merge branch 'jt/batch-fetch-blobs-in-diff' into jch, 2019-04-08)
>
> to avoid issues with jt/batch-fetch-blobs-in-diff.
Yuck. As an experienced contributor, you should know better than
that by now to do that. A merge in
"Johannes Schindelin via GitGitGadget"
writes:
> Obviously, those `git-legacy-` commands share the documentation
> with the built-in `git-`, and are not intended to be called
> directly anyway. So let's not try to ensure that they are documented
> separately from their built-in versions.
Yup.
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
> Subject: Re: [PATCH 3/7] check-docs: do not pretend that commands are listed
> which are excluded
Sorry, but I cannot quite parse the title. I am guessing that you
meant "do not pretend that commands, which are exclu
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> When built with NO_CURL or with NO_UNIX_SOCKETS, some commands are
> skipped from the build. It does not make sense to list them in the
> output of `git help -a`, so let's just not.
The objective makes sense quite a
"Johannes Schindelin via GitGitGadget"
writes:
> From: Johannes Schindelin
>
> The `git-remote-testgit` script is really only used in
> `t5801-remote-helpers.sh`. It does not even contain any ``
> placeholders that would need to be interpolated via `make
> git-remote-testgit`.
>
> Let's just
82 matches
Mail list logo
