Jeff King writes:
> On Tue, Feb 23, 2016 at 06:44:58PM +0100, Matthieu Moy wrote:
>
>> diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
>> index 1acd203..fdf5a79 100644
>> --- a/Documentation/diff-config.txt
>> +++ b/Documentation/diff-
ex 000..752c50e
+ --- /dev/null
+ +++ b/path1
+ @@ -0,0 +1,15 @@
+ +Line 1
+ +Line 2
+ +Line 3
+ +Line 4
+ +Line 5
+ +Line 6
+ +Line 7
+ +Line 8
+ +Line 9
+ +Line 10
+ +Line 11
+ +Line 12
+ +Line 13
+ +Line
The description was misleading, since "set to any boolean value" include
"set to false", and diff.renames=false does not enable basic detection,
but actually disables it. Also, document that diff.renames only affects
Porcelain.
Signed-off-by: Matthieu Moy
---
Documentation/
The underlying machinery is well-tested, but the configuration option
itself was tested only in t3400-rebase.sh.
Signed-off-by: Matthieu Moy
---
t/t4001-diff-rename.sh | 61 +-
1 file changed, 60 insertions(+), 1 deletion(-)
diff --git a/t/t4001
Signed-off-by: Matthieu Moy
---
t/t4001-diff-rename.sh | 66 ++
1 file changed, 35 insertions(+), 31 deletions(-)
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 2f327b7..06b8828 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001
This is currently a wrapper around init_grep_defaults(), but will allow
adding more initialization in further patches.
Signed-off-by: Matthieu Moy
---
builtin/log.c | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index 0d738d6
mands, hence well-written
scripts will not be affected.
Signed-off-by: Matthieu Moy
---
Documentation/diff-config.txt | 2 +-
builtin/commit.c | 1 +
builtin/diff.c| 1 +
builtin/log.c | 1 +
builtin/merge.c | 1 +
diff.c
posed to the
warning through this old version.
Eventually, versions of Git without the warning will be deployed enough
and tutorials will not need to advise setting push.default anymore.
Signed-off-by: Matthieu Moy
---
builtin/push.c | 34 --
1 file changed, 34 deleti
Junio and Peff both lean towards removing the message completely, and
I think I'm convinced. We would have to do this in the future anyway.
While we're there, improve the manual for git push as suggested by
Philip Oakley.
Matthieu Moy (2):
push: remove "push.default is unset&q
y adding a short summary of
what 'push.default=simple' does, early in the page.
Signed-off-by: Matthieu Moy
---
Documentation/git-push.txt | 7 +++
1 file changed, 7 insertions(+)
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 32482ce..a992793 100644
---
\
> + -Wunused \
> + -Wvla
> +endif
> +
I guess you have tab-width=4. This portion looks ugly with tab-width=8.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git&
ying the same changes with git-fast-import.
Also, not touching the worktree during rebase would have the advantage
that if the final result doesn't change a file, we wouldn't need to
touch this file at all, hence the next "make" (or whatever
timestamp-using build system the user ru
Felipe Gonçalves Assis writes:
> Matthieu Moy imag.fr> writes:
>
>> diff.renames::
>> -Tells Git to detect renames. If set to any boolean value, it
>> -will enable basic rename detection. If set to "copies" or
>> -"copy", it
The description was misleading, since "set to any boolean value" include
"set to false", and diff.renames=false does not enable basic detection,
but actually disables it. Also, document that diff.renames only affects
Porcelain.
Signed-off-by: Matthieu Moy
---
Oops, trivial
s = 0;
>
> + git_config_get_bool("commit.verbose", &verbose);
Doesn't this override any value that --verbose or --no-verbose may have
set before?
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
git pull --rebase will understand --no-autostash command
> line flag.
> This flag will override "rebase.autostash" configuration(if set)
Here and elsewhere: space before "(".
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send t
nclear: my "you may" here was really meant to be "you
may", not "you should" ;-).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
n git-multimail:
$ git cat-file -p c3c1cc25b27d448e9ef67b265a11be8735ff2df4
tree c341dd60c4b639eac1d6dcc3caffb5d7201c2245
parent b312e3f90dfef73ba028881694b09affdf6b
parent 842ac6e867885af041499723dc46f2197705204c
author Matthieu Moy 1441031540 +0200
committer Matthieu Moy 1441031540 +0200
Merge r
istory where that
> commit is the root commit--and that is why it is shown, I think.
>
> What does it do if you say "git -c log.showRoot=false log -p"?
I get the commit without the patch:
commit c3c1cc25b27d448e9ef67b265a11be8735ff2df4 (grafted)
Author: Matthieu Moy
Date:
The link to Documentation/git-commandname.txt was obviously broken.
Remove the link and make it clear that it is not a literal path name by
using *italics* in makdown.
Signed-off-by: Matthieu Moy
---
Sorry for the overeager change in the previous patch :-(.
README.md | 7 +++
1 file
;test" commands instead, because
the use of "-a/-o" is often error-prone. E.g.
test -n "$x" -a "$a" = "$b"
is buggy and breaks when $x is "=", but
test -n "$x" && test "$a" = "$b"
does not have such a problem.
Regarding portability, test -a/-o is not strictly POSIX (it's in the XSI
extension), but AFAIK implemented by all reasonable shells.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
ptions for some
> commonly used command-line options".
There's already work in progress on this project, see the mailing list
the last few days.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body
. In that, I can take up
> the `builtin/receive-pack.c` file. Would that be okay?
I didn't see anything going on for this one, but you may want to
double-check with the ml's archives.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send t
ld work, but still sometimes show the error:
error: Your local changes to the following files would be overwritten by
merge:
The situation is different for command-line options and for config
variables: the config variable wasn't explicitly specified for each run
of "git pull"
his patch modifies the message in two ways: first, it considers that
"another process is running" is the norm, not the exception, and it
explicitly hints the user to look at text editors.
The message is 2 lines longer, but this is not a problem since
experienced users do not see the mes
Moritz Neeb writes:
> On 02/28/2016 09:11 PM, Matthieu Moy wrote:
>
>> This patch was written after seen one more time a student panicked
>> because he had a "git commit" backgrounded.
>
> I think git commit is almost the only case where this would happen.
Righ
he mailing
> list?
On this list, it is indeed often more efficient to say "here's what I'm
done. Any comments?" than "here's what I'm about to do".
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
x27;s what I'm
>> done. Any comments?" than "here's what I'm about to do".
>>
> I'm really sorry, I'm not very familiar with mailing list etiquettes.
> I'll keep that in mind :)
No problem. It's OK to say what you do beforehan
As a reminder, we post all the GSoC related stuff here:
http://git.github.io/SoC-2016-Ideas/
http://git.github.io/SoC-2016-Microprojects/
Cheers!
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a me
Signed-off-by: Matthieu Moy
---
lockfile.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lockfile.c b/lockfile.c
index 80d056d..62583d1 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -149,13 +149,13 @@ static int lock_file_timeout(struct lock_file *lk, const
char *path
e often.
Helped-by: Moritz Neeb
Signed-off-by: Matthieu Moy
---
lockfile.c | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lockfile.c b/lockfile.c
index 62583d1..9268cdf 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -150,9 +150,11 @@ void unable_to_lock_message(const
("You must specify a directory."),
> receive_pack_usage, options);
Before that, the loop was ensuring that service_dir was assigned once
and only once, and now you check that you have one non-option arg and
assign it unconditionally:
> + service_dir = argv[0];
... so isn't t
ns something.
> Another thing I'd like to ask is when I prepare the next patch, should
> it be sent as reply in this thread, or as a new thread?
No strict rule on that, but I usually use --in-reply-to on the root of
the thread for previous iteration. If you don't, include a link (e.g
"Sidhant Sharma [:tk]" writes:
> Make receive-pack use the parse_options API,
> bringing it more in line with send-pack and push.
Thanks. This version looks good to me.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "un
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> "Sidhant Sharma [:tk]" writes:
>>
>>> Make receive-pack use the parse_options API,
>>> bringing it more in line with send-pack and push.
>>
>> Thanks. This version looks good to me.
>
ething
like
case "$(head -n 1 "$1")" in
"fixup! "*|"squash! "*)
: do nothing
;;
*)
launch_real_tests
esac
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
se of a
> build matrix several VMs). In our case, including queueing this can
> take up to 1h.
Ah, indeed. Booting a VM just to execute "if fixup, do nothing" is a bit
overkill ;-).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the l
commit messages).
AFAIK, it's not possible currently but shouldn't be hard to implement.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
u lazy devs, why don't you code that for me?" ;-).
But in general, people get more interested when a proposal has a patch
attached.
I've added the idea here:
https://git.wiki.kernel.org/index.php/SmallProjectsIdeas
(except I already changed my mind in the syntax)
I may get some students to work
gt; + if (opt_autostash == 0)
> + die(_("--no-autostash option is only valid with
> --rebase."));
> + else if (opt_autostash == 1)
The else is not needed since the other branch dies.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy
+ test -s err &&
> + test_must_be_empty out)
> +'
> +
> +test_expect_success 'git pull --rebase --no-autostash' '
> + mkdir clonedrbnas &&
> + (cd clonedrbnas && git init &&
> + git pull --rebase --no-autostas
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> I may get some students to work on this in May, or do it myself one day.
>
> I envy teachers who can say "hey, code this for me if you want
> course credits".
Well, in practice it's often still more work
Eric Sunshine writes:
> It would be reasonable to combine the two cases into one:
>
> if (opt_autostash != -1)
> die(_("--[no]-autostash option is only valid with --rebase."));
Nit (in case Mehul copy/paste this): that would be --[no-], not --[no]-.
--
M
Mehul Jain writes:
> On Thu, Mar 3, 2016 at 10:54 PM, Matthieu Moy
> wrote:
>> Mehul Jain writes:
>>> + else {
>>> + /* If --[no-]autostash option is called without --rebase */
>>> + if (opt_autostash == 0)
>>> +
. Also, this is not really before starting "pull --rebase" but
after the user calls "pull" and before the actual rebase starst. I'd
write something like this:
Before starting rebase, stash local modifications away (see
linkgit:git-stash.txt[1]) if needed, and apply the stash when
done
(I added "if needed" which makes sense technically since we don't create
an empty stash if not needed)
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
now :-\.
> Most of the resources are just pointers to our GSoC stuff. This does
> mean I've effectively signed our mentors up to participate in this
> program. I hope that's OK,
Not sure whether I was supposed to receive something, but I did not.
--
Matthieu Moy
http://www-verima
i.e. git_config_get_bool before calling parse_option.
You dropped the "RFC" tag from the subject line, but your patch still
lacks a test. It cannot be called final without.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscrib
0 (or NULL).
> http://thread.gmane.org/gmane.comp.version-control.git/287709/focus=287726
What Junio says is that you don't need to write
static int config_autostash = 0;
since it is equivalent to
static int config_autostash;
But there's nothing wrong with having a static variable defaulting
eractive_rebase=implied
Perfect, thanks for checking (which I couldn't do myself from a phone).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
ogle doc that can be edited,
commented, ... and the same link can be posted to the list.
To potential mentors: please log in on the GSoC website and keep an eye
on the list of proposals. Note that unlike the old system, comments we
add there are only for mentors & admins, not seen by stud
hat
mentors accept to commit to mentoring the project. "I'll do like Paul
Tan" is by far not sufficient.
I'm actually not sure the same plan applies here: there's already a C
helper for bisect, so an incremental rewrite may be more appropriate:
port functions one by one from shell t
ncing argument to support the claim that you
are able to comptlete the project. I think this includes re-explaining
in your own words how you understand bisect in its current form.
> And most importantly, Would anyone like to mentor me for this project?
Christian is a potential mentor and he knows
be used to display the commit message (with
a 4-space prefix) and the diff (with a 1-char +/- prefix). So the
offsets in these two places would need to be different, and I don't
think we can change that on the fly.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this l
te a new function, you are
removing pieces of shell and adding pieces of C as replacement. If the
testsuite is complete, it covers the shell implementation today and will
cover the C implementation when it replaces the shell.
The existing tests should be usable without modification.
--
Matthi
GSoC 2016 is over, I believe there will stilll be further work required
> for improving and perfecting the 'ggit' interface before it can be merged with
> the main distribution.
I think having the wrapper merged in the main distribution before the
end of the GSoC must be a goal of the project. Sure, it can be improved
later, but code not merged at the end of a GSoC usually rests for months
or years, and is often lost forever.
> I would like to continue my work on this project and contribute to Git
> in general as well.
Cheers,
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
re sincere when they said
they would continue, but then they realize that days have only 24 hours
and life is short ;-).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
Also, having an alternative UI sometimes serves as an excuse not to
improve git's UI itself. If git's behavior is dangerous, ggit can warn
about it. If git's behavior is broken, then we should repair it.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this
Sidhant Sharma writes:
> On Monday 21 March 2016 12:22 AM, Matthieu Moy wrote:
>
>> Note that it implies writting an almost full-blown option parser to
>> recognize commands like
>>
>> ggit --work-tree git --namespace reset --git-dir --hard git log
>>
>
ing branch without
> config' '
> test_i18ncmp expect actual
> '
>
> +test_expect_success 'test deleting "-" deletes previous branch' '
> + git checkout -b prev &&
> + test_commit prev &&
> +
fore starting rebase, stash local modifications away (see
> + linkgit:git-stash.txt[1]) if needed, and apply the stash when
Please drop the ".txt" after linkgit.
Thanks,
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubs
Signed-off-by: Matthieu Moy
---
Documentation/githooks.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index d954bf6..90a59d1 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -367,7 +367,7
ugh).
A rule that is usually applied for messages with Git:
* If the message is triggered by a user-error, then it's OK to have a
long and possibly scary message: advanced users are not supposed to
see it.
* If the message is seen by normal users in daily usage, then
- we try to keep i
mentors) don't see it before the deadline, but you can re-submit until
then. If I were you, I'd submit a PDF right now (actually, I'd have
done that a few days ago ;-) ). You don't want to miss a GSoC just
because your internet connection or your computer is down tomor
iguration variable (see linkgit:git-config[1]).
> ++
> +This option is only valid when "--rebase" is used.
This does not have to be added to this series (I don't want to break
everything at v10 ...), but I think it would be nice to allow "git pull
--autostash" even wi
nt on your code.
2) extra-work required by reviewers.
You want to send series early because of 1) (then you can work on the
next series while waiting for reviews on the current one), and you need
to prioritize 2) over working on the next series to minimize in-flight
topics.
--
Matthieu Moy
h
Mehul Jain writes:
> On Fri, Mar 25, 2016 at 2:35 PM, Matthieu Moy
> wrote:
>> Mehul Jain writes:
>>
>>> +--autostash::
>>> +--no-autostash::
>>> + Before starting rebase, stash local modifications away (see
>>> + linkgit:git-stash[
e replacing long sequences of commits with "..." or
so. That is hard to get right.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
27;m not done with
argument list".
Also, no space between delete_branch_advice and '('.
> +test_expect_success 'test deleting "-" deletes previous branch' '
> + git checkout -b prev &&
> + test_commit prev &&
> +
The file was renamed in 4ad21f5 (README: use markdown syntax,
2016-02-25), but that commit forgot to update git.spec.in.
Reported-by: Ron Isaacson
Signed-off-by: Matthieu Moy
---
git.spec.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git.spec.in b/git.spec.in
index
t some people (sysadmins ;-) ) have the bad habit of writting $@, $*
or "$*" in wrapper scripts and it breaks when you call them with spaces
so it's better to take good habits IHMO.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line &quo
TTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
>> ---keyword=_ --keyword=N_ --keyword="Q_:1,2"
>> +--keyword=_ --keyword=N_ --keyword=P_ --keyword="Q_:1,2"
I'm a bit reluctant to modifying the Makefile for something not really
bui
;
}
test_autostash ok --rebase rebase.autostash=true
test_autostash ok '--rebase --autostash' rebase.autostash=true
test_autostash ok '--rebase --autostash' rebase.autostash=false
test_autostash ok '--rebase --autostash' rebase.autostash=
test_autostash err '--rebase
Mehul Jain writes:
> On Mon, Apr 4, 2016 at 10:22 PM, Matthieu Moy
> wrote:
>> I think it would be much simpler to drop the loop, and write instead
>> something like (untested):
>
> I tested it (with few minor changes), and worked fine.
>
> test_autost
p;
test "$(cat new_file)" = dirty &&
test "$(cat file)" = "modified again"
}
rebase_test_err () {
test_must_fail git pull $1 . copy 2>err &&
test_i18ngrep "uncommitted changes." err
}
I'm also OK wit
lter
out lines from the wrong author. That would be possible, but relatively
hard to implement and painfully slow. Which probably explains why no one
implemented it yet ...
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the
lly:
$ echo | git interpret-trailers
Reviewed-by: Michael S. Tsirkin at the end)
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
;t' is a sensible choice for that single letter option,
> though).
If 'am' has -t == --trailer, I think it makes sense to have the same
shortcut in interpret-trailers for consistency.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the l
interpret-trailers.c | 9 +++--
> trailer.c| 10 +++---
> 3 files changed, 15 insertions(+), 6 deletions(-)
You'd definitely need some tests and documentation if you introduce a
new option.
No time for a real review, sorry.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To
"Michael S. Tsirkin" writes:
> - strbuf_addbuf(&msg, &mi.log_message);
> +
> + if (strbuf_read_file(&log_msg, am_path(state, "msg"), 0) < 0) {
> + die_errno(_("could not read '%s'"), am_path(state, "msg&
hat.
If the goal is to test the waters, then adding an RFC tag to your
subject helps starting more constructive discussion and avoid alarm
bells ringing like Johannes' reaction. Having the content of this
paragraph as a comment below the --- part of the patch also helps.
--
Matthieu Moy
h
ert --squash deadbeef
In most cases, I find it simpler to just start a rebase -i and drop the
commit from rebase's todo-list.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
t;run", with values 1/true/always
= default = current behavior, or "auto" = "apply when asked from the
command-line". I'm wondering whether other values could make sense (not
to implement it right now, but to keep the design open to further
extensions): perhaps apply=i
ase).
new_submodule_commits is a 1-bit bitfield, and you don't want to assign
anything other than 1 or 0 (or you'll get modulo 2^n semantics, with
n==1).
So the old code is correct and your patch would introduce a bug.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscri
t out" makes me think of "git
notes". It may make sense to teach "git rebase -i" to look for notes in
rebased commits and append them to the commit message when applying.
Just an idea, not necessarily a good one ;-).
> Does it sounds interesting if I teach
> git ack
k of
git.git on GitHub to get the same benefit when posting emails directly
to the list.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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://
Stefan Beller writes:
> On Tue, Apr 12, 2016 at 12:23 AM, Matthieu Moy
> wrote:
>> Stefan Beller writes:
>>
>>> Hi Greg,
>>>
>>> Thanks for your talk at the Git Merge 2016!
>>> The Git community uses the same workflow as the kernel. So we
Junio C Hamano writes:
> Matthieu Moy writes:
>
> True, presumably the Travis integration already solves that part, so
> I suspect it is just the matter of setting up:
>
> - a fork of git.git and have Travis monitor any and all new
>branches;
>
> - a bot
sion-control.git/289700/focus=289869
http://thread.gmane.org/gmane.comp.version-control.git/289299/focus=289407
...
(this one is for GSoC, but it's very similar to Outreachy)
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git
Lars Schneider writes:
>> On 13 Apr 2016, at 07:43, Matthieu Moy wrote:
>>
>> Junio C Hamano writes:
>>
>>> Matthieu Moy writes:
>>>
>>> True, presumably the Travis integration already solves that part, so
>>> I suspect it is jus
ave the
information to resolve ambiguities.
We could save a map (short -> long) before poping the editor and use
this map in priority when normalizing the todo-list to use long sha1s,
but we currently don't.
But I'm tempted to say that you just went very, very unlucky, and it's
not w
gt; up the SubmittingPatches document into more than one, i.e.
> the MUA hints and the Github-Travis hints could become their own documents,
> and the SubmittingPatches could just contain the bare essentials.
I didn't see it on-list, but there's a PR doing that here:
h
1, i.e.
right after you closed your editor and befor starting anything else.
> That said, that would be less likely to happen if disambiguation was
> also checking checking the object type. Collisions between commits are
> less likely than between objects of different types.
Right.
g for a long time in a
repo outside Linus' linux.git, and got merged only recently.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
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.html
Olaf Hering writes:
> On Thu, Apr 21, Matthieu Moy wrote:
>
>> My guess is that this commit has been sitting for a long time in a
>> repo outside Linus' linux.git, and got merged only recently.
>
> Thats what it looks like. And thats what I'm complaining about
of backward compatibility for plumbing).
This relies on the dates recorded in the commits, which may be wrong
(typically if someone commited on a machine with an incorrect clock).
But hopefully not.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line &quo
ariable to set an option by default is good when the user
wants to set it and forget about it. In this case, you clearly can't
"forget about it", as running "git add" and "git add -p" correspond to
really different use-cases.
--
Matthieu Moy
http://www-verimag.imag.
if not self.smtp.has_extn("starttls"):
> +msg = "STARTTLS extension not supported by server"
> +raise smtplib.SMTPException(msg)
> +(resp, reply) = self.smtp.docmd("STARTTLS")
quot; &&
> + make --quiet doc
> + fi;
Nit: useless ;
I think it makes sense to do some lightweight checks after "make doc",
rather than just check the return code. For example, check that a few
generated files exist and are non-empty, like
test -s Documentat
Ævar Arnfjörð Bjarmason writes:
> I couldn't find a way to report git-scm.org-specific bugs
You can do so here:
https://github.com/git/git-scm.com/issues
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git"
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> larsxschnei...@gmail.com writes:
>>
>>> + if [[ "$TRAVIS_OS_NAME" = linux ]] && [[ "$CC" = gcc ]];
>>
>> [[ is a bashism, and doesn't bring anything here compared t
701 - 800 of 2167 matches
Mail list logo
