Signed-off-by: Ville Skyttä
---
Documentation/SubmittingPatches | 4 ++--
Documentation/config.txt | 2 +-
Documentation/git-bisect-lk2009.txt | 2 +-
Documentation/git-imap-send.txt | 4 ++--
Documentation/git-notes.txt
In the original implementation of the move detection logic the choice for
ignoring white space changes is the same for the move detection as it is
for the regular diff. Some cases came up where different treatment would
have been nice.
Allow the user to specify that white space should be ignored
There is no need to forward-declare these functions, as they are used
after their implementation only.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
xdiff/xdiffi.c | 17 -
1 file changed, 17 deletions(-)
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 0de1ef
This moves the part of code that checks if we're still in a block
into its own function. We'll need a different approach on advancing
the blocks in a later patch, so having it as a separate function will
prove useful.
While at it rename the variable `p` to `prev` to indicate that it refers
to the
The new "blocks" mode provides a middle ground between plain and zebra.
It is as intuitive (few colors) as plain, but still has the requirement
for a minimum of lines/characters to count a block as moved.
Suggested-by: Ævar Arnfjörð Bjarmason
(https://public-inbox.org/git/87o9j0uljo@evledraa
This makes the follow up patch easier.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
diff.c | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/diff.c b/diff.c
index 112e6af2cc8..2a1a21d3b7a 100644
--- a/diff.c
+++ b/diff.c
@@ -707,11 +707,15 @@
The option of --color-moved has proven to be useful as observed on the
mailing list. However when refactoring sometimes the indentation changes,
for example when partitioning a functions into smaller helper functions
the code usually mostly moved around except for a decrease in indentation.
To jus
This replaces sb/diff-color-move-more and is also available at
https://github.com/stefanbeller/git/tree/color-moved-only
It applies on v2.18.0.
Move detection is a nice feature, but doesn't work well with indentation
or dedentation. Make it possible to indent/dedent code and still have
it recogniz
These flags were there since the beginning (3443546f6e (Use a *real*
built-in diff generator, 2006-03-24), but were never used. Remove them.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
xdiff/xdiff.h | 8
1 file changed, 8 deletions(-)
diff --git a/xdiff/xdiff.h b/xd
When we initialize the hashmap, we give it a pointer to the
diff_options, which it then passes along to each call of the
hashmap_cmp_fn function. There's no need to pass it a second time as
the "keydata" parameter, and our comparison functions never look at
keydata.
This was a mistake left over fr
Hi,
I have a setup with tree of 250+ git repositories. Every now and then, I
want to clean everything except for files generated by my IDE. So for all
the git repos, I run git clean -dfx --exclude . What happens
then is, if a sub-git as that file, all its files are deleted (except for
that ide f
On 6/21/2018 8:33 PM, Derrick Stolee wrote:
On 6/21/2018 7:06 PM, Jonathan Tan wrote:
diff --git a/commit.c b/commit.c
index 0030e79940..38c12b002f 100644
--- a/commit.c
+++ b/commit.c
@@ -317,7 +317,7 @@ struct tree *get_commit_tree(const struct
commit *commit)
if (commit->graph_pos
[My email client says I sent this two days ago, but it doesn't appear on
public-inbox.org, so somehow it didn't land on-list (Stefan pointed out
that the message was in HTML). Repeating the message now so I can
reference it in another discussion. -Stolee]
On 6/19/2018 6:07 PM, Stefan Beller wr
On 6/21/2018 7:06 PM, Jonathan Tan wrote:
diff --git a/commit.c b/commit.c
index 0030e79940..38c12b002f 100644
--- a/commit.c
+++ b/commit.c
@@ -317,7 +317,7 @@ struct tree *get_commit_tree(const struct commit *commit)
if (commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
BUG(
On 6/21/2018 6:39 PM, Jonathan Tan wrote:
Both this and the previous patch look good to me;
you seem to have better (stricter) checking for
missing includes/forward declarations, am I missing
a compile option? (I have DEVELOPER=1 in config.mak)
Thanks. No I don't - I discovered that these were m
> > diff --git a/commit.c b/commit.c
> > index 0030e79940..38c12b002f 100644
> > --- a/commit.c
> > +++ b/commit.c
> > @@ -317,7 +317,7 @@ struct tree *get_commit_tree(const struct commit
> > *commit)
> > if (commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
> > BUG("commit has N
> diff --git a/commit.c b/commit.c
> index 0030e79940..38c12b002f 100644
> --- a/commit.c
> +++ b/commit.c
> @@ -317,7 +317,7 @@ struct tree *get_commit_tree(const struct commit *commit)
> if (commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
> BUG("commit has NULL tree, but was n
> Both this and the previous patch look good to me;
> you seem to have better (stricter) checking for
> missing includes/forward declarations, am I missing
> a compile option? (I have DEVELOPER=1 in config.mak)
Thanks. No I don't - I discovered that these were missing as I was
including these head
On Mon, Jun 11, 2018 at 11:19:10PM +0200, Ævar Arnfjörð Bjarmason wrote:
> This is a great summary. Thanks.
>
> In case it's not apparent from what follows, I have a bias towards
> SHA-256. Reasons for that, to summarize some of the discussion the last
> time around[1], and to add more details:
T
Alban Gruin writes:
> This adds a new function, run_command_silent_on_success(), to
> redirect the stdout and stderr of a command to a strbuf, and then to run
> that command. This strbuf is printed only if the command fails. It is
> functionnaly similar to output() from git-rebase.sh.
>
> run_git
On Thu, Jun 21, 2018 at 07:53:02AM -0400, Jeff King wrote:
> On Wed, Jun 20, 2018 at 03:05:30PM -0500, Taylor Blau wrote:
>
> > Hi,
> >
> > Here is a re-roll of my series to add --column to 'git-grep(1)'. Since
> > last time, not much has changed other than the following:
> >
> > - Fix a typo whe
Hi Jonathan,
On Thu, Jun 21, 2018 at 2:29 PM Jonathan Tan wrote:
>
> Signed-off-by: Jonathan Tan
Both this and the previous patch look good to me;
you seem to have better (stricter) checking for
missing includes/forward declarations, am I missing
a compile option? (I have DEVELOPER=1 in config.m
On Wed, Jun 20, 2018 at 1:17 PM Jameson Miller wrote:
>
> Instead of searching all memory blocks for available space to fulfill
> a memory request, only search the head block. If the head block does
> not have space, assume that previous block would most likely not be
> able to fulfill request eit
Instead of storing commit graphs in static variables, store them in
struct object_store. There are no changes to the signatures of existing
functions - they all still only support the_repository, and support for
other instances of struct repository will be added in a subsequent
commit.
Signed-off-
Add a struct repository argument to the functions in commit-graph.h that
read the commit graph. (This commit does not affect functions that write
commit graphs.)
Because the commit graph functions can now read the commit graph of any
repository, the global variable core_commit_graph has been remov
Signed-off-by: Jonathan Tan
---
commit-graph.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/commit-graph.h b/commit-graph.h
index 260a468e73..7004dfdca9 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -3,6 +3,8 @@
#include "git-compat-util.h"
+struct commit;
+
char *get_commit_
Signed-off-by: Jonathan Tan
---
builtin/commit-graph.c | 2 ++
commit-graph.c | 24 ++--
commit-graph.h | 2 ++
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 37420ae0fd..9c2d55221c 10064
Signed-off-by: Jonathan Tan
---
object-store.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/object-store.h b/object-store.h
index d683112fd7..f0b77146e4 100644
--- a/object-store.h
+++ b/object-store.h
@@ -2,6 +2,9 @@
#define OBJECT_STORE_H
#include "oidmap.h"
+#include "list.h"
+#i
This continues the object store refactoring effort by making commit
graphs of any repository be readable, not just the commit graph of
the_repository.
This enables the conversion of other functions in the future, functions
like parse_commit (which first tries to parse from the commit graph).
I di
Hi Junio,
On Thu, Jun 21, 2018 at 1:44 PM, Junio C Hamano wrote:
> Elijah Newren writes:
>
>> +BEHAVIORAL INCONSISTENCIES
>> +--
>> +
>> + * --no-ff vs. --force-rebase
>
> Do we want to `--quote` these?
Ah, good point.
>> + * empty commits:
>> +
>> +am-based rebase
On Thu, Jun 21, 2018 at 1:46 PM, Junio C Hamano wrote:
> Elijah Newren writes:
>
>> rebase was taught the --force-rebase option in commit b2f82e05de ("Teach
>> rebase to rebase even if upstream is up to date", 2009-02-13). This flag
>> worked for the am and merge backends, but wasn't a valid opt
On Thu, Jun 21, 2018 at 4:05 PM Junio C Hamano wrote:
> Elijah Newren writes:
> > + # This is indented with HT SP HT.
> > + echo " foo();" >>foo &&
>
> I often wonder, whenever I see a need for a comment like this, if
> saying the same thing in code to make it visible is cleaner
> --- a/cache.h
> +++ b/cache.h
> @@ -339,6 +339,29 @@ extern void remove_name_hash(struct index_state *istate,
> struct cache_entry *ce)
> extern void free_name_hash(struct index_state *istate);
>
>
> +/* Cache entry creation and cleanup */
> +
> +/*
> + * Create cache_entry intended for use in
Stefan Beller writes:
> When an error occurs in updating the working tree of a submodule in
> submodule_move_head, tell the user which submodule the error occurred in.
>
> The call to read-tree contains a super-prefix, such that the read-tree
> will correctly report any path related issues, but s
Brandon Williams writes:
> Add a link to gitsubmodules(7) under the `submodule.active` entry in
> git-config(1).
>
> Signed-off-by: Brandon Williams
> ---
> Documentation/config.txt | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
Thanks.
>
> diff --git a/Documentation/config.txt
Jeff King writes:
> I wasn't sure where we landed in the discussion on "how much crazy stuff
> to support". But AFAIK, the code in this iteration handles every crazy
> case already except this one. If we're going to care about OR, maybe we
> should just cover all cases.
I think I was the only on
Elijah Newren writes:
> rebase was taught the --force-rebase option in commit b2f82e05de ("Teach
> rebase to rebase even if upstream is up to date", 2009-02-13). This flag
> worked for the am and merge backends, but wasn't a valid option for the
> interactive backend.
> ...
> INCOMPATIBLE OPTIO
Elijah Newren writes:
> +BEHAVIORAL INCONSISTENCIES
> +--
> +
> + * --no-ff vs. --force-rebase
Do we want to `--quote` these?
> +These options are actually identical, though their description
> +leads people to believe they might not be.
Perhaps the same bandwi
On Thu, Jun 21, 2018 at 1:29 PM, Junio C Hamano wrote:
> Elijah Newren writes:
>
>> +if test -n "$git_am_opt"; then
>> + incompatible_opts=$(echo "$git_am_opt" | sed -e 's/ -q//')
>
> This is probably just a taste-thing, but I'd probably prefer to see
> the "sed" filter out "-q" alone, and ma
On Thu, Jun 21, 2018 at 1:04 PM, Junio C Hamano wrote:
> Elijah Newren writes:
>
>> + git checkout B &&
>> + # This is indented with HT SP HT.
>> + echo " foo();" >>foo &&
>
> I often wonder, whenever I see a need for a comment like this, if
> saying the same thing in code to
On Thu, Jun 21, 2018 at 12:58 PM, Junio C Hamano wrote:
> Elijah Newren writes:
>
>> signoff is not specific to the am-backend. Also, re-order a few options
>> to make like things (e.g. strategy and strategy-option) be near each
>> other.
>> ---
>> git-rebase.sh | 6 +++---
>> 1 file changed, 3
On Thu, Jun 21, 2018 at 12:47 PM, Junio C Hamano wrote:
> Elijah Newren writes:
>
>> @@ -280,8 +286,10 @@ other words, the sides are swapped.
>> +
>> Because 'git rebase' replays each commit from the working branch
>> on top of the branch using the given strategy, using
>> -the 'ours' strateg
Elijah Newren writes:
> +if test -n "$git_am_opt"; then
> + incompatible_opts=$(echo "$git_am_opt" | sed -e 's/ -q//')
This is probably just a taste-thing, but I'd probably prefer to see
the "sed" filter out "-q" alone, and make an effort to leave future
things like "-qx" alone, e.g.
$(
Elijah Newren writes:
> + git checkout B &&
> + # This is indented with HT SP HT.
> + echo " foo();" >>foo &&
I often wonder, whenever I see a need for a comment like this, if
saying the same thing in code to make it visible is cleaner and less
error prone way to do so, i.e.
On 6/9/2018 1:56 PM, Duy Nguyen wrote:
On Thu, Jun 7, 2018 at 6:55 PM Derrick Stolee wrote:
Signed-off-by: Derrick Stolee
---
midx.c | 96 --
midx.h | 2 ++
object-store.h | 1 +
packfile.c | 8 -
4 files changed,
Elijah Newren writes:
> signoff is not specific to the am-backend. Also, re-order a few options
> to make like things (e.g. strategy and strategy-option) be near each
> other.
> ---
> git-rebase.sh | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Missing sign-off, but otherwise lo
On 6/9/2018 1:28 PM, Duy Nguyen wrote:
On Thu, Jun 7, 2018 at 4:06 PM Derrick Stolee wrote:
@@ -117,9 +123,13 @@ struct midxed_git *load_midxed_git(const char *object_dir)
die("MIDX missing required pack lookup chunk");
if (!m->chunk_pack_names)
die("M
Elijah Newren writes:
> @@ -280,8 +286,10 @@ other words, the sides are swapped.
> +
> Because 'git rebase' replays each commit from the working branch
> on top of the branch using the given strategy, using
> -the 'ours' strategy simply discards all patches from the ,
> +the 'ours' strategy s
> OK, the fact I was overlooking was that the "config_fn_t" argument
> passed to config_from_gitmodules is what we are actually worried about,
> it's the config callback which could allow generic config in .gitmodules
> to sneak in.
That is the precise point that I was trying to communicate. :)
>
On Thu, Jun 21, 2018 at 08:09:43PM +0200, Pavel Cahyna wrote:
> > > + int len = mbstowcs(wcstring, outbuf->buf, outbuf->len);
> >
> > I don't think mbstowcs() is always going to do the right thing there.
> > We're looking at a string that was sent from the remote server. What
> > encoding is it i
Hello,
On Thu, Jun 21, 2018 at 01:41:22PM -0400, Jeff King wrote:
> On Thu, Jun 21, 2018 at 02:10:30PM +0200, Sebastian Kisela wrote:
>
> > From: Sebastian Kisela
> > + int len = mbstowcs(wcstring, outbuf->buf, outbuf->len);
>
> I don't think mbstowcs() is always going to do the right thing t
On 6/9/2018 1:07 PM, Duy Nguyen wrote:
On Thu, Jun 7, 2018 at 4:06 PM Derrick Stolee wrote:
Before writing a list of objects and their offsets to a multi-pack-index
(MIDX), we need to collect the list of objects contained in the
packfiles. There may be multiple copies of some objects, so this l
On Thu, Jun 21, 2018 at 12:04:11PM -0400, Jack Adrian Zappa wrote:
> Hi, I was trying to clone a repo into a non-existent directory. but it
> gave me a failure:
>
> $ git clone https://github.com/jelera/vim-javascript-syntax.git
> ~/.vim/bundle/vim-javascript-syntax
> fatal: destination path
>
On Thu, Jun 21, 2018 at 02:10:30PM +0200, Sebastian Kisela wrote:
> From: Sebastian Kisela
>
> Fix volnurability against MITM attacks on client side
> by replacing non printable and non white space characters
> by "?".
>
> Fixes: CVE-2018-121
I'm not sure if this is a productive direction
Derrick Stolee writes:
> On 6/7/2018 2:26 PM, Duy Nguyen wrote:
>> On Thu, Jun 7, 2018 at 4:03 PM, Derrick Stolee wrote:
>>> @@ -74,6 +80,31 @@ struct midxed_git *load_midxed_git(const char
>>> *object_dir)
>>> m->num_chunks = *(m->data + 6);
>>> m->num_packs = get_be32(m->dat
On 6/9/2018 12:43 PM, Duy Nguyen wrote:
On Thu, Jun 7, 2018 at 7:01 PM Derrick Stolee wrote:
Signed-off-by: Derrick Stolee
---
Documentation/technical/pack-format.txt | 5 +++
builtin/midx.c | 7
midx.c | 56 ++
Derrick Stolee writes:
> On 6/19/2018 5:51 PM, Ramsay Jones wrote:
>> From: Junio C Hamano
>>
>> Complete the removal of unused 'ewah bitmap' code by removing the now
>> unused 'rlwit_discharge_empty()' function. Also, the 'ewah_clear()'
>> function can now be made a file-scope static symbol.
>>
Brandon Williams writes:
> On 06/19, Junio C Hamano wrote:
>> Brandon Williams writes:
>>
>> > I also think that we should keep this first implementation of
>> > ref-in-want simple and *not* include patterns, even if that's what we
>> > may want someday down the road. Adding a new capability i
Hi, I was trying to clone a repo into a non-existent directory. but it
gave me a failure:
$ git clone https://github.com/jelera/vim-javascript-syntax.git
~/.vim/bundle/vim-javascript-syntax
fatal: destination path
'/home/username/.vim/bundle/vim-javascript-syntax' already exists and
is not an em
Sergey Organov writes:
> When cherry-picking multiple commits, it's impossible to have both
> merge- and non-merge commits on the same command-line. Not specifying
> '-m 1' results in cherry-pick refusing to handle merge commits, while
> specifying '-m 1' fails on non-merge commits.
Allowing "-m
Hi Dscho,
Thanks for all the food for thought. This is awesome.
On Thu, Jun 21, 2018 at 3:57 AM, Johannes Schindelin
wrote:
> On Wed, 20 Jun 2018, Elijah Newren wrote:
>> On Sun, Jun 17, 2018 at 2:44 PM, Johannes Schindelin
>> wrote:
>>
>> > I was really referring to speed. But I have to admit
On 6/7/2018 2:26 PM, Duy Nguyen wrote:
On Thu, Jun 7, 2018 at 4:03 PM, Derrick Stolee wrote:
@@ -74,6 +80,31 @@ struct midxed_git *load_midxed_git(const char *object_dir)
m->num_chunks = *(m->data + 6);
m->num_packs = get_be32(m->data + 8);
+ for (i = 0; i < m->num_chun
Hi,
On Thu, 21 Jun 2018, Duy Nguyen wrote:
> Nice. There's another string in bisect_common() that should also be
> translated: "revision walk setup failed". Maybe you can mark it too?
Sure. A new version of the second patch is attached.
Cheers,
--
Raphaël Hertzog ◈ Debian Developer
Support Deb
git-rebase has lots of options that are mutually incompatible. Even among
aspects of its behavior that is common to all rebase types, it has a number
of inconsistencies. This series tries to document, fix, and/or warn users
about many of these.
I have left patch 7 in RFC state. We probably need
git rebase has three different types: am, merge, and interactive, all of
which are implemented in terms of separate scripts. am builds on git-am,
merge builds on git-merge-recursive, and interactive builds on
git-cherry-pick. We make use of features in those lower-level commands in
the different
rebase was taught the --force-rebase option in commit b2f82e05de ("Teach
rebase to rebase even if upstream is up to date", 2009-02-13). This flag
worked for the am and merge backends, but wasn't a valid option for the
interactive backend.
rebase was taught the --no-ff option for interactive rebas
git rebase has many options that only work with one of its three backends.
It also has a few other pairs of incompatible options. Document these.
Signed-off-by: Elijah Newren
---
Documentation/git-rebase.txt | 85
1 file changed, 77 insertions(+), 8 deletion
There are a variety of aspects that are common to all rebases regardless
of which backend is in use; however, the behavior for these different
aspects varies in ways that could surprise users. (In fact, it's not
clear -- to me at least -- that these differences were even desirable or
intentional.)
All rebase backends should behave the same with empty commit messages, but
currently do not. am-based rebases already apply commits with an empty
commit message without stopping or requiring the user to specify an extra
flag. Since am-based rebases are the default rebase type, and since it
appear
signoff is not specific to the am-backend. Also, re-order a few options
to make like things (e.g. strategy and strategy-option) be near each
other.
---
git-rebase.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 40be59ecc4..bf71b7fa2
git rebase is split into three types: am, merge, and interactive. Various
options imply different types, and which mode we are using determine which
sub-script (git-rebase--$type) is executed to finish the work. Not all
options work with all types, so add tests for combinations where we expect
to
On Thu, Jun 21, 2018 at 4:39 PM Raphaël Hertzog wrote:
>
> The whole bisect procedure is translated but the last message
> that the user will see in the process is not translated. Let's fix this.
Nice. There's another string in bisect_common() that should also be
translated: "revision walk setup
Dear git community,
Is it possible please for the gitk selection color setting to be persistent?
Since 2015 the below approach has been working for me.
Thank you for considering!
Mychael
--- a/gitk
+++ b/gitk
@@ -2409,6 +2409,7 @@ proc makewindow {} {
text $ctext -background $bgcolor -foreg
(I'm not subscribed, please keep me in CC)
Hello,
I was reviewing the output of "git bisect" with my French locale
and I saw a clear mistake in the French translation (fixed
in the first commit) and I also noticed that the last message
was still in English. After review of the code, it's not a mi
The whole bisect procedure is translated but the last message
that the user will see in the process is not translated. Let's fix this.
Signed-off-by: Raphaël Hertzog
---
bisect.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bisect.c b/bisect.c
index a579b5088..8edc7a
"cette" can be only be used before a word (like in "cette bouteille" for
"this bottle"), but here "this" refers to the current step and we have
to use "ceci" in French.
Signed-off-by: Raphaël Hertzog
---
po/fr.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/fr.po b/
This rewrites checkout_onto() from shell to C.
A new command (“checkout-onto”) is added to rebase--helper.c. The shell
version is then stripped.
Signed-off-by: Alban Gruin
---
builtin/rebase--helper.c | 7 ++-
git-rebase--interactive.sh | 25 -
sequencer.c
This adds a new function, run_command_silent_on_success(), to
redirect the stdout and stderr of a command to a strbuf, and then to run
that command. This strbuf is printed only if the command fails. It is
functionnaly similar to output() from git-rebase.sh.
run_git_commit() is then refactored to u
This rewrites (the misnamed) setup_reflog_action() from shell to C. The
new version is called checkout_base_commit().
A new command is added to rebase--helper.c, “checkout-base”, as well as
a new flag, “verbose”, to avoid silencing the output of the checkout
operation called by checkout_base_commi
Thes patch series rewrites the reflog operations from shell to C. This
is part of the effort to rewrite interactive rebase in C.
The first commit is dedicated to creating a function to silence a
command, as the sequencer will do in several places with these patches.
This branch is based on ag/re
On Wed, 20 Jun 2018 12:10:42 -0700
Stefan Beller wrote:
> Hi Antonio!
>
> On Wed, Jun 20, 2018 at 11:06 AM Antonio Ospite wrote:
> > I get that the _content_ of .gitmodules is not meant to be generic
> > config, but I still see some value in having a single point when its
> > _location_ is decid
Good day,
My name is Mr. Pan Yuehan, working as head of risk in Bank
of China.
I'm looking for an investment manager / partner in those volore
It represents me in mutual business.
Please contact me in my private email for more details.
e-mail ( yuehanpa...@gmail.com)
Waiting for your news.
From: Sebastian Kisela
Fix volnurability against MITM attacks on client side
by replacing non printable and non white space characters
by "?".
Fixes: CVE-2018-121
Signed-off-by: Sebastian Kisela
---
sideband.c | 20
t/t5401-update-hooks.sh | 23 +++
On Thu, Jun 21, 2018 at 07:53:02AM -0400, Jeff King wrote:
> > @@ -1429,7 +1447,7 @@ static void show_line(struct grep_opt *opt, char
> > *bol, char *eol,
> > */
> > if (opt->columnnum && cno) {
> > char buf[32];
> > - xsnprintf(buf, sizeof(buf), "%d", cno);
> > +
Hi Johannes,
Le 21/06/2018 à 11:37, Johannes Schindelin a écrit :
> Hi Alban,
>
> On Tue, 19 Jun 2018, Alban Gruin wrote:
>
>> diff --git a/sequencer.c b/sequencer.c
>> index 7cc76332e..9aa7ddb33 100644
>> --- a/sequencer.c
>> +++ b/sequencer.c
>> @@ -766,6 +766,29 @@ N_("you have staged changes
On Wed, Jun 20, 2018 at 03:05:30PM -0500, Taylor Blau wrote:
> Hi,
>
> Here is a re-roll of my series to add --column to 'git-grep(1)'. Since
> last time, not much has changed other than the following:
>
> - Fix a typo where 'col', 'icol' were spelled as 'match', 'imatch'
> [1].
>
> - D
On Thu, Jun 21, 2018 at 09:03:05AM +0200, Johannes Schindelin wrote:
> > > And at that point, maybe
> > >
> > > char *some_var = xstrdup("default");
> > > git_config_string(&some_var, ...);
> > >
> > > that takes "char **" and frees the current storage before assigning to
> > > it may be sim
When cherry-picking multiple commits, it's impossible to have both
merge- and non-merge commits on the same command-line. Not specifying
'-m 1' results in cherry-pick refusing to handle merge commits, while
specifying '-m 1' fails on non-merge commits.
This patch allows '-m 1' for non-merge commit
Hi Elijah,
On Wed, 20 Jun 2018, Elijah Newren wrote:
> On Sun, Jun 17, 2018 at 2:44 PM, Johannes Schindelin
> wrote:
>
> > I was really referring to speed. But I have to admit that I do not have
> > any current numbers.
> >
> > Another issue just hit me, though: rebase --am does not need to loo
Hi Alban,
On Tue, 19 Jun 2018, Alban Gruin wrote:
> diff --git a/sequencer.c b/sequencer.c
> index a7a73e3ef..9165bf96c 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -3161,6 +3161,25 @@ int checkout_base_commit(struct replay_opts *opts,
> const char *commit,
> return 0;
> }
>
> +i
Hi Alban,
On Tue, 19 Jun 2018, Alban Gruin wrote:
> This rewrites setup_reflog_action() from shell to C. The new version is
> called checkout_base_commit().
This sounds like a serious mistake. How is it that a function that sets up
a reflog action all of a sudden checks out a base commit?
But
ah, sorry. I understand why.
The merge was on remote side.
21.06.2018, 12:37, "KES" :
> Hi.
>
> I am on my current branch:
>
> $ git log --graph --decorate --pretty=oneline --abbrev-commit
> * 5b85d64 (HEAD -> SCTT_for_other_tables) Implement script to test CORS
> * f45a919 Create SCTT for Contra
Hi Alban,
On Tue, 19 Jun 2018, Alban Gruin wrote:
> diff --git a/sequencer.c b/sequencer.c
> index 7cc76332e..9aa7ddb33 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -766,6 +766,29 @@ N_("you have staged changes in your working tree\n"
> #define VERIFY_MSG (1<<4)
> #define CREATE_ROOT_CO
Hi.
I am on my current branch:
$ git log --graph --decorate --pretty=oneline --abbrev-commit
* 5b85d64 (HEAD -> SCTT_for_other_tables) Implement script to test CORS
* f45a919 Create SCTT for Contractor
* 702fcdd (xtucha/SCTT_for_other_tables) Create SCTT for PartnershipAgreement
* 7e4cac9 Create
Hi.
I am on my current branch.
$ git log --graph --decorate --pretty=oneline --abbrev-commit
* 5b85d64 (HEAD -> SCTT_for_other_tables) Implement script to test CORS
* f45a919 Create SCTT for Contractor
* 702fcdd (xtucha/SCTT_for_other_tables) Create SCTT for PartnershipAgreement
* 7e4cac9 Create
Hi Alban,
On Tue, 19 Jun 2018, Alban Gruin wrote:
> --
> 2.16.4
You might want to update ;-)
https://github.com/git-for-windows/git/wiki/FAQ#should-i-upgrade-to-a-newer-git-for-windows-version
Ciao,
Johannes
Hi Ævar,
On Mon, 11 Jun 2018, Ævar Arnfjörð Bjarmason wrote:
> On Sat, Jun 09 2018, brian m. carlson wrote:
>
> [Expanding the CC list to what we had in the last "what hash" thread[1]
> last year].
>
> > == Discussion of Candidates
> >
> > I've implemented and tested the following algorithms, a
Hi Peff,
On Mon, 4 Jun 2018, Jeff King wrote:
> On Mon, Jun 04, 2018 at 01:26:57PM +0900, Junio C Hamano wrote:
>
> > And at that point, maybe
> >
> > char *some_var = xstrdup("default");
> > git_config_string(&some_var, ...);
> >
> > that takes "char **" and frees the current storage
98 matches
Mail list logo
