From: Guillaume Pagès
Signed-off-by: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
t/t7512-status-help.sh | 28 ++--
wt-status.c| 5 -
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/t/t7512-status
From: Guillaume Pagès
Signed-off-by: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
wt-status.c | 32
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index eaed4fe..8c4b806 100644
--- a
From: Guillaume Pagès
Expand test coverage with one or more than two commands done
and with zero, one or more than two commands remaining.
Signed-off-by: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
t/t7512-status-help.sh | 87
estore the old behavior would make sense to
me at least. I guess it falls in the category "patches welcome".
--
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.
y, after using Git 2.3.0 for a merge, it seems now the conflict list
> was commented out by default.
Yes, this changed here:
https://github.com/git/git/commit/261f315bebfa9af2d09f20211960100ff06f87cb
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the
The only change is a bugfix: the SMTP mailer was not working with
Python 2.4.
Signed-off-by: Matthieu Moy
---
I just fixed the title line (1.1.0 -> 1.1.0).
contrib/hooks/multimail/CHANGES | 5 +
contrib/hooks/multimail/README | 2 +-
contrib/hooks/multimail/README.
The only change is a bugfix: the SMTP mailer was not working with
Python 2.4.
Signed-off-by: Matthieu Moy
---
contrib/hooks/multimail/CHANGES | 5 +
contrib/hooks/multimail/README | 2 +-
contrib/hooks/multimail/README.Git | 4 ++--
contrib/hooks/multimail
Matthieu Moy writes:
> Also, some revision-limiting options can reduce the count like
>
> git log --grep whatever
OK, --grep seems to work, but -S and -G do not:
$ ./bin-wrappers/git log -Sfoo --count
40012
$ ./bin-wrappers/git log -Sfoo --oneline | wc -l
925
$ ./bin-wrappers/git lo
patches are better: your PATCH 1 is a typical
preparation step, best reviewed alone in its own patch.
Splitting history into several patches is good, but each patch should
correspond to one logical step. Splitting code Vs doc Vs tests is
usually not the right way.
--
Matthieu Moy
http://www-ve
es work (I guess all the magic is already
there from "rev-list --count", and it was more or less a bug that "log
--count" was not using it properly), but you may want to explain better
what's going on in the commit message.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
le.
You can read Documentation/CodingGuidelines. Unsurprisingly, Git uses a
coding style similar to the Linux kernel, so anything you find about the
kernel essentially applies here too.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git&quo
n reduce the count like
git log --grep whatever
and you should check that you actually count the right number here.
(I don't know this part of the code enough, but I'm not sure you
actually deal with this properly)
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe fro
s this does a full graph traversal before
starting the output. A very important property of "git log" is that it
starts showing revisions immediately, even when ran on a very long
history (it shows the first screen immediately and continues working in
the background while the first
Lawrence Siebert writes:
> +void get_commit_count(struct rev_info * revs) {
Please, write "struct rev_info *revs" (stick * to revs).
> +void get_commit_count(struct rev_info * revs);
Likewise.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this lis
omes more general.
As long as it's an opt-in and that the documentation states the
limitations clearly enough, I think it makes sense to me to have this
upstream.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
Karthik Nayak writes:
> +/* Macros for checking --merged and --no-merged options */
> +#define _OPT_MERGED_NO_MERGED(option, filter, h)
> \
Detail: there's a weird large space before \. Is it an attempt to align
the \ with a non-standard tab-width?
You are reusing some code, but unlike the other patches you are not
marking the old code as duplicated. The "duplicate code" comment both
acts as a reminder for later, and as an indication for reviewers of
where the code comes from.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To
ION_CALLBACK, (s), (l), (v), N_("style"), (h), PARSE_OPT_OPTARG,
> parseopt_column_callback }
> +#define _OPT_CONTAINS_OR_WITH(name, variable, help, flag) \
Same weird space as the other patch.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe fro
mmon use it to talk about "point to" or "point
at". I find "point" clearer.
--
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
The --force option was modified in 356e91f (branch: allow -f with -m and
-d, 2014-12-08), but the documentation was not updated.
Signed-off-by: Matthieu Moy
---
Documentation/git-branch.txt | 4
1 file changed, 4 insertions(+)
diff --git a/Documentation/git-branch.txt b/Documentation/git
Now that we have proper documentation for --force's interaction with -d
and -m, we can avoid duplication and consider -M and -D as convenience
aliases for -m --force and -d --force.
Signed-off-by: Matthieu Moy
---
I'm not 100% sure it's a good idea (too many levels of in
place hardcoded "bad|good" by variables
- Documentation/bisect: revise overall content
- Documentation/bisect: move getting help section to the end
- bisect: correction of typo
I have nothing to add on the last ones, but they can cook in pu a bit
longer.
Do you expect anything from my
uot;Could not open file %s for reading",
git_path(fname));
+ die_errno("Could not open file %s for reading",
+ git_path("%s", fname));
Let me know if you want me to resend. In any case, I'm fine with your
"SQUASH ??" ver
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> Actually, we can do simpler: we still have the original line available,
>> ...
>>
>> I took this (modulo s/line.len[0]/line.buf[0]/, and s/rtrim/trim/ to be
>> robust to leading whitespace (not really i
ires exactly one pathspec
So activating --follow for all "git log" calls would prevent log from
being used with several pathspecs.
Or, do you have a preparation patch that allows --follow with multiple
pathspecs? ;-)
In any case, you have to test "git log -- path1 path2&quo
: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
Applied Junio's remark on C code to abbreviate sha1s and filter comments.
t/t7512-status-help.sh | 111
wt-status.c
From: Guillaume Pagès
Expand test coverage with one or more than two commands done
and with zero, one or more than two commands remaining.
Signed-off-by: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
No modification.
t/t7512-status-help.sh | 87
From: Guillaume Pagès
Signed-off-by: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
No modification.
t/t7512-status-help.sh | 28 ++--
wt-status.c| 5 -
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/t
From: Guillaume Pagès
Signed-off-by: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
No modification.
wt-status.c | 32
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index eaed4fe
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> +strbuf_trim(split[1]);
>> +if (!get_sha1(split[1]->buf, sha1)) {
>> +abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
>> +
I'm really happy with simply
> removing it. :)
OK, so Junio, you can just remove it.
Thanks,
--
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
From: Guillaume Pagès
Expand test coverage with one or more than two commands done
and with zero, one or more than two commands remaining.
Signed-off-by: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
Added --short where appropriate.
t/t7512-status-help.sh
From: Guillaume Pagès
Signed-off-by: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
No change since v4.
t/t7512-status-help.sh | 28 ++--
wt-status.c| 5 -
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git
: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
Added sha1-shortening code.
t/t7512-status-help.sh | 111 +
wt-status.c| 109
2 files changed, 220 insertions
From: Guillaume Pagès
Signed-off-by: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
No change since v4.
wt-status.c | 32
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index eaed4fe
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> This series makes "git status" provide an output like
>>
>> interactive rebase in progress; onto $ONTO
>> Last commands done (2 commands done):
>> pick $COMMIT2 two_commit
>>
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> diff --git a/t/t9000-addresses.sh b/t/t9000-addresses.sh
>> new file mode 100755
>> index 000..7223d03
>> --- /dev/null
>> +++ b/t/t9000-addresses.sh
>> @@ -0,0 +1,30 @@
>> +#!/bin/sh
>&
t; $ git rebase --continue
There's an alternative:
$ git rebase --edit-todo
# Make mistakes, save and quit
Your todo-list has the following issues:
- ...
Do you want to edit again (no aborts the rebase) [Y/n]?
There's a precedent with the 'e' command of "git add -p".
ny case, the most important is the initial edition. It covers
99.9% of use-cases. So, I'd say: if you have time to add the checks at
the other relevant places, good, but not doing it shouldn't block the
inclusion of the series.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubs
From: Guillaume Pagès
Expand test coverage with one or more than two commands done
and with zero, one or more than two commands remaining.
Signed-off-by: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
t/t7512-status-help.sh | 87
From: Guillaume Pagès
Signed-off-by: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
t/t7512-status-help.sh | 28 ++--
wt-status.c| 5 -
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/t/t7512-status
From: Guillaume Pagès
Signed-off-by: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
wt-status.c | 32
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index eaed4fe..8c4b806 100644
--- a
: Guillaume Pagès
Signed-off-by: Junio C Hamano
Signed-off-by: Matthieu Moy
---
t/t7512-status-help.sh | 111 +
wt-status.c| 63
2 files changed, 174 insertions(+)
diff --git a/t/t7512-status-help.sh b/t/t7512
This series makes "git status" provide an output like
interactive rebase in progress; onto $ONTO
Last commands done (2 commands done):
pick $COMMIT2 two_commit
exec exit 15
Next commands to do (2 remaining commands):
pick $COMMIT3 three_commit
pick $COMMIT4 four_commit
commentaries.
Signed-off-by: Remi Lespinet
Signed-off-by: Matthieu Moy
---
git-send-email.perl | 2 +-
perl/Git.pm | 67
t/t9000-addresses.sh | 30 +++
t/t9000/test.pl | 67 +++
From: Remi Lespinet
Move the creation of the scripts used in to-cmd and cc-cmd tests
in a setup test to make them available for later tests.
Signed-off-by: Remi Lespinet
Signed-off-by: Matthieu Moy
---
t/t9001-send-email.sh | 15 +--
1 file changed, 9 insertions(+), 6 deletions
From: Remi Lespinet
Do not consider quote inside a recipient name as character when
they are not escaped. This interprets:
"Jane" "Doe"
as:
"Jane Doe"
instead of:
"Jane\" \"Doe"
Signed-off-by: Remi Lespinet
Signed-off-by: Matthie
From: Remi Lespinet
Simplify code by creating a function which transform a list of strings
containing email addresses (separated by commas, comporting aliases)
into a clean list of valid email addresses.
Signed-off-by: Remi Lespinet
Signed-off-by: Matthieu Moy
---
git-send-email.perl | 22
specified by --cc-cmd and
--to-cmd. Example of script:
#!/bin/sh
echo alias1
echo alias2
Signed-off-by: Remi Lespinet
Signed-off-by: Matthieu Moy
---
git-send-email.perl | 2 ++
t/t9001-send-email.sh | 60 +++
2 files
h rejected every argument
with comma in --cc, --to and --bcc.
Signed-off-by: Mathieu Lienard--Mayor
Signed-off-by: Jorge Juan Garcia Garcia
Signed-off-by: Matthieu Moy
Signed-off-by: Remi Lespinet
Signed-off-by: Matthieu Moy
---
Documentation/git-send-email.txt | 12 +--
git-send-
when passing arguments like
" j...@example.com ", "\t j...@example.com " or
"j...@example.com".
- interprets aliases in string containing leading and trailing
whitespaces such as " alias" or "alias\t" like other options.
Signed-off-by: Re
From: Remi Lespinet
Group expressions in a single if statement. This avoid checking
multiple time if the variable $sender is defined.
Signed-off-by: Remi Lespinet
Signed-off-by: Matthieu Moy
---
git-send-email.perl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/git
Lespinet
Signed-off-by: Matthieu Moy
---
t/t9001-send-email.sh | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 1914439..fce081c 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -522,6 +522,12
This is an almost unmodified resend of Remi's patch here:
http://thread.gmane.org/gmane.comp.version-control.git/271844/focus=272499
The last patches had trouble reaching the list, hopefully this will be
easier to apply. Two minor changes:
* Removed the Helped-by: Remi trailer in a message sent
From: Remi Lespinet
Aliases were expanded before considering the From field of the
--compose option. This is inconsistent with other fields
(To, Cc, ...) which already support aliases.
Signed-off-by: Remi Lespinet
Signed-off-by: Matthieu Moy
---
git-send-email.perl | 4 ++--
1 file changed
y buggy. I manually deleted a tab (no line added, no
line removed) and it changed the number of lines in the header.
I see that you still managed to apply the series in pu, thanks and sorry
for the inconvenience.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: s
Signed-off-by: Matthieu Moy
---
git-rebase--interactive.sh | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index ec4a068..9041d15 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
Signed-off-by: Matthieu Moy
---
git-rebase--interactive.sh | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 9041d15..0117791 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase
Hi,
Here are a few fixes to squash into the commits of the series. Other
than that, the series looks good to me.
Junio: do you prefer a reroll or do you want to apply locally?
Matthieu Moy (3):
fixup! git rebase -i: add static check for commands and SHA-1
fixup! git rebase -i: warn about
Signed-off-by: Matthieu Moy
---
git-rebase--interactive.sh| 2 +-
t/t3404-rebase-interactive.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 0117791..8090d80 100644
--- a/git-rebase--interactive.sh
eps)" in the places where example output is shown.
* Properly markup code within the prose.
* Lots of wordsmithing.
Signed-off-by: Michael Haggerty
Signed-off-by: Matthieu Moy
---
Documentation/git-bisect.txt | 122 ---
1 file changed, 68 insertions(+),
uch
simpler.
Antoine Delaite (4):
bisect: correction of typo
bisect: replace hardcoded "bad|good" by variables
bisect: simplify the addition of new bisect terms
bisect: add the terms old/new
Matthieu Moy (5):
Documentation/bisect: move getting help section to the end
bisect: don
This is currently only a defensive check since the only terms are
bad/good and new/old, which pass it, but this is a preparation step for
accepting user-supplied terms.
Signed-off-by: Matthieu Moy
---
git-bisect.sh | 33 +
1 file changed, 33 insertions(+)
diff
As-is, the revisions that appear on the command-line are processed in
order. This would mix badly with code that changes the configuration
(e.g. change $TERM_GOOD and $TERM_BAD) while processing the options.
Signed-off-by: Matthieu Moy
---
git-bisect.sh | 30 +-
1
Signed-off-by: Matthieu Moy
---
Documentation/git-bisect.txt | 10 ++
git-bisect.sh| 39 ++-
t/t6030-bisect-porcelain.sh | 20
3 files changed, 68 insertions(+), 1 deletion(-)
diff --git a/Documentation/git
-off-by: Thomas Nguy
Signed-off-by: Huynh Khoi Nguyen Nguyen
Signed-off-by: Matthieu Moy
---
Documentation/git-bisect.txt | 58 ++--
bisect.c | 11 ++---
git-bisect.sh| 26 +---
rgument to "git bisect start".
* The implementation is relatively simple.
See previous discussions:
http://mid.gmane.org/1435337896-20709-3-git-send-email-matthieu@imag.fr
Signed-off-by: Matthieu Moy
---
Documentation/git-bisect.txt | 37 +++--
git-bisect.sh
quite few.
In git-bisect.sh:
check_and_set_terms
bisect_voc
Co-authored-by: Louis Stuber
Tweaked-by: Matthieu Moy
Signed-off-by: Antoine Delaite
Signed-off-by: Louis Stuber
Signed-off-by: Valentin Duperray
Signed-off-by: Franck Jonas
Signed-off-by: Lucien Kong
Signed-off-
Jonas
Signed-off-by: Lucien Kong
Signed-off-by: Thomas Nguy
Signed-off-by: Huynh Khoi Nguyen Nguyen
Signed-off-by: Matthieu Moy
---
bisect.c | 54 +-
git-bisect.sh | 57 +++--
2 files
From: Antoine Delaite
Signed-off-by: Antoine Delaite
Signed-off-by: Matthieu Moy
---
bisect.c| 2 +-
t/t6030-bisect-porcelain.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bisect.c b/bisect.c
index 03d5cd9..5b8357d 100644
--- a/bisect.c
+++ b
Signed-off-by: Matthieu Moy
---
Documentation/git-bisect.txt | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 4cb52a7..2bdc3b8 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git
Christian Couder writes:
> On Mon, Jun 29, 2015 at 11:32 AM, Matthieu Moy
> wrote:
>> bisect is all about finding the commit where a property has changed,
>
> That is your interpretation of this command. On the man page there is:
>
> git-bisect - Find by binar
ld be "the
term used for old is foo" or "mark foo as old". The longer version does
not have this problem.
--
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...@v
Christian Couder writes:
> On Mon, Jun 29, 2015 at 9:34 AM, Matthieu Moy
>
>> As a user, when I
>> discovered "git bisect", I was actually surprised that it expected one
>> particular order between good and bad. I would have expected to be able
>> to say &
he
> option name (like --mark-old or --term-old) and in the code too if it
> looks clearer.
I prefer "term" to "mark" because "mark" is both a verb and a noun, so
--mark-old=foo could mean both "mark foo as old" or "the name of the
marks f
ld/new, but the more I
read the code the more I agree with Christian actually: we still have
many more instances of good/bad in the code (e.g. functions
check_good_are_ancestors_of_bad, for_each_good_bisect_ref, ...), so
having just name_new/name_old would make the code very inconsistant.
It'
arg="$1"
case "$arg" in
@@ -98,6 +121,8 @@ bisect_start() {
--no-checkout)
mode=--no-checkout
shift ;;
+ --name-good|--name-old|--name-bad|--name-new)
+ shift 2 ;;
--*)
die "$(eval_gettext "unrecognised option: '\$arg'")" ;;
*)
--
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
h_ref_in_submodule(submodule, "refs/bisect/good", fn,
>> cb_data);
>> +return for_each_bisect_ref(submodule, fn, cb_data, "good");
>> }
>
> Likewise.
Indeed. Fixed.
--
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
Christian Couder writes:
> On Fri, Jun 26, 2015 at 6:58 PM, Matthieu Moy wrote:
>> From: Antoine Delaite
>>
>> Introduction of the git bisect terms command. The user can set his own
>> terms. It will work exactly like before. The terms must be set before the
>&g
From: Antoine Delaite
Introduction of the git bisect terms command. The user can set his own
terms. It will work exactly like before. The terms must be set before the
start.
Signed-off-by: Antoine Delaite
Signed-off-by: Louis Stuber
Signed-off-by: Matthieu Moy
---
Junio C Hamano writes
From: Antoine Delaite
We create a file BISECT_TERMS in the repository .git to be read during a
bisection. The fonctions to be changed if we add new terms are quite few.
In git-bisect.sh:
check_and_set_terms
bisect_voc
Co-authored-by: Louis Stuber
Tweaked-by: Matthieu Moy
eps)" in the places where example output is shown.
* Properly markup code within the prose.
* Lots of wordsmithing.
Signed-off-by: Michael Haggerty
Signed-off-by: Matthieu Moy
---
Just applied Junio's suggestion: 'no more revision left to inspec
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> And indeed "git bisect terms foo bar" errors out. I think the reason it
>> is this way is to allow
>>
>> $ git bisect terms foo bar
>> $ git bisect start
>>
>> But actually, we can
he reason it
is this way is to allow
$ git bisect terms foo bar
$ git bisect start
But actually, we can allow "git bisect terms" until BISECT_TERMS is
created, which is your intuition and makes more sense IMHO. I'll try to
do that.
--
Matthieu Moy
http://www-verimag.imag.fr/~
eps)" in the places where example output is shown.
* Properly markup code within the prose.
* Lots of wordsmithing.
Signed-off-by: Michael Haggerty
Signed-off-by: Matthieu Moy
---
Documentation/git-bisect.txt | 122 ---
1 file changed, 68 insertions(+),
From: Antoine Delaite
Introduction of the git bisect terms command. The user can set his own
terms. It will work exactly like before. The terms must be set before the
start.
Signed-off-by: Antoine Delaite
Signed-off-by: Louis Stuber
Signed-off-by: Matthieu Moy
---
Documentation/git
-off-by: Thomas Nguy
Signed-off-by: Huynh Khoi Nguyen Nguyen
Signed-off-by: Matthieu Moy
---
Documentation/git-bisect.txt | 58 ++--
bisect.c | 11 ++---
git-bisect.sh| 28 +
From: Antoine Delaite
Signed-off-by: Antoine Delaite
Signed-off-by: Matthieu Moy
---
bisect.c| 2 +-
t/t6030-bisect-porcelain.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bisect.c b/bisect.c
index 03d5cd9..5b8357d 100644
--- a/bisect.c
+++ b
Jonas
Signed-off-by: Lucien Kong
Signed-off-by: Thomas Nguy
Signed-off-by: Huynh Khoi Nguyen Nguyen
Signed-off-by: Matthieu Moy
---
bisect.c | 54 +-
git-bisect.sh | 57 +++--
2 files
From: Antoine Delaite
We create a file BISECT_TERMS in the repository .git to be read during a
bisection. The fonctions to be changed if we add new terms are quite
few.
In git-bisect.sh :
check_and_set_terms
bisect_voc
Co-authored-by: Louis Stuber
Tweaked-by: Matthieu Moy
oine Delaite (5):
bisect: correction of typo
bisect: replace hardcoded "bad|good" by variables
bisect: simplify the addition of new bisect terms
bisect: add the terms old/new
bisect: allow any terms set by user
Matthieu Moy (1):
Documentation/bisect: move getting help section to the
Signed-off-by: Matthieu Moy
---
Documentation/git-bisect.txt | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 4cb52a7..2bdc3b8 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git
ore/after are better, it's
still time to change it.
> Oh and I just noticed that `git bisect terms` is missing from the
> synopsis at the top of the man page.
Fixed.
--
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
Christian Couder writes:
> On Fri, Jun 26, 2015 at 4:58 PM, Michael Haggerty
> wrote:
>
>> The reference `refs/bisect/bad` will be left pointing at that commit.
>
> Yeah ok.
I took this one.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from thi
een left with the first bad kernel revision in "refs/bisect/bad".
>
> The original looks better to me in this regard.
I'm changing it to:
Eventually there will be no more revisions left to bisect, and the
command will print out a description of the first bad commit. The
reference `
'git bisect new', otherwise we will mark it as old.
> -At the end of the bisect session, the result will be the first new commit
> (e.g
> -the first one with the property).
I disagree with this one: it's in the example section, not bisect run.
The other explanations are nice
quot;
- check_term_format "$NAME_GOOD"
- printf '%s\n%s\n' "$NAME_BAD" "$NAME_GOOD" >"$GIT_DIR/BISECT_TERMS"
-}
-
-check_term_format () {
- term=$1
- git check-ref-format refs/bisect/"$term" ||
- die "$(eval
uot;$NAME_GOOD" >>"$GIT_DIR/BISECT_TERMS"
> fi
> }
I already had it in the last patch, but reworked the code to introduce
it earlier, and never >"$GIT_DIR/BISECT_TERMS" outside this function.
--
Matthieu Moy
http://www-verimag.imag.fr
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> +
>> +git bisect terms
>> +
>
> The mnemonic for "git bisect start bad good" is Bad comes before
> Goo
ption applied to the wrong repo.
But that's probably overkill.
--
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
701 - 800 of 2167 matches
Mail list logo
