Rohit Ashiwal writes:
> Just to be clear of what caused the error:
> 1. Path not being file, or
> 2. File not being empty
> I am checking for both.
test -s makes sure is file; if it is not a file, then
it won't yield true.
So why do you need to say test_path_is_file yourself, if y
Mihir Mehta writes:
> Thanks, Junio. Instead of removing that part of the patch, I opted to
> expand it to make it a little clearer (in my opinion) than it was
> before. Let me know if this works.
I am mildly negative on that change. "Omitting both would give an
empty diff" would be understanda
From: Pratik Karki
To run a new rebase, there needs to be a check to assure that no other
rebase is in progress. New rebase operation cannot start until an
ongoing rebase operation completes or is terminated.
Signed-off-by: Pratik Karki
Signed-off-by: Johannes Schindelin
---
builtin/rebase.c
Hi Stefan,
On Wed, 8 Aug 2018, Stefan Beller wrote:
> On Wed, Aug 8, 2018 at 6:51 AM Pratik Karki wrote:
> >
> > diff --git a/builtin/rebase.c b/builtin/rebase.c
> > index 8a7bf3d468..a261f552f1 100644
> > --- a/builtin/rebase.c
> > +++ b/builtin/rebase.c
> > @@ -455,6 +481,26 @@ int cmd_rebase(
On Wed, Aug 8, 2018 at 6:51 AM Pratik Karki wrote:
>
> To run a new rebase, there needs to be a check to assure that no other
> rebase is in progress. New rebase operation cannot start until an
> ongoing rebase operation completes or is terminated.
>
> Signed-off-by: Pratik Karki
> ---
> builtin
To run a new rebase, there needs to be a check to assure that no other
rebase is in progress. New rebase operation cannot start until an
ongoing rebase operation completes or is terminated.
Signed-off-by: Pratik Karki
---
builtin/rebase.c | 48 +++-
1
>> This was actually discussed in a separate thread [1] some time ago with
>> patches proposed by Thandesha and me.
>> I haven't yet got time to cook a final patch, which addresses both
>> Thandesha's and mine use-cases though,
>> so this wasn't submitted to Junio yet.
>> In the meantime, I guess
On 23 May 2018 at 17:41, Mazo, Andrey wrote:
>> The last one (i.e. "even if it is verbose, if fileSize is not
>> reported, do not write the verbose output") does not look like it is
>> limited to the unshelve feature, so it might, even though it is a
>> one-liner, deserve to be a separate preparat
> The last one (i.e. "even if it is verbose, if fileSize is not
> reported, do not write the verbose output") does not look like it is
> limited to the unshelve feature, so it might, even though it is a
> one-liner, deserve to be a separate preparatory patch if you want.
> But I do not feel strongl
Luke Diamand writes:
>> However, instead of a separate patch, wouldn't it be better to squash
>> it into the previous one? So 'make test' would succeed on every
>> commit even with a newer p4 version.
>
> Junio?
>
> I can squash together the original commit and the two fixes if that
> would be b
>> shelved changelist, the depot revision is shown as "none"
>> if using the older p4d (which makes sense - the file doesn't
>> yet exist, so can't have a revision), but as "1" in the newer
>> versions of p4d.
>>
>> For example, adding
On Tue, May 22, 2018 at 10:41 AM, Luke Diamand wrote:
> SZEDER Gábor found that the unshelve tests fail with newer
> versions of Perforce (2016 vs 2015).
>
> The problem arises because when a file is added in a P4
> shelved changelist, the depot revision is shown as "none&q
SZEDER Gábor found that the unshelve tests fail with newer
versions of Perforce (2016 vs 2015).
The problem arises because when a file is added in a P4
shelved changelist, the depot revision is shown as "none"
if using the older p4d (which makes sense - the file doesn't
yet exist,
roup=]]]
>>> +[--log-destination=(stderr|syslog|none)]
>>
>> I micronit, but maybe worthwhile to have a preceeding commit to fix up
>> that indentation of --listen and --user.
>
> I thought the indentation here is intentional, since we’re still in
Eric Sunshine writes:
> On Sun, Feb 4, 2018 at 1:30 PM, Lucas Werkmeister
> wrote:
>> This new option can be used to override the implicit --syslog of
>> ...
> Thanks. With the 'log_destination' initialization bug fixed, this
> version looks good; I didn't find anything else worth commenting upo
On Sun, Feb 4, 2018 at 1:55 PM, Ævar Arnfjörð Bjarmason
wrote:
> On Sun, Feb 04 2018, Lucas Werkmeister jotted:
>>[--inetd |
>> [--listen=] [--port=]
>> [--user= [--group=]]]
>> + [--log-destination=(stderr|syslog|none)
On Sun, Feb 4, 2018 at 1:30 PM, Lucas Werkmeister
wrote:
> This new option can be used to override the implicit --syslog of
> --inetd, or to disable all logging. (While --detach also implies
> --syslog, --log-destination=stderr with --detach is useless since
> --detach disassociates the process fr
On 04.02.2018 19:55, Ævar Arnfjörð Bjarmason wrote:
>
> On Sun, Feb 04 2018, Lucas Werkmeister jotted:
>
>> [--inetd |
>>[--listen=] [--port=]
>>[--user= [--group=]]]
>> + [--log-destination=(stderr|syslog|none)]
>
&
On Sun, Feb 04 2018, Lucas Werkmeister jotted:
>[--inetd |
> [--listen=] [--port=]
> [--user= [--group=]]]
> + [--log-destination=(stderr|syslog|none)]
I micronit, but maybe worthwhile to have a preceeding commit to fix up
that in
|
[--listen=] [--port=]
[--user= [--group=]]]
+[--log-destination=(stderr|syslog|none)]
[...]
DESCRIPTION
@@ -80,7 +81,8 @@ OPTIONS
do not have the 'git-daemon-export-ok' file.
--inetd::
- Have the server run as an inetd service. Implie
argc, const char **argv)
>> + if (skip_prefix(arg, "--log-destination=", &v)) {
>> + if (!strcmp(v, "syslog")) {
>> + log_destination = LOG_DESTINATION_SYSLOG;
>> + continue;
>> +
if (skip_prefix(arg, "--log-destination=", &v)) {
> + if (!strcmp(v, "syslog")) {
> + log_destination = LOG_DESTINATION_SYSLOG;
> + continue;
> +
@@ SYNOPSIS
[--inetd |
[--listen=] [--port=]
[--user= [--group=]]]
+[--log-destination=(stderr|syslog|none)]
[...]
DESCRIPTION
@@ -80,7 +81,8 @@ OPTIONS
do not have the 'git-daemon-export-ok' file.
--inetd::
-
st scratching my own itch ;) I hope
> this option is useful for other use-cases as well?
If the reader does not know that --inetd implies --syslog, then
This makes it possible to use --inetd while still logging to
standard error.
leads to a "Huh?" moment since it is not self-contai
, sizeof(buf), err, params);
>> syslog(priority, "%s", buf);
>> - } else {
>> + break;
>> + }
>> + case LOG_TO_STDERR: {
>
> There aren't many instances of:
>
> case FOO: {
>
> in th
sizeof(buf), err, params);
> syslog(priority, "%s", buf);
> - } else {
> + break;
> + }
> + case LOG_TO_STDERR: {
There aren't many instances of:
case FOO: {
in the code-base, but those that exist don't use braces arou
..e973f4390 100644
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -20,6 +20,7 @@ SYNOPSIS
[--inetd |
[--listen=] [--port=]
[--user= [--group=]]]
+[--send-log-to=(stderr|syslog|none)]
[...]
DESCRIPTION
@@ -110,8
From: Jeff Hostetler
Create a simple filter for traverse_commit_list_worker() to omit
all blobs from the result.
This filter will be used in a future commit by rev-list and pack-objects
to create a "commits and trees" result. This is intended for partial
clone and fetch support.
Signed-off-by:
Andreas Heiduk writes:
> The values have eluded documentation so far. While at it streamline
> the wording by grouping relevant parts together.
>
> Signed-off-by: Andreas Heiduk
> ---
> Documentation/diff-config.txt | 11 +++
> Documentation/diff-options.txt | 17 -
> 2
. Multiple values are separated by comma,
+ `none` resets previous values, `default` reset the list to
+ `new` and `all` is a shorthand for `old,new,context`. The
+ whitespace errors are colored with `color.diff.whitespace`.
+ The command line option `--ws-error-highlight
Andreas Heiduk writes:
> The value has not eluded documentation so far.
I am not sure what "has not eluded" means in this context (did you
mean "has eluded"?).
The patch text itself is not wrong per-se, but if we are to add
documentation for 'none', diff-op
cbce8ec63..c84ced8f6 100644
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -200,7 +200,7 @@ diff.algorithm::
+
diff.wsErrorHighlight::
- A comma separated list of `old`, `new`, `context`, that
+ A comma separated list of `old`, `new`, `context` and `none`, that
miwilli...@google.com writes:
> From 7201fe08ede76e502211a781250c9a0b702a78b2 Mon Sep 17 00:00:00 2001
> From: Mike Williams
> Date: Mon, 11 Apr 2016 14:18:39 -0400
> Subject: [PATCH 1/1] wt-status: Remove '!!' from
> wt_status_collect_changed_cb
>
> The wt_status_collect_changed_cb function uses
ate)
+ update_module = update;
+ if (!update_module)
+ update_module = sub->update;
+ if (!update_module)
+ update_module = "checkout";
+ if (!strcmp(update_module, "none")) {
+
66,7 @@ set known_view_options {
> {committer t15 . "--committer=*" {mc "Committer:"}}
> {loginfo t15 .. "--grep=*" {mc "Commit Message:"}}
> {allmatch b.. "--all-match"{mc "Matches all Commit Info
>
{loginfo t15 .. "--grep=*" {mc "Commit Message:"}}
{allmatch b.. "--all-match"{mc "Matches all Commit Info
criteria"}}
-{igrep b.. "--invert-grep" {mc "Matches none Commit Info
criteria"
rg
grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE,
&revs->grep_filter);
} else if (!strcmp(arg, "--all-match")) {
revs->grep_filter.all_match = 1;
+ } else if (!strcmp(arg, "--invert-grep")) {
+
Implements a none match for git log, which is useful from time to
time to e.g. filter FIXUP message out of git log.
Internally, the bol 'all_match' was changed to an int 'all_or_none'
taken the values 0, GREP_ALL_MATCH or GREP_NONE_MATCH.
For git grep a similar functionality
Christoph Junghans writes:
> The only useful thing I could image is using it in conjunction with
> --files-with-matches, but that is what --files-without-match is for.
Yes, "-l" was exactly what I had in mind and I was hoping that "git
grep -l --no-match -e WIP -e TODO -e FIXME -e NEEDSWORK" may
check that is placed together with a wrong existing
> comment. I also notice that you forgot to update the "git grep"
> where the original "--all-match" came from.
That was on purpose. I am not quite sure what would be the point of
"showing only matches from files that mat
re the original "--all-match" came from.
A partial fix-up may start like this on top of your version. By
renaming the variable used in the existing code, the compiler will
remind you that there are a few more places that your patch did not
touch that does something special for --all-m
v-list-options.txt
@@ -66,6 +66,10 @@ if it is part of the log message.
Limit the commits output to ones that match all given `--grep`,
instead of ones that match at least one.
+--none-match::
+ Limit the commits output to ones that do not match any of the
+ given `--gre
Jonathan Nieder writes:
> Yep. One possibility would be to do something like the following (A):
>
> 1) advertise in the git-config(1) manpage that the GIT_CONFIG
> environment variable only affects the behavior of the 'git config'
> command
>
> 2) introduce an environment variable GIT_
On Wed, Oct 01, 2014 at 06:15:46PM -0700, Jonathan Nieder wrote:
> 3) Warn when 'git config' is called with GIT_CONFIG set, explaining
> that support will eventually be removed and that callers should
> pass --file= instead.
>
> 4) Once we're confident there are no scripts in the wild r
Hi,
Frédéric Brière wrote[1]:
> This kind of stuff caused me a lot of hair-pulling:
>
> $ git config core.abbrev
> 32
> git log --pretty=oneline --abbrev-commit
> 89be foo
>
> Here's the source of the discrepancy:
>
> $ grep abbrev $GIT_CONFIG .git/config
> git.conf: abbrev=32
> .
variable is not set). `--encoding=none` lets you view the
raw log message without any reencoding.
>
> Documentation/pretty-options.txt | 10 --
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/pretty-options.txt
> b/Docu
used to tell the
command to re-code the commit log message in the encoding
- preferred by the user. For non plumbing commands this
- defaults to UTF-8.
+ preferred by the user. "--encoding=none" means to use the
+ raw log message without paying attention
Kevin Bracey writes:
> Minor change from v3: that version moved initialisation of src1 higher up,
> detaching it from its associated comment. This move was only required by
> earlier versions, so v4 leaves src1 in its original position.
The "funny filename" comment was from b539c5e8fbd3 (git-mer
Originally, with no base, Git gave P4Merge $LOCAL as a dummy base:
p4merge "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"
Commit 0a0ec7bd changed this to:
p4merge "empty file" "$LOCAL" "$REMOTE" "$MERGED"
to avoid the problem of being unable to save in some circumstances with
similar inputs.
Unfo
Originally, with no base, Git gave P4Merge $LOCAL as a dummy base:
p4merge "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"
Commit 0a0ec7bd changed this to:
p4merge "empty file" "$LOCAL" "$REMOTE" "$MERGED"
to avoid the problem of being unable to save in some circumstances with
similar inputs.
Unfo
Kevin Bracey writes:
> diff --git a/git-sh-setup.sh b/git-sh-setup.sh
> index 795edd2..aa9a732 100644
> --- a/git-sh-setup.sh
> +++ b/git-sh-setup.sh
> @@ -249,6 +249,19 @@ clear_local_git_env() {
> unset $(git rev-parse --local-env-vars)
> }
>
> +# Generate a virtual base file for a two
Originally, with no base, Git gave P4Merge $LOCAL as a dummy base:
p4merge "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"
Commit 0a0ec7bd changed this to:
p4merge "empty file" "$LOCAL" "$REMOTE" "$MERGED"
to avoid the problem of being unable to save in some circumstances with
similar inputs.
Unfo
On 07/03/2013 04:23, David Aguilar wrote:
On Wed, Mar 6, 2013 at 12:32 PM, Kevin Bracey wrote:
+make_virtual_base() {
+ # Copied from git-merge-one-file.sh.
I think the reasoning behind these patches is good.
How do we feel about this duplication?
Bad.
Should we make a common
David Aguilar writes:
> How do we feel about this duplication?
> Should we make a common function in the git-sh-setup.sh,
> or is it okay to have a slightly modified version of this
> function in two places?
It probably is a good idea to have it in one place. That would also
solve the @@DIFF@@
On Wed, Mar 6, 2013 at 12:32 PM, Kevin Bracey wrote:
> +make_virtual_base() {
> + # Copied from git-merge-one-file.sh.
> + # This starts with $LOCAL, and uses git apply to
> + # remove lines that are not in $REMOTE.
> + cp -- "$LOCAL" "$BASE"
On Wed, Mar 6, 2013 at 12:32 PM, Kevin Bracey wrote:
> Originally, with no base, Git gave P4Merge $LOCAL as a dummy base:
>
>p4merge "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"
>
> Commit 0a0ec7bd changed this to:
>
>p4merge "empty file" "$LOCAL" "$REMOTE" "$MERGED"
>
> to avoid the problem of b
Originally, with no base, Git gave P4Merge $LOCAL as a dummy base:
p4merge "$LOCAL" "$LOCAL" "$REMOTE" "$MERGED"
Commit 0a0ec7bd changed this to:
p4merge "empty file" "$LOCAL" "$REMOTE" "$MERGED"
to avoid the problem of being unable to save in some circumstances.
Unfortunately this appro
Or at least no current bookmark.
Signed-off-by: Felipe Contreras
---
contrib/remote-helpers/git-remote-hg | 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-hg
b/contrib/remote-helpers/git-remote-hg
index 9db4b7e..dbe309a 1
Or at least no current bookmark.
Signed-off-by: Felipe Contreras
---
contrib/remote-hg/git-remote-hg | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
index c2efadf..c41ec95 100755
--- a/contrib
Or at least no current bookmark.
Signed-off-by: Felipe Contreras
---
contrib/remote-hg/git-remote-hg | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/contrib/remote-hg/git-remote-hg b/contrib/remote-hg/git-remote-hg
index 3bb3192..e8e3791 100755
--- a/contrib
60 matches
Mail list logo
