Hi Gábor,
On Tue, 3 May 2016, SZEDER Gábor wrote:
> Quoting SZEDER Gábor :
>
> >Quoting Johannes Schindelin :
> >
> > >Hi Gábor,
> > >
> > >On Sun, 1 May 2016, SZEDER Gábor wrote:
> > >
> > > >diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
> > >
On Wed, May 4, 2016 at 10:37 AM, Pranit Bauva wrote:
> `--next-all` is meant to be used as a sub command to support multiple
> "operation mode" though the current implementation does not contain any
> other sub command along side with `--next-all` but further commits will
On Wed, May 4, 2016 at 10:52 AM, Christian Couder
wrote:
> Pranit,
>
> My gmail address is "christian.cou...@gmail.com", not
> "christain.cou...@gmail.com". ('i' and 'a' are in the wrong oder in my
> first name).
>
> Thanks,
> Christian.
Sorry. It was a typo.
--
To
Pranit,
My gmail address is "christian.cou...@gmail.com", not
"christain.cou...@gmail.com". ('i' and 'a' are in the wrong oder in my
first name).
Thanks,
Christian.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More
`--next-all` is meant to be used as a sub command to support multiple
"operation mode" though the current implementation does not contain any
other sub command along side with `--next-all` but further commits will
include some more subcommands.
Mentored-by: Lars Schneider
This reimplements the `check_term_format` shell function in C and adds
a `--check-term-format` subcommand to `git bisect--helper` to call it
from git-bisect.sh
Helped-by: Johannes Schindelein
Mentored-by: Lars Schneider
Mentored-by:
Important Changes:
* The previous patch is split into two patches for a better and logical
commit history.
* As previously absent, strbuf is used for string manipulation.
* This passes the complete test suite unlike the previous patches.
* Proper use of error handling (die() and error()
On 05/03/2016 08:31 PM, Junio C Hamano wrote:
Torsten Bögershausen writes:
This will probably take some time, so that's why I asked if 1/10..4/10 could
proceed as is ?
Sure, I wasn't saying 1-4 looked wrong at all. I was wondering why
the ones in the middle, especially 7,
The discussion in [1] realized that '.' is a faulty suggestion as
there is a corner case where it fails:
> "submodule deinit ." may have "worked" in the sense that you would
> have at least one path in your tree and avoided this "nothing
> matches" most of the time. It would have still failed
On Tue, May 3, 2016 at 4:56 PM, Jonathan Nieder wrote:
> Stefan Beller wrote:
>
>> This is similar to the gitignore document, but doesn't mirror
>> the current situation. It is rather meant to start a discussion for
>> the right approach for mirroring repositories with
Stefan Beller wrote:
[...]
>>$ rungit v2.6.6 submodule deinit .
>>error: pathspec '.' did not match any file(s) known to git.
>>Did you forget to 'git add'?
>>$ >file && git add file
>>$ rungit v2.6.6 submodule deinit .
>>$ echo $?
>>0
>
>
The discussion in [1] realized that '.' is a faulty suggestion as
there is a corner case where it fails:
> "submodule deinit ." may have "worked" in the sense that you would
> have at least one path in your tree and avoided this "nothing
> matches" most of the time. It would have still failed
Stefan Beller wrote:
> This is similar to the gitignore document, but doesn't mirror
> the current situation. It is rather meant to start a discussion for
> the right approach for mirroring repositories with submodules.
Ooh.
[...]
> --- a/Documentation/git-submodule.txt
> +++
On Tue, May 3, 2016 at 4:36 PM, Kovacs Levente wrote:
> On Tue, 03 May 2016 13:38:22 -0700
> Junio C Hamano wrote:
>
>> Lev writes:
>>
>> > I accidentally added a remote of another repository to my config
>> > file. And so I
On Tue, 03 May 2016 13:38:22 -0700
Junio C Hamano wrote:
> Lev writes:
>
> > I accidentally added a remote of another repository to my config
> > file. And so I merged two different repositories together. Is there
> > any real user case for this?
>
This is similar to the gitignore document, but doesn't mirror
the current situation. It is rather meant to start a discussion for
the right approach for mirroring repositories with submodules.
Signed-off-by: Stefan Beller
---
Jonathan, is this something you had in mind?
On Tue, May 3, 2016 at 3:52 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> So eventually (i.e. after the submodule groups lands)
>> "submodule deinit ." will start acting weird again?
>
> It would be nice if it never acts in a weird way, but that is
On Tue, May 03, 2016 at 01:33:24PM -0400, Eric Sunshine wrote:
> On Tue, May 3, 2016 at 4:50 AM, Mike Hommey wrote:
> > While it is not strictly necessary, it makes the connect code simpler
> > when there is user.
> >
> > Signed-off-by: Mike Hommey
> > ---
>
Stefan Beller writes:
> So eventually (i.e. after the submodule groups lands)
> "submodule deinit ." will start acting weird again?
It would be nice if it never acts in a weird way, but that is all
future development, not related to this fix, no?
--
To unsubscribe from this
On Tue, May 03, 2016 at 01:23:37PM -0400, Eric Sunshine wrote:
> On Tue, May 3, 2016 at 12:20 PM, Torsten Bögershausen wrote:
> > On 2016-05-03 10.50, Mike Hommey wrote:
> >> - git fetch-pack --diag-url "$1" | grep -v host= | grep -v port=
> >> >actual &&
> >> + git
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.
The 'master' branch now has the
On Tue, May 03, 2016 at 09:07:41AM -0700, Junio C Hamano wrote:
> Mike Hommey writes:
>
> > t5603-clone-dirname uses url patterns that are not tested with
> > fetch-pack --diag-url, and it would be useful if they were.
> >
> > Interestingly, some of those tests, involving both
On Tue, May 3, 2016 at 3:28 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> I developed it on top of
>> "submodule deinit test: fix broken && chain in subshell"
>> on top of 2a4c8c36a7f6, 2016-03-24, Merge branch
>>
From: "Junio C Hamano"
Jeff King writes:
On Tue, May 03, 2016 at 09:11:55PM +0100, Philip Oakley wrote:
However, as the G4W project (https://github.com/git-for-windows/git/)
follows the main git repo and its releases, it needs to rebase it's
fixup
Stefan Beller writes:
> I developed it on top of
> "submodule deinit test: fix broken && chain in subshell"
> on top of 2a4c8c36a7f6, 2016-03-24, Merge branch
> 'sb/submodule-module-list-pathspec-fix'
> but I think this would rather go in as a new feature, not on
Jeff King writes:
> On Tue, May 03, 2016 at 09:11:55PM +0100, Philip Oakley wrote:
>
>> However, as the G4W project (https://github.com/git-for-windows/git/)
>> follows the main git repo and its releases, it needs to rebase it's fixup
>> patches, while retaining their original
The discussion in [1] realized that '.' is a faulty suggestion as
there is a corner case where it fails:
> "submodule deinit ." may have "worked" in the sense that you would
> have at least one path in your tree and avoided this "nothing
> matches" most of the time. It would have still failed
On Tue, May 03, 2016 at 09:11:55PM +0100, Philip Oakley wrote:
> However, as the G4W project (https://github.com/git-for-windows/git/)
> follows the main git repo and its releases, it needs to rebase it's fixup
> patches, while retaining their original series, so has repeated copies of
> those
On Tue, May 3, 2016 at 2:32 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
* I think we want to head for consistency, eventually.
e.g. commands with no arguments such as tag, branch
give a list of their respective domain.
>>>
>>>
On Tue, May 03, 2016 at 02:19:24PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > Maybe. I admit to not really using the Travis tests myself, as they are
> > way too slow and cumbersome to debug compared to just running "make
> > test". The primary value to me of
Hi David,
Test t7900.5 fails for me, thus:
$ ./t7900-index-helper.sh -i -v -x -d
...
+ test -S .git/index-helper.sock
+ git status
On branch master
Untracked files:
(use "git add ..." to include in what will be committed)
err
nothing added to commit but
Stefan Beller writes:
>>> * I think we want to head for consistency, eventually.
>>>e.g. commands with no arguments such as tag, branch
>>>give a list of their respective domain.
>>
>> Isn't that a historical mistake we are regretting, though? Only
>> after many
Thanks for fixing the missing SANITY prerequisite Stefan.
As for the error handling logic in setup.c: is_nonbare_repository_dir
(was clean.c: is_git_repository) my reasoning is as follows:
READ_GITFILE_ERR_STAT_FAILED
READ_GITFILE_ERR_NOT_A_FILE:
When checking random paths for .git files these
On Tue, 2016-05-03 at 01:33 -0400, Jeff King wrote:
> On Mon, May 02, 2016 at 02:57:43PM -0400, David Turner wrote:
>
> > On Fri, 2016-04-29 at 16:34 -0700, Stefan Beller wrote:
> >
> > > +const char *known_capabilities[] = {
> > > + "multi_ack",
> > > + "thin-pack",
> > > + "side-band",
> > >
Jeff King writes:
> Maybe. I admit to not really using the Travis tests myself, as they are
> way too slow and cumbersome to debug compared to just running "make
> test". The primary value to me of centralized CI is:
>
> 1. _If_ people are looking at PRs on GitHub, the test
On Tue, May 03, 2016 at 12:28:12PM -0700, Junio C Hamano wrote:
> By the way, it is easy to make a mistake like this, not to notice it
> during a review, and to leave it unnoticed for a long time,
> especially because I do not think anybody active in the development
> community runs tests as
On Tue, May 3, 2016 at 2:01 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> I have your patch here and have a "-a and pathspec are incompatible" fix
>> build on top.
>> * I do wonder if we want to have the shortform '-a' though.
>
> I do not
Stefan Beller writes:
> I have your patch here and have a "-a and pathspec are incompatible" fix
> build on top.
> * I do wonder if we want to have the shortform '-a' though.
I do not particularly care. I was merely matching the other two
options there.
> * I think we want
On Tue, May 3, 2016 at 1:27 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> Stefan Beller (3):
>> submodule deinit test: fix broken && chain in subshell
>> submodule deinit: lose requirement for giving '.'
>> submodule init: redirect stdout to
Lev writes:
> I accidentally added a remote of another repository to my config file. And so
> I
> merged two different repositories together. Is there any real user case for
> this?
Using multiple remotes is a perfectly normal way in which you are
expected to interact
Stefan Beller writes:
> Stefan Beller (3):
> submodule deinit test: fix broken && chain in subshell
> submodule deinit: lose requirement for giving '.'
> submodule init: redirect stdout to stderr
So...
* I'll take "&&-chain" patch on a separate topic on 84ba959, to
I was trying to search the Git for Windows (G4W) history for commits that
touched MSVC.
I've used 'git log -SMSVC --pretty='tformat:%h (%s,
%ad)' --date=short --reverse' to get a nice list of those commits.
However, as the G4W project (https://github.com/git-for-windows/git/)
follows the
Nguyễn Thái Ngọc Duy writes:
> Changes are in
>
> [01/41] usage.c: move format processing out of die_errno()
> [02/41] usage.c: add warning_errno() and error_errno()
> [12/41] builtin/update-index.c: prefer "err" to "errno" in
> process_lstat_error
> [17/41]
Nguyễn Thái Ngọc Duy writes:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> builtin/worktree.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/worktree.c b/builtin/worktree.c
> index d8e3795..331ecf6 100644
> ---
Nguyễn Thái Ngọc Duy writes:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> builtin/rm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/rm.c b/builtin/rm.c
> index 8829b09..13b9639 100644
> --- a/builtin/rm.c
> +++
Nguyễn Thái Ngọc Duy writes:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> @@ -2020,7 +2018,7 @@ static void ll_find_deltas(struct object_entry **list,
> unsigned list_size,
> ret = pthread_create([i].thread, NULL,
>
Nguyễn Thái Ngọc Duy writes:
> diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
> - error("cannot opendir %s (%s)", name, strerror(errno));
> + error_errno("cannot opendir %s", name);
> - error("cannot open
On Tue, May 3, 2016 at 9:19 AM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> Signed-off-by: Stefan Beller
>> ---
>> t/t7400-submodule-basic.sh | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git
Jeff King writes:
> On Tue, May 03, 2016 at 11:54:32AM -0700, Stefan Beller wrote:
>
>> As the test runs `chmod 0` on a file, we don't want to run that test
>> as root.
>
> This somehow misses the root (no pun intended) of the issue, to me.
> Perhaps:
>
> We `chmod 0` a file and
On Tue, May 3, 2016 at 12:08 PM, Junio C Hamano wrote:
> On Tue, May 3, 2016 at 11:07 AM, Stefan Beller wrote:
>>
>> So maybe we want to add a check that no pathspec arguments are
>> given when
>> --all is given?
>
> Yeah, I overlooked that case. Just like
Nguyễn Thái Ngọc Duy writes:
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index f8455bd..1582ca7 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -607,7 +607,7 @@ static int store_updated_refs(const char *raw_url, const
> char *remote_name,
>
> fp =
Jeff King writes:
> On Tue, May 03, 2016 at 11:54:32AM -0700, Stefan Beller wrote:
>
>> As the test runs `chmod 0` on a file, we don't want to run that test
>> as root.
>
> This somehow misses the root (no pun intended) of the issue, to me.
> Perhaps:
>
> We `chmod 0` a file and
On Tue, May 3, 2016 at 11:07 AM, Stefan Beller wrote:
>
> So maybe we want to add a check that no pathspec arguments are
> given when
> --all is given?
Yeah, I overlooked that case. Just like "commit -a path" errors
out, we should.
--
To unsubscribe from this list: send the
On Tue, May 03, 2016 at 11:54:32AM -0700, Stefan Beller wrote:
> As the test runs `chmod 0` on a file, we don't want to run that test
> as root.
This somehow misses the root (no pun intended) of the issue, to me.
Perhaps:
We `chmod 0` a file and test a case where git is unable to read it.
On Tue, May 03, 2016 at 11:53:36AM -0700, Stefan Beller wrote:
> > is related or worth doing on top. But I don't think so. That code is
> > just trying to convert some error-cases into "let's err on the side of
> > assuming it is a repo". Doing that for all values of gitfile_error is
> >
On Tue, May 03, 2016 at 11:01:11AM -0700, Junio C Hamano wrote:
> Ignoring commit.gpgsign option _obviously_ breaks the backward
> compatibility, but it is easy to follow the standard pattern in
> scripts to honor whatever configuration variable they choose to
> follow. E.g.
>
> case
As the test runs `chmod 0` on a file, we don't want to run that test
as root.
Reported-by: Jan Keromnes
Fix-proposed-by: Junio C Hamano
Signed-off-by: Stefan Beller
---
t/t7300-clean.sh | 2 +-
1 file changed, 1 insertion(+), 1
On Tue, May 3, 2016 at 11:48 AM, Jeff King wrote:
> On Tue, May 03, 2016 at 11:05:09AM -0700, Junio C Hamano wrote:
>
>> On Tue, May 3, 2016 at 11:02 AM, Stefan Beller wrote:
>> >
>> > So I wonder if is_nonbare_repository_dir() is the culprit here.
>> > (We do
On Tue, May 03, 2016 at 11:05:09AM -0700, Junio C Hamano wrote:
> On Tue, May 3, 2016 at 11:02 AM, Stefan Beller wrote:
> >
> > So I wonder if is_nonbare_repository_dir() is the culprit here.
> > (We do a chmod 0 on the .git before the `git clean` in the test to confuse
> >
Shin Kojima writes:
> Some multi-byte character encodings (such as Shift_JIS and GBK) have
> characters whose final bytes is an ASCII '\' (0x5c), and they
> will be displayed as funny-characters even if $fallback_encoding is
> correct.
Just out of curiosity, do people still use
Torsten Bögershausen writes:
> This will probably take some time, so that's why I asked if 1/10..4/10 could
> proceed as is ?
Sure, I wasn't saying 1-4 looked wrong at all. I was wondering why
the ones in the middle, especially 7, shouldn't be moved forward
together with them.
Dear Git users,
It is my pleasure to announce that Git for Windows 2.8.2 is available from:
https://git-for-windows.github.io/
Changes since Git for Windows v2.8.1 (April 4th 2016)
New Features
??? Comes with Git v2.8.2.
??? Starting with version 2.8.2, Git for Windows is also
On Tue, May 3, 2016 at 10:21 AM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> The discussion in [1] realized that '.' is a faulty suggestion as
>> there is a corner case where it fails:
>>
>>> "submodule deinit ." may have "worked" in the sense that
On Tue, May 3, 2016 at 11:02 AM, Stefan Beller wrote:
>
> So I wonder if is_nonbare_repository_dir() is the culprit here.
> (We do a chmod 0 on the .git before the `git clean` in the test to confuse
> Git)
Ask if the test is run as root; if so, then mark the test to require
On Tue, May 3, 2016 at 2:19 AM, Jan Keromnes wrote:
> Thanks for your replies! I was able to reproduce to failure on Git 2.8.2.
>
> Steps:
>
> # Build Git 2.8.2 and run t/t7300-clean.sh in a Dockerfile based on
> ubuntu:14.04.
> RUN mkdir /tmp/git \
> && cd /tmp/git \
> && curl
Jeff King writes:
> So I think the motivation and premise are good, but...
>
>> -static int commit_tree_config(const char *var, const char *value, void *cb)
>> -{
>> -int status = git_gpg_config(var, value, NULL);
>> -if (status)
>> -return status;
>> -if
On Tue, May 03, 2016 at 08:41:37AM -0700, Junio C Hamano wrote:
> Even though you obviously were fooled by AsciiDoctor regarding
> literal double dash {litdd}, other parts of the changes did look
> good typofixes. Thanks for starting this.
Yeah, I stopped reading after seeing the first hunk,
On Tue, May 03, 2016 at 10:30:09AM +0200, Lars Schneider wrote:
> > So I think that's a step backwards. I did check the asciidoctor
> > rendering on git-scm.com, though, and it gets the {litdd} case wrong. So
> > I think it does need fixing, but we need a solution that looks correct
> > in both
On Mon, May 2, 2016 at 11:02 AM, Jeff King wrote:
> On Mon, May 02, 2016 at 10:40:28AM -0700, Junio C Hamano wrote:
>
>> "Keller, Jacob E" writes:
>>
>> > True. I think the chances that it needs such a thing are quite minor,
>> > and if an undocumented
Torsten Bögershausen writes:
> On 2016-05-03 10.50, Mike Hommey wrote:
>> While it is not strictly necessary, it makes the connect code simpler
>> when there is user.
>>
>
> That commit message does't tell too much, I think.
"Doesn't tell too much" is not necessarily bad, but
On Tue, May 3, 2016 at 4:50 AM, Mike Hommey wrote:
> While it is not strictly necessary, it makes the connect code simpler
> when there is user.
>
> Signed-off-by: Mike Hommey
> ---
> diff --git a/connect.c b/connect.c
> @@ -812,14 +812,10 @@ struct
On Tue, May 3, 2016 at 12:20 PM, Torsten Bögershausen wrote:
> On 2016-05-03 10.50, Mike Hommey wrote:
>> - git fetch-pack --diag-url "$1" | grep -v host= | grep -v port= >actual
>> &&
>> + git fetch-pack --diag-url "$1" | grep -v user= | grep -v host= | grep
>> -v port=
Stefan Beller writes:
> The discussion in [1] realized that '.' is a faulty suggestion as
> there is a corner case where it fails:
>
>> "submodule deinit ." may have "worked" in the sense that you would
>> have at least one path in your tree and avoided this "nothing
>>
On Tue, May 3, 2016 at 8:03 AM, Nguyễn Thái Ngọc Duy wrote:
> Changes are in
>
> [01/41] usage.c: move format processing out of die_errno()
> [02/41] usage.c: add warning_errno() and error_errno()
> [12/41] builtin/update-index.c: prefer "err" to "errno" in
>
On Tue, May 3, 2016 at 8:03 AM, Nguyễn Thái Ngọc Duy wrote:
> "errno" is already passed in as "err". Here we should use err instead of
> errno. errno is probably a copy/paste mistake in e011054 (Teach
> git-update-index about gitlinks - 2007-04-12)
Thanks, this version is
Dear List,
I accidentally added a remote of another repository to my config file. And so I
merged two different repositories together. Is there any real user case for
this? Is there any way to prevent this happening?
Thanks,
Lev
On 2016-05-03 18.07, Junio C Hamano wrote:
> Mike Hommey writes:
>
>> t5603-clone-dirname uses url patterns that are not tested with
>> fetch-pack --diag-url, and it would be useful if they were.
>>
>> Interestingly, some of those tests, involving both a port and a
>>
On 2016-05-03 10.50, Mike Hommey wrote:
> While it is not strictly necessary, it makes the connect code simpler
> when there is user.
>
That commit message does't tell too much, I think.
Besides that, I'm sure it will break (at least) my ssh wrapper scripts,
which rely on user@host to be passed
On Mon, May 2, 2016 at 8:01 PM, Eric Sunshine wrote:
> On Sun, Apr 24, 2016 at 9:34 AM, Christian Couder
> wrote:
>> Signed-off-by: Christian Couder
>> ---
>> diff --git a/builtin/apply.c b/builtin/apply.c
>> @@
On 2016-05-03 10.50, Mike Hommey wrote:
> Signed-off-by: Mike Hommey
> ---
> connect.c | 6 ++
> t/t5500-fetch-pack.sh | 14 --
> 2 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/connect.c b/connect.c
> index e95e385..2c5b722
Stefan Beller writes:
> Signed-off-by: Stefan Beller
> ---
> t/t7400-submodule-basic.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
> index 814ee63..90d80d3 100755
> ---
On Tue, May 3, 2016 at 9:47 PM, Eric Sunshine wrote:
> On Tue, May 3, 2016 at 5:18 AM, Pranit Bauva wrote:
>> On Tue, May 3, 2016 at 12:19 PM, Eric Sunshine
>> wrote:
> Step back a moment and recall why these tests
On Tue, May 3, 2016 at 5:18 AM, Pranit Bauva wrote:
> On Tue, May 3, 2016 at 12:19 PM, Eric Sunshine
> wrote:
Step back a moment and recall why these tests were added. Earlier
rounds of this series were buggy and caused regressions in
On 2016-05-03 10.50, Mike Hommey wrote:
> diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
> index e5f83bf..1f0133f 100755
> --- a/t/t5500-fetch-pack.sh
> +++ b/t/t5500-fetch-pack.sh
> @@ -569,12 +569,27 @@ check_prot_host_port_path () {
> test_cmp expected actual
> }
>
> -for r
Mike Hommey writes:
> t5603-clone-dirname uses url patterns that are not tested with
> fetch-pack --diag-url, and it would be useful if they were.
>
> Interestingly, some of those tests, involving both a port and a
> user:password pair, don't currently pass. Note that even if
On 2016-05-02 21.33, Junio C Hamano wrote:
> Junio C Hamano writes:
> Let's step back a bit and make sure we are on the same page. I
> think this "series" conflates a bit too many things into a single
> topic.
>
> * The comparison between the index and the working tree, i.e.
Eric Sunshine writes:
One previous commit (title: commit: add a commit.verbose config
variable) introduced a new config variable named commit.verbose,
so care should be taken that it would not affect the behavior of
status.
Another previous
Lars Schneider writes:
> On 02 May 2016, at 22:45, Junio C Hamano wrote:
>
>> larsxschnei...@gmail.com writes:
>>
>>> +set -e
>>> +
>>> +LINKS=$(grep --recursive --only-matching --no-filename --perl-regexp \
>>> +'(?<=linkgit:).*?(?=\[\d+\])'
Lars Schneider writes:
> On 02 May 2016, at 22:34, Jeff King wrote:
>
>> On Mon, May 02, 2016 at 10:20:04PM +0200, larsxschnei...@gmail.com wrote:
>>
>>> From: Lars Schneider
>>>
>>> Signed-off-by: Lars Schneider
Christian Couder writes:
> +void set_index_file(char *index_file)
> +{
> + git_index_file = index_file;
> +}
What's the rationale for this change, and more importantly, the
ownership rule for the string? When you call this function, does
the caller still own
On Mon, May 2, 2016 at 7:42 PM, Eric Sunshine wrote:
> On Sun, Apr 24, 2016 at 9:34 AM, Christian Couder
> wrote:
>> Signed-off-by: Christian Couder
>> ---
>> diff --git a/builtin/apply.c b/builtin/apply.c
>> @@
On Mon, May 2, 2016 at 9:36 AM, Eric Sunshine wrote:
> On Sun, Apr 24, 2016 at 9:34 AM, Christian Couder
> wrote:
>> Signed-off-by: Christian Couder
>> ---
>> diff --git a/builtin/apply.c b/builtin/apply.c
>> @@
On Mon, May 2, 2016 at 9:32 AM, Eric Sunshine wrote:
> On Sun, Apr 24, 2016 at 9:34 AM, Christian Couder
> wrote:
>> Signed-off-by: Christian Couder
>> ---
>> diff --git a/builtin/apply.c b/builtin/apply.c
>> @@
On Sun, May 1, 2016 at 11:03 PM, Eric Sunshine wrote:
>> @@ -4590,10 +4590,10 @@ static int apply_all_patches(struct apply_state
>> *state,
>> squelched);
>> }
>> if (state->ws_error_action ==
Some multi-byte character encodings (such as Shift_JIS and GBK) have
characters whose final bytes is an ASCII '\' (0x5c), and they
will be displayed as funny-characters even if $fallback_encoding is
correct. This is because `highlight` command always expects UTF-8
encoded strings from STDIN.
Hi Dscho,
On Mon, Apr 25, 2016 at 6:06 PM, Johannes Schindelin
wrote:
> Hi Chris,
>
> On Sun, 24 Apr 2016, Christian Couder wrote:
>
>> @@ -4734,16 +4737,22 @@ int apply_all_patches(struct apply_state *state,
>> read_stdin = 0;
>>
---
connect.c | 109 ++
1 file changed, 59 insertions(+), 50 deletions(-)
Err, I had forgotten to commit --amend to add a missing argument.
diff --git a/connect.c b/connect.c
index 215d6d9..5f86983 100644
--- a/connect.c
+++
Signed-off-by: Nguyễn Thái Ngọc Duy
---
sequencer.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index e66f2fe..4687ad4 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -875,8 +875,7 @@ static int sequencer_rollback(struct
Signed-off-by: Nguyễn Thái Ngọc Duy
---
rerere.c | 18 +++---
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/rerere.c b/rerere.c
index c8b9f40..1810c04 100644
--- a/rerere.c
+++ b/rerere.c
@@ -501,8 +501,7 @@ static int handle_file(const char *path,
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff-no-index.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/diff-no-index.c b/diff-no-index.c
index 03daadb..1f8999b 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -65,8 +65,7 @@ static int
1 - 100 of 162 matches
Mail list logo