Hi,
I just ran into some odd behavior trying to update a submodule in one
of my projects where it would hang indefinitely trying to run either
`git status` or `git commit`.
Here's the minimal repro recipe:
mkdir demo
cd demo
git init
git submodule add git://github.com/ansible/ansible.git ansible
When a commit changes a path P that used to be a file to a directory
and create a new path P/X in it, "git show" would say that file P
was removed and file P/X was created for such a commit.
However, if we compare two directories, D1 and D2, where D1 has a
file D1/P in it and D2 has a directory D2
Stefan Beller writes:
> To spin this further it would be interesting to have
> a server advertisement during git clone which indicates
> if this setting is recommended to be set.
> Then hosting sites popular in the open source world such as
> github could enable this feature, and the client may e
On 21.03.2015 13:21, Dennis Kaarsemaker wrote:
> On za, 2015-03-21 at 14:06 -0400, David A. Wheeler wrote:
>> Warn cloners if there is no LICENSE* or COPYING* file that makes
>> the license clear. This is a useful warning, because if there is
>> no license somewhere, then local copyright laws (whi
On Sun, Feb 01, 2015 at 10:53:32PM -0700, Alex Henrie wrote:
> Signed-off-by: Alex Henrie
Thanks, applied.
Paul.
--
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.org/majordomo-info.h
On Fri, Nov 14, 2014 at 05:05:28PM +0600, 0xAX wrote:
> Signed-off-by: 0xAX
> ---
> po/ru.po | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Thanks, applied.
Paul.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
Mor
On Mon, Feb 09, 2015 at 01:55:23PM -0800, Junio C Hamano wrote:
> Alex Henrie writes:
>
> > This is just a friendly reminder that this patch has been sitting in
> > the mailing list archives for a couple of weeks, and it has not yet
> > been accepted or commented on.
>
> I think that is because
On Sat, Nov 15, 2014 at 03:05:06PM +0100, Gabriele Mazzotta wrote:
> Currently it's required to hold Shift and scroll up and down to move
> horizontally. Listen to Button-6 and Button-7 events too to make
> horizontal scrolling handier with touchpads and some mice.
>
> Signed-off-by: Gabriele Mazz
On Wed, Mar 04, 2015 at 05:58:15AM +0200, Max Kirillov wrote:
> The changes:
>
> * remove unused views_modified_names assignment
> * use if {[catch...] to check saving error
> * split error reporting from busy wait
>
> The busy wait parameters are unchanged, mostly because I did not have time
>
On Sun, Feb 15, 2015 at 11:29:10PM -0800, Junio C Hamano wrote:
> From: Christoph Junghans
> Date: Mon, 12 Jan 2015 18:33:32 -0700
>
> "git log --grep=" shows only commits with messages that
> match the given string, but sometimes it is useful to be able to
> show only commits that do *not* have
On Fri, Mar 20, 2015 at 6:36 AM, wrote:
> I am trying to setup my git ignore (resp. .git/info/exclude) so that I exclude
> all directories and files except the content of directories that I
> specifically include (incl. anything within them recursively).
>
> I set the .git/info/exclude with the
On Fri, Mar 20, 2015 at 11:15 AM, Jason Karns wrote:
> There appears to be a bug in the bash completion for git-branch when
> attempting to complete the remote ref argument for --set-upstream-to=
>
> When:
>
> $ git branch --set-upstream-to=origin/mast
>
> I would expect it to complete to:
>
> $ g
On Sat, Mar 21, 2015 at 8:50 AM, Yurii Shevtsov wrote:
> Signed-off-by: Yurii Shevtsov
> ---
> diff --git a/diff-no-index.c b/diff-no-index.c
> index 265709b..9a3439a 100644
> --- a/diff-no-index.c
> +++ b/diff-no-index.c
> @@ -97,8 +97,39 @@ static int queue_diff(struct diff_options *o,
> i
Warn cloners if there is no LICENSE* or COPYING* file that makes
the license clear. This is a useful warning, because if there is
no license somewhere, then local copyright laws (which forbid many uses)
and terms of service apply - and the cloner may not be expecting that.
Many projects accidental
On Sat, Mar 21, 2015 at 11:01:43AM -0700, Junio C Hamano wrote:
> > Running:
> >
> > git diff origin origin/jk/test-chain-lint |
> > perl diff-blame.pl jk/test-chain-lint |
> > grep EOF
> >
> > was fun. At least I am not the only one. :)
>
> The parameter to diff-blame.pl should be origin,
On Thu, Mar 19, 2015 at 03:43:57PM -0700, Junio C Hamano wrote:
> Kevin Daudt writes:
>
> > rev-list --bisect is used by git bisect, but never together with
> > --first-parent. Because rev-list --bisect together with --first-parent
> > is not handled currently, and even leads to segfaults, refuse
Add missing &&, detected by the --chain-lint option
Signed-off-by: Torsten Bögershausen
---
side note: All other tests passed on jk/test-chain-lint
t/t6039-merge-ignorecase.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t6039-merge-ignorecase.sh b/t/t6039-merge-ignore
Am 21. März 2015 um 13:52 schrieb Phillip Sz :
>
> I think we should use it like this, as most open-source projects do.
> Also we should use a space before the three dots as per
> http://www.duden.de/sprachwissen/rechtschreibregeln/auslassungspunkte
>
I don't think this rule of ellipsis applies h
On za, 2015-03-21 at 14:06 -0400, David A. Wheeler wrote:
> Warn cloners if there is no LICENSE* or COPYING* file that makes
> the license clear. This is a useful warning, because if there is
> no license somewhere, then local copyright laws (which forbid many uses)
> and terms of service apply -
On Fri, Mar 20, 2015 at 08:20:58PM -0700, Junio C Hamano wrote:
> I had an impression that the series may see at least one reroll to
> polish it further before it gets ready for 'next', as I only saw
> discussions on the tangent (e.g. possible futures) and didn't see
> serious reviews of the code t
>> diff --git a/diff-no-index.c b/diff-no-index.c
>> index 265709b..9a3439a 100644
>> --- a/diff-no-index.c
>> +++ b/diff-no-index.c
>> @@ -97,8 +97,39 @@ static int queue_diff(struct diff_options *o,
>> if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
>> return -1;
>>
>> -
Warn cloners if there is no LICENSE* or COPYING* file that makes
the license clear. This is a useful warning, because if there is
no license somewhere, then local copyright laws (which forbid many uses)
and terms of service apply - and the cloner may not be expecting that.
Many projects accidental
Yurii Shevtsov writes:
> diff --git a/diff-no-index.c b/diff-no-index.c
> index 265709b..9a3439a 100644
> --- a/diff-no-index.c
> +++ b/diff-no-index.c
> @@ -97,8 +97,39 @@ static int queue_diff(struct diff_options *o,
> if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
> retu
Torsten Bögershausen writes:
> On 2015-03-21 08.04, Torsten Bögershausen wrote:
>> Add missing %%, detected by the --chain-lint option
> Oh, early morning typo, should be
> Add missing &&, detected by the --chain-lint option
>
> (I'll re-run the testsuite with the --chain-lint in a minute,
> th
Jeff King writes:
> Running:
>
> git diff origin origin/jk/test-chain-lint |
> perl diff-blame.pl jk/test-chain-lint |
> grep EOF
>
> was fun. At least I am not the only one. :)
The parameter to diff-blame.pl should be origin, instead of
jk/test-chain-lint, I presume? You are grabbing the
Hi Paul,
On 2015-03-21 14:23, Paul Tan wrote:
> Thanks for the review, though I would like to work on the proposal now
> before the deadline passes :)
That makes sense.
> On Thu, Mar 19, 2015 at 1:52 AM, Matthieu Moy
> wrote:
>> Paul Tan writes:
>>
>>> Ideally, I think the solution is to
>>>
Hi Paul,
On 2015-03-21 15:00, Paul Tan wrote:
> Thanks for your suggestions, I agree with most of them :).
>
> On Wed, Mar 18, 2015 at 5:00 PM, Johannes Schindelin
> wrote:
>>> +static int parse_opt_rebase(const struct option *opt, const char
>>> *arg, int unset)
>>> +{
>>> + if (arg)
>>> +
On 03/19/2015 06:28 PM, Michael J Gruber wrote:
Sundararajan R venit, vidit, dixit 19.03.2015 12:22:
> Hi all,
>
> I am a Computer Science sophomore at IIT Kanpur. I am interested in
> contributing to git in GSoC 2015. I have been using git for the past one year
> and am pretty comfortable with
Hi,
as long as the original messages do not have a space between the word
and the ellipsis I would not do it differently in the translation.
For me the standard way of writing a repeating argument is the other way
around: ...
Command-line tools I've used (so far) always use this format.
I c
Hi,
Thanks for your suggestions, I agree with most of them :).
On Wed, Mar 18, 2015 at 5:00 PM, Johannes Schindelin
wrote:
>> +static int parse_opt_rebase(const struct option *opt, const char
>> *arg, int unset)
>> +{
>> + if (arg)
>> + *(int *)opt->value = parse_rebase(arg);
>>
Hi,
On Thu, Mar 19, 2015 at 6:26 AM, Junio C Hamano wrote:
> Paul Tan writes:
>
>> +/* Global vars since they are used often */
>> +static char *head_name;
>> +static const char *head_name_short;
>> +static unsigned char head_sha1[20];
>> +static int head_flags;
>> +
>> +enum rebase_type {
>> +
Hi,
Thanks for the review, though I would like to work on the proposal now
before the deadline passes :)
On Thu, Mar 19, 2015 at 1:52 AM, Matthieu Moy
wrote:
> Paul Tan writes:
>
>> Ideally, I think the solution is to
>> improve the test suite and make it as comprehensive as possible, but
>> wr
On Tue, Mar 10, 2015 at 09:56:42PM +1300, Jens Lehmann wrote:
> >Config like this is in a funny boat. We do not want it to cross
> >transport boundaries, so that if we run:
> >
> > git -c foo=bar clone /some/local/path
> >
> >the process serving /some/local/path should not see the "foo" option[1
Hi,
I think we should use it like this, as most open-source projects do.
Also we should use a space before the three dots as per
http://www.duden.de/sprachwissen/rechtschreibregeln/auslassungspunkte
Phillip
Signed-off-by: Phillip Sz
---
po/de.po | 190 +++-
git diff --no-index refuses to compare if args are directory and file,
instead of usual diff.
Now git diff --no-index compares args' target names and, if they are
equal, refuses to compare. If args differ, it transforms args and
diffs files, as usual diff does.
This is the least expensive way in t
Hi,
On Thu, Mar 19, 2015 at 9:35 PM, Matthieu Moy
wrote:
> Eric Sunshine writes:
>
>> I also tend to favor adding "failure" tests which are flipped to
>> "success" when appropriate, however, as this is an entirely new
>> feature, this approach may be unsuitable (and perhaps overkill).
>
> I can
Quoting Cody Taylor :
SZEDER Gábor writes:
Somehow I had a hard time making sense out of "when the current working
directory was not a parent of the untracked file". Perhaps "when the
untracked files are outside of the current working directory" would be
easier to grok?
That description do
On Fri, Mar 20, 2015 at 07:18:47PM -0400, Eric Sunshine wrote:
> Ironically, one of the broken here-doc &&-links you detected with
> --chain-lint and fixed in 4/25 was from a patch from me: 5a9830cb
> (t8001/t8002 (blame): add blame -L :funcname tests, 2013-07-17).
Heh. I was afraid to look at my
On Sat, Mar 21, 2015 at 08:19:20AM +0100, Torsten Bögershausen wrote:
> On 2015-03-21 08.04, Torsten Bögershausen wrote:
> > Add missing %%, detected by the --chain-lint option
> Oh, early morning typo, should be
> Add missing &&, detected by the --chain-lint option
>
> (I'll re-run the testsuite
On 2015-03-21 08.04, Torsten Bögershausen wrote:
> Add missing %%, detected by the --chain-lint option
Oh, early morning typo, should be
Add missing &&, detected by the --chain-lint option
(I'll re-run the testsuite with the --chain-lint in a minute,
thanks everybody for this nice feature)
--
T
Add missing %%, detected by the --chain-lint option
---
t/t6039-merge-ignorecase.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t6039-merge-ignorecase.sh b/t/t6039-merge-ignorecase.sh
index a977653..531850d 100755
--- a/t/t6039-merge-ignorecase.sh
+++ b/t/t6039-merge-igno
41 matches
Mail list logo
