Hey Junio,
On Sat, Aug 13, 2016 at 12:55 AM, Junio C Hamano wrote:
> Pranit Bauva writes:
>
>> + ...
>> + /*
>> + * Write new start state
>> + */
>> + if (write_file(git_path_bisect_start(), "%s\n", start_head.buf)) {
>
> I think this function has changed its signature recently
Hey Junio,
On Sat, Aug 13, 2016 at 12:19 AM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Pranit Bauva writes:
>>
>>> +static int bisect_next_check(const struct bisect_terms *terms,
>>> + const char *current_term)
>>> +{
>>> +
>>> +fprintf(stderr,
On 08/12/2016 08:07 PM, Jon Forrest wrote:
>
>
> On 8/12/16 6:11 AM, Sitaram Chamarty wrote:
>
>> At present gitolite is -- AFAIK -- the only "pure server side", "no GUI"
>> solution for access control, and has some interesting features that more
>> "GUI" solutions may not. It is also (again, A
On 08/04/2016 06:55 PM, Stefan Beller wrote:
> [...]
> I have just reread the scoring function and I think you could pull out the
> `score=indent` assignment (it is always assigned except for indent <0)
>
> if (indent == -1)
>score = 0;
> else
>score
On 08/04/2016 09:52 PM, Junio C Hamano wrote:
> Michael Haggerty writes:
>> +#define START_OF_FILE_BONUS 9
>> +#define END_OF_FILE_BONUS 46
>> +#define TOTAL_BLANK_WEIGHT 4
>> +#define PRE_BLANK_WEIGHT 16
>> +#define RELATIVE_INDENT_BONUS -1
>> +#define RELATIVE_INDENT_HAS_BLANK_BONUS 15
>> +#defi
From: "Junio C Hamano"
To: "Ralf Thielow"
Cc: ; ;
Sent: Friday, August 12, 2016 11:53 PM
Subject: Re: [PATCH] help: make option --help open man pages only for Git
commands
Junio C Hamano writes:
I love it when I say "This shouldn't be too hard; somebody may want
to do a patch", with jus
These are the quick fixes to Marc's comments to patches 5,6,11,
and a consequential change to 12.
Only the changed patches are included.
Philip Oakley (12):
doc: use 'symmetric difference' consistently
doc: revisions - name the left and right sides
doc: show the actual left, right, and boun
Signed-off-by: Philip Oakley
---
v6 updated
Cc: Jakub Narębski
Cc: Marc Branchaud
https://public-inbox.org/git/578E4F4A.2020708%40gmail.com/
---
Documentation/revisions.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/revisions.txt b/Documentation/revision
The revisions examples show the revison arguments and the selected
commits, but do not show the intermediate step of the expansion of
the special 'range' notations. Extend the examples, including an
all-parents multi-parent merge commit example.
Sort the examples and fix the alignment for those un
The previous commit adjusted the column alignment for revision
examples which show expansion. Fix the unchanged examples and sort
those that show expansions to the end of the list.
Signed-off-by: Philip Oakley
---
v6 updated
Cc: Marc Branchaud
---
Documentation/revisions.txt | 12 ++--
Signed-off-by: Philip Oakley
---
v6 updated
Junio's final comment
https://public-inbox.org/git/xmqqwpkq6b4d.fsf%40gitster.mtv.corp.google.com/
Cc: Marc Branchaud
---
Documentation/revisions.txt | 4
1 file changed, 4 insertions(+)
diff --git a/Documentation/revisions.txt b/Documentation/r
On 08/04/2016 09:56 AM, Jeff King wrote:
> On Thu, Aug 04, 2016 at 12:00:36AM +0200, Michael Haggerty wrote:
>
>> This table shows the number of diff slider groups that were positioned
>> differently than the human-generated values, for various repositories.
>> "default" is the default "git diff"
Junio C Hamano writes:
> I love it when I say "This shouldn't be too hard; somebody may want
> to do a patch", with just a vague implemention idea in my head, and
> a patch magically appears with even a better design than I had in
> mind when I said it [*1*] ;-)
Having said that, I wonder if we
From: "Marc Branchaud"
On 2016-08-12 03:07 AM, Philip Oakley wrote:
The revisions examples show the revison arguments and the selected
commits, but do not show the intermediate step of the expansion of
the special 'range' notations. Extend the examples, including an
all-parents multi-parent mer
Junio C Hamano wrote:
> For those who prefer to read it over NNTP:
>
> nntp://news.gmane.org/gmane.comp.version-control.git
>
> is still available. An alternative
>
> nntp://news.public-inbox.org/inbox.comp.version-control.git
>
> will become usable once it catches up with old m
Stefan Beller writes:
> +int add_possible_reference_from_superproject(
> + struct alternate_object_database *alt, void *sas_cb)
> +{
> + struct submodule_alternate_setup *sas = sas_cb;
> +
> + ...
> + size_t namelen = alt->name - alt->base - 1;
> + struct strbuf name = STR
Stefan Beller writes:
> + struct strbuf sb = STRBUF_INIT;
> + char *ref_git = compute_alternate_path(item->string, &sb);
Who owns the memory for ref_git?
> - if (!access(mkpath("%s/shallow", ref_git), F_OK))
> - die(_("reference repository '%s' is shallow"), item->string
From: "Marc Branchaud"
On 2016-08-12 03:07 AM, Philip Oakley wrote:
Signed-off-by: Philip Oakley
---
new
Junio's final comment
https://public-inbox.org/git/xmqqwpkq6b4d.fsf%40gitster.mtv.corp.google.com/
---
Documentation/revisions.txt | 4
1 file changed, 4 insertions(+)
diff --git a
From: "Marc Branchaud"
On 2016-08-12 03:07 AM, Philip Oakley wrote:
Signed-off-by: Philip Oakley
---
new
Cc: Jakub Narębski
https://public-inbox.org/git/578E4F4A.2020708%40gmail.com/
---
Documentation/revisions.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documen
Jeff Hostetler writes:
> This v8 patch series addresses the remaining feedback
> about the unit tests from the v6 and v7 series.
Thanks, will re-queue.
I didn't spot anything glaringly wrong in the last patch, and all
the ealier steps looked good in the previous round, so I think we
are getting
On Fri, Aug 12, 2016 at 2:21 PM, Jacob Keller wrote:
> On Fri, Aug 12, 2016 at 2:15 PM, Junio C Hamano wrote:
>> Otherwise, a "git log --graph -p --submodule=log-with-diff", when
>> showing a commit in the superproject that changes submodule from
>> commit A to commit B, wouldn't be able to run "
Ralf Thielow writes:
> If option --help is passed to a Git command, we try to open
> the man page of that command. However, we do it even for commands
> we don't know. Make sure the command is known to Git before try
> to open the man page. If we don't know the command, give the
> usual advice.
"Philip Oakley" writes:
> I'll work on the tweaks, though it'll probably be tomorrow as we have
> visitors.
Thank you for working on this; Marc, thank you for many good review
comments.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.k
On Fri, Aug 12, 2016 at 2:15 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> The prefix shall come first prior to any other prefix associated with
>> the --graph option or other source.
>>
>> Add tests for the same.
>>
>> Signed-off-by: Jacob Keller
>> ---
>> - v5
>> * Changed name to --di
Jacob Keller writes:
> The prefix shall come first prior to any other prefix associated with
> the --graph option or other source.
>
> Add tests for the same.
>
> Signed-off-by: Jacob Keller
> ---
> - v5
> * Changed name to --diff-line-prefix since --line-prefix might indicate
> for other comm
If option --help is passed to a Git command, we try to open
the man page of that command. However, we do it even for commands
we don't know. Make sure the command is known to Git before try
to open the man page. If we don't know the command, give the
usual advice.
Signed-off-by: Ralf Thielow
--
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 onto them.
v2.9.3 has been tagged as the thir
Welcome to the Git development community.
This message is written by the maintainer and talks about how Git
project is managed, and how you can work with it.
* Mailing list and the community
The development is primarily done on the Git mailing list. Help
requests, feature proposals, bug reports
The latest maintenance release Git v2.9.3 is now available at
the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.9.3'
tag and the 'maint' branch that the tag points at:
url = https://kerne
Pranit Bauva writes:
> + ...
> + /*
> + * Write new start state
> + */
> + if (write_file(git_path_bisect_start(), "%s\n", start_head.buf)) {
I think this function has changed its signature recently. I am
planning to tag 2.10-rc0 this weekend, and it may be a good time to
reba
Pranit Bauva writes:
> +static int bisect_clean_state(void)
> +{
> + int result = 0;
> +
> + /* There may be some refs packed during bisection */
> + struct string_list refs_for_removal = STRING_LIST_INIT_NODUP;
> + for_each_ref_in("refs/bisect/", mark_for_removal, (void *)
> &re
From: "Marc Branchaud"
On 2016-08-12 03:07 AM, Philip Oakley wrote:
[2nd attempt : ISP troubles]
This has grown like topsy from a little two patch series that tried to
name the 2-dots notation [1] into this extended set of tweaks.
Honestly, I start just trying point out something concrete, l
Junio C Hamano writes:
> Pranit Bauva writes:
>
>> +static int bisect_next_check(const struct bisect_terms *terms,
>> + const char *current_term)
>> +{
>> +
>> +fprintf(stderr, N_("Warning: bisecting only with a %s
>> commit\n"),
>> +
Ivan Oleynikov writes:
> Cc: git@vger.kernel.org, d...@metrotek.spb.ru, apenw...@gmail.com
I think Avery no longer actively works on this script; Dave Greene
has been helping it move forward by reviewing, so let's ask him to
lend his eyes.
> This commit removes false positive assertion fails
On Fri, Aug 12, 2016 at 9:25 AM, Junio C Hamano wrote:
> On Fri, Aug 12, 2016 at 9:15 AM, Joseph Musser wrote:
>> Oh, I'm embarrassed. The typo was mine, I must have typed `git stack
>> --help`. I would have expected a syntax error message or "did you
>> mean" suggestions; it didn't even enter my
Pranit Bauva writes:
> +static char *bisect_voc(char *revision_type)
> +{
> + if (!strcmp(revision_type, "bad"))
> + return "bad|new";
> + if (!strcmp(revision_type, "good"))
> + return "good|old";
> +
> + return NULL;
> +}
I think you can return "const char *
Lars Schneider writes:
>> Unless the reasoning is "an error in between is so rare that we are
>> OK if the protocol misbehaves and the receiving end omits error
>> handing", I am not so sure how "therefore additional work is OK" is
>> a reasonable conclusion.
>
> Maybe I need to reword. An error
tbo...@web.de writes:
> From: Torsten Bögershausen
>
> When a non-reversible CRLF conversion is done in "git add",
> a warning is printed on stderr (or Git dies, depending on checksafe)
>
> The function commit_chk_wrnNNO() in t0027 was written to test this,
> but did the wrong thing: Instead of l
tbo...@web.de writes:
> From: Torsten Bögershausen
>
> When the "new safer autocrlf-handling" was introduced in c4805393, the logic
> around check_safe_crlf() should have been changed:
Should have been changed from what to what? And instead it was
changed to which other logic? What is the diff
quote on Fri, Aug 12, 2016 at 06:49:42PM +0300 (Ivan Oleynikov):
BTW, this patch should be applied to `maint` branch. The similar change also
works if applied to master (patch for master must be a bit different).
--
Ivan Oleynikov
STC Metrotek
St.Petersburg
--
To unsubscribe from this list: send
> On 12 Aug 2016, at 19:13, Junio C Hamano wrote:
>
> Lars Schneider writes:
>
>>> If we do the success first and then error out halfway, we
>>> still have to clean up, so I do not see how this impacts
>>> implementation?
>>
>> That is true. The reasoning is that an error in between is somewh
> On 12 Aug 2016, at 19:07, Stefan Beller wrote:
>
> On Fri, Aug 12, 2016 at 9:59 AM, Lars Schneider
> wrote:
>>
>> The welcome message is necessary to distinguish the long running
>> filter protocol (v2) from the current one-shot filter protocol (v1).
>> This is becomes important if a users t
Lars Schneider writes:
>> If we do the success first and then error out halfway, we
>> still have to clean up, so I do not see how this impacts
>> implementation?
>
> That is true. The reasoning is that an error in between is somewhat
> less expected. Therefore additional work is OK.
>
> An error
> On 12 Aug 2016, at 18:48, Stefan Beller wrote:
>
> On Fri, Aug 12, 2016 at 9:38 AM, Jeff King wrote:
>> On Fri, Aug 12, 2016 at 09:33:18AM -0700, Stefan Beller wrote:
>>
If the result content is empty then the filter is expected to respond
with a success status and an empty list.
>
On Fri, Aug 12, 2016 at 9:59 AM, Lars Schneider
wrote:
>
> The welcome message is necessary to distinguish the long running
> filter protocol (v2) from the current one-shot filter protocol (v1).
> This is becomes important if a users tries to use a v1 clean/smudge
> filter with the v2 git config s
> On 12 Aug 2016, at 18:33, Stefan Beller wrote:
>
> On Wed, Aug 10, 2016 at 6:04 AM, wrote:
>> From: Lars Schneider
>>
>> Git's clean/smudge mechanism invokes an external filter process for every
>> single blob that is affected by a filter. If Git filters a lot of blobs
>> then the startup
On Fri, Aug 12, 2016 at 9:38 AM, Jeff King wrote:
> On Fri, Aug 12, 2016 at 09:33:18AM -0700, Stefan Beller wrote:
>
>> > If the result content is empty then the filter is expected to respond
>> > with a success status and an empty list.
>> >
>> > packet: git< sta
From: Torsten Bögershausen
When a non-reversible CRLF conversion is done in "git add",
a warning is printed on stderr (or Git dies, depending on checksafe)
The function commit_chk_wrnNNO() in t0027 was written to test this,
but did the wrong thing: Instead of looking at the warning
from "git add
From: Torsten Bögershausen
When the "new safer autocrlf-handling" was introduced in c4805393, the logic
around check_safe_crlf() should have been changed:
Once a file has been commited with CRLF (and core.autocrlf is true),
line endings are no longer converted by "git add" or "git checkout".
The
From: Torsten Bögershausen
conversion warnings in convert.c and t0027
- Fix a raciness in t0027
- Fix an older problem with the conversion warnings when a file
has CRLF in the index, and is now commited with LF.
- Do not yet rename NNO to something different.
NNO means Not NOrmalized in the i
On Fri, Aug 12, 2016 at 09:33:18AM -0700, Stefan Beller wrote:
> > If the result content is empty then the filter is expected to respond
> > with a success status and an empty list.
> >
> > packet: git< status=success\n
> > packet: git<
> > packet:
On Wed, Aug 10, 2016 at 6:04 AM, wrote:
> From: Lars Schneider
>
> Git's clean/smudge mechanism invokes an external filter process for every
> single blob that is affected by a filter. If Git filters a lot of blobs
> then the startup time of the external filter processes can become a
> significa
On Fri, Aug 12, 2016 at 08:51:43AM -0700, Stefan Beller wrote:
> > Hmm. Using "!test_cmp" seems weird to me, just because it would falsely
> > claim success if something else unexpected changes. Our usual method for
> > making sure some particular output does not appear is "test_i18ngrep"
> > with
On Fri, Aug 12, 2016 at 9:15 AM, Joseph Musser wrote:
> Oh, I'm embarrassed. The typo was mine, I must have typed `git stack
> --help`. I would have expected a syntax error message or "did you
> mean" suggestions; it didn't even enter my mind that it would look up
> whatever I typed before --help
Oh, I'm embarrassed. The typo was mine, I must have typed `git stack
--help`. I would have expected a syntax error message or "did you
mean" suggestions; it didn't even enter my mind that it would look up
whatever I typed before --help and assume it existed on disk.
I'm sorry!
On Fri, Aug 12, 201
Stefan Beller writes:
> When a user asked for a detached HEAD specifically with `--detach`,
> we do not need to give advice on what a detached HEAD state entails as
> we can assume they know what they're getting into as they asked for it.
>
> Signed-off-by: Stefan Beller
> ---
>
> Thanks for the
> On 12 Aug 2016, at 17:48, Junio C Hamano wrote:
>
> Joseph Musser writes:
>
>> Looks like a simple typo.
>
> Unfortunately this does not reproduce to me (built from source on
> Ubuntu Linux).
I tried it with the latest released version on Windows and OSX (2.9.2)
and was not able to reprodu
This commit removes false positive assertion fails of `git subtree split` when
the --prefix argument is not in a particular form produced by `git ls-tree`.
For example, typical usage of the command could be:
git subtree split -b split --prefix=some/relative/path
But
git subtree split -b spl
On Fri, Aug 12, 2016 at 8:43 AM, Jeff King wrote:
> On Fri, Aug 12, 2016 at 08:37:44AM -0700, Stefan Beller wrote:
>
>> > Is there a reason for not unsetting `advice.detachedHead` at the
>> > end of the test?
>>
>> done
>>
>> I did not consider to clean up after myself... what a selfish world!
>
>
From: Jeff Hostetler
This patch series adds porcelain V2 format to status.
This provides detailed information about file changes
and about the current branch.
The new output is accessed via:
git status --porcelain=v2 [--branch]
This v8 patch series addresses the remaining feedback
about the
From: Jeff Hostetler
Update status manpage to include information about
porcelain v2 format.
Signed-off-by: Jeff Hostetler
---
Documentation/git-status.txt | 126 +--
1 file changed, 122 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-statu
From: Jeff Hostetler
Expand porcelain v2 output to include branch and tracking
branch information. This includes the commit id, the branch,
the upstream branch, and the ahead and behind counts.
Signed-off-by: Jeff Hostetler
---
builtin/commit.c | 5
wt-status.c | 90
From: Jeff Hostetler
Print per-file information in porcelain v2 format.
Signed-off-by: Jeff Hostetler
---
wt-status.c | 285 +++-
1 file changed, 284 insertions(+), 1 deletion(-)
diff --git a/wt-status.c b/wt-status.c
index dd0a1ab..bd90
From: Jeff Hostetler
Test porcelain v2 status format.
Signed-off-by: Jeff Hostetler
---
t/t7064-wtstatus-pv2.sh | 593
1 file changed, 593 insertions(+)
create mode 100755 t/t7064-wtstatus-pv2.sh
diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-
From: Jeff Hostetler
Rename the various wt_status_print*() routines to be
wt_longstatus_print*() to make it clear that these
routines are only concerned with the normal/long
status output and reduce developer confusion as other
status formats are added in the future.
Signed-off-by: Jeff Hostetle
From: Jeff Hostetler
Update --porcelain argument to take optional version parameter
to allow multiple porcelain formats to be supported in the future.
The token "v1" is the default value and indicates the traditional
porcelain format. (The token "1" is an alias for that.)
Signed-off-by: Jeff H
From: Jeff Hostetler
Refactor the API between builtin/commit.c and wt-status.[ch].
Hide the details of the various wt_*status_print() routines inside
wt-status.c behind a single (new) wt_status_print() routine.
Eliminate the switch statements from builtin/commit.c.
Allow details of new status fo
From: Jeff Hostetler
Collect extra per-file data for porcelain V2 format.
The output of `git status --porcelain` leaves out many
details about the current status that clients might like
to have. This can force them to be less efficient as they
may need to launch secondary commands (and try to m
From: Jeff Hostetler
Add lf_to_nul() function to test-lib-functions.
Signed-off-by: Jeff Hostetler
---
t/test-lib-functions.sh | 4
1 file changed, 4 insertions(+)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 4f7eadb..fdaeb3a 100644
--- a/t/test-lib-functions.sh
+
Joseph Musser writes:
> Looks like a simple typo.
Unfortunately this does not reproduce to me (built from source on
Ubuntu Linux).
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.or
On Fri, Aug 12, 2016 at 08:37:44AM -0700, Stefan Beller wrote:
> > Is there a reason for not unsetting `advice.detachedHead` at the
> > end of the test?
>
> done
>
> I did not consider to clean up after myself... what a selfish world!
The right way to do it is:
test_config advice.detachedHea
On 2016-08-12 03:07 AM, Philip Oakley wrote:
[2nd attempt : ISP troubles]
This has grown like topsy from a little two patch series that tried to
name the 2-dots notation [1] into this extended set of tweaks.
Honestly, I start just trying point out something concrete, like
misrendered headers,
When a user asked for a detached HEAD specifically with `--detach`,
we do not need to give advice on what a detached HEAD state entails as
we can assume they know what they're getting into as they asked for it.
Signed-off-by: Stefan Beller
---
Thanks for the review!
> Is there a reason for not
On 2016-08-12 03:07 AM, Philip Oakley wrote:
The revisions examples show the revison arguments and the selected
commits, but do not show the intermediate step of the expansion of
the special 'range' notations. Extend the examples, including an
all-parents multi-parent merge commit example.
Sort
On 2016-08-12 03:07 AM, Philip Oakley wrote:
Signed-off-by: Philip Oakley
---
new
Junio's final comment
https://public-inbox.org/git/xmqqwpkq6b4d.fsf%40gitster.mtv.corp.google.com/
---
Documentation/revisions.txt | 4
1 file changed, 4 insertions(+)
diff --git a/Documentation/revisions.t
On 2016-08-12 03:07 AM, Philip Oakley wrote:
Signed-off-by: Philip Oakley
---
new
Cc: Jakub Narębski
https://public-inbox.org/git/578E4F4A.2020708%40gmail.com/
---
Documentation/revisions.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/revisions.txt b/Do
On 2016-08-12 03:07 AM, Philip Oakley wrote:
While there, also break out the other shorthand notations and
add a title for the revision range summary (which also appears
in git-rev-parse, so keep it mixed case).
We do not quote the notation within the headings as the asciidoc ->
docbook -> groff
On 8/12/16 6:11 AM, Sitaram Chamarty wrote:
At present gitolite is -- AFAIK -- the only "pure server side", "no GUI"
solution for access control, and has some interesting features that more
"GUI" solutions may not. It is also (again, AFAIK) used by kernel.org,
Fedora, Gentoo, and several othe
Hello,
Have a nice day!
I am very interested in purchasing another product. Kindly send your latest
catalog. Also what is your delivery time or FOB, and payment terms warranty?
Thanks and Best Regards,
Mr. Marco Plujm.
___
MARCO MEGA TRADING CO.,LTD
Washington,
On 07/24/2016 09:37 AM, Jon Forrest wrote:
> This an announcement of Pro Git Reedited 2nd Edition, which is
> a substantial edit of Chacon and Straub's Pro Git 2nd Edition.
> I spent a lot of time tightening it up and maybe clearing
> up some explanations.
>
> The pdf is downloadable at:
> https:/
Use test_i18ngrep function instead of grep for grepping strings.
Signed-off-by: Vasco Almeida
---
t/t5520-pull.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 6ad37b5..5518445 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@
The concerned test greps the error message in git_parse_source() which
contains "bad config line %d in submodule-blob %s".
Signed-off-by: Vasco Almeida
---
t/t7411-submodule-config.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7411-submodule-config.sh b/t/t7411-submod
The concerned test greps the output of exit_with_patch() in
git-rebase--interactive.sh script.
Signed-off-by: Vasco Almeida
---
t/t3404-rebase-interactive.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 19
Stefan Beller writes:
> +test_expect_success 'no advice given for explicit detached head state' '
> +git config advice.detachedHead false &&
> +git checkout child &&
> +git checkout --detach HEAD >expect &&
> +git config advice.detachedHead true &&
Is there a reaso
From: "Eric Wong"
Sent: Thursday, August 11, 2016 11:26 PM
Philip Oakley wrote:
The raw download works. My home ISP is currently blocking your email for
some reason, though I do see it at my work - my iee.org alias is via my
professional body which duplicates the email when it relays it.
Hmm
On Thu, Aug 11, 2016 at 06:58:12PM +, Torsten Bögershausen wrote:
> commit 3754404d3d1ea4a0cbbed4986cc4ac1b5fe6b66e
> Author: Torsten Bögershausen
> Date: Thu Aug 11 18:47:29 2016 +0200
>
> t0027: Correct raciness in NNO test
>
> When a non-reversible CRLF conversion is done i
For instance, if you set your diff/mergetool to meld and you don't have it
installed:
> git difftool
Viewing (1/1): 'blah'
Launch 'meld' [Y/n]? y
/home/ttanner/bin/meld[8]: /opt/swt/bin/meld: not found
> echo $?
0
> /home/ttanner/bin/meld
/home/ttanner/bin/meld[8]: /opt/swt/bin/meld: not found
>
Signed-off-by: Philip Oakley
---
unchanged
---
Documentation/gitk.txt | 2 +-
Documentation/rev-list-options.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 6ade002..6c3eb15 100644
--- a/Documentation/g
On Fri, Aug 12, 2016 at 08:07:41AM +0100, Philip Oakley wrote:
> We do not quote the notation within the headings as the asciidoc ->
> docbook -> groff man viewer toolchain, particularly the docbook-groff
> step, does not cope with two font changes, failing to return the heading
> font to bold aft
Signed-off-by: Philip Oakley
---
Found while checking the 'symmetric difference' documentation
Unchanged from v4
---
Documentation/pretty-formats.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 29b19
Signed-off-by: Philip Oakley
---
new
Cc: Jakub Narębski
https://public-inbox.org/git/578E4F4A.2020708%40gmail.com/
---
Documentation/revisions.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 3da0083..0b5044
[2nd attempt : ISP troubles]
This has grown like topsy from a little two patch series that tried to
name the 2-dots notation [1] into this extended set of tweaks.
As documentation can be rather personal, I've split out each small change
so each can be individually justified.
Since V4, I've confi
Signed-off-by: Philip Oakley
---
unchanged
---
Documentation/gitrevisions.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/gitrevisions.txt b/Documentation/gitrevisions.txt
index e903eb7..33039c6 100644
--- a/Documentation/gitrevisions.txt
+++ b/Documentat
While there, also break out the other shorthand notations and
add a title for the revision range summary (which also appears
in git-rev-parse, so keep it mixed case).
We do not quote the notation within the headings as the asciidoc ->
docbook -> groff man viewer toolchain, particularly the docbook
The terms left and right side originate from the symmetric
difference. Name them there.
Signed-off-by: Philip Oakley
---
unchanged
---
Documentation/revisions.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 1
The previous commit adjusted the column alignment for revision
examples which show expansion. Fix the unchanged examples and sort
those that show expansions to the end of the list.
Signed-off-by: Philip Oakley
---
new
---
Documentation/revisions.txt | 12 ++--
1 file changed, 6 insertion
The prior sentence has too many clauses for easy parsing.
Replace 'the latter case' with a direct quote.
Signed-off-by: Philip Oakley
---
unchanged
---
Documentation/gitrevisions.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/gitrevisions.txt b/Document
The revisions examples show the revison arguments and the selected
commits, but do not show the intermediate step of the expansion of
the special 'range' notations. Extend the examples, including an
all-parents multi-parent merge commit example.
Sort the examples and fix the alignment for those un
Do not self-define `reachable`, which can lead to misunderstanding.
Instead define `reachability` explictly.
Signed-off-by: Philip Oakley
---
unchanged
---
Documentation/revisions.txt | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/Documentation/revisions.txt
For the r1..r2 case, the exclusion of r1, rather than inclusion of r2,
would be the unexpected case in natural language for a simple linear
development, i.e. start..end excludes start.
Signed-off-by: Philip Oakley
---
unchanged
---
Documentation/revisions.txt | 11 ++-
1 file changed,
1 - 100 of 101 matches
Mail list logo
