Hi Junio,
On Fri, 6 Jul 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > The problem solved by the code introduced in this commit goes like this:
> > given two sets of i
Hi Junio,
On Fri, 6 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Of course, at that point I will have to look through those 7 patches
> > again, if only to verify that yes, they are still the same.
>
> That is something the patch autho
Hi Junio,
On Fri, 6 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> > git rev-list --first-parent --bisect-all F..E >revs &&
> >> > test_line_count = 9 revs &&
> >> > for rev in E e1 e2 e3 e4 e5 e6
Hi Junio,
On Fri, 6 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > I would *strongly* encourage you to allow Alban to go back to the small,
> > incremental patch series he sent before, because it will make it
> > *substantially* easier to not only
Hi Junio,
On Fri, 6 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> I thought we made this into
> >>
> >>if verbose
> >>return run_command
> >>else
> >>return run_command_silen
Hi Junio,
On Tue, 3 Jul 2018, Junio C Hamano wrote:
> Alban Gruin writes:
>
> > +static int run_git_checkout(struct replay_opts *opts, const char *commit,
> > + int verbose, const char *action)
> > +{
> > + struct child_process cmd = CHILD_PROCESS_INIT;
> > +
> > +
Hi Pratik,
On Fri, 6 Jul 2018, Pratik Karki wrote:
> The functions present in `git-legacy-rebase.sh` are used by the rebase
> backends as they are implemented as shell script functions in the
> `git-rebase--` files.
>
> To make the `builtin/rebase.c` work, we have to provide support via
> a
Hi Paul,
On Thu, 5 Jul 2018, Paul Smith wrote:
> On Wed, 2018-07-04 at 13:22 +0200, Johannes Schindelin wrote:
> > > Basically what happens is that I run configure with
> > > --prefix=/my/install/path --with-gitconfig=etc/gitconfig
> > > --with-g
Hi Tobias,
On Wed, 4 Jul 2018, Tobias Klauser wrote:
> On 2018-07-04 at 15:09:34 +0200, Johannes Schindelin
> wrote:
>
> > Junio, this gets an ACK from me, could you apply the
> > `git-rebase--preserve-merges.sh` part selectively, please?
>
> Let me know if I shou
Hi Tobias,
On Wed, 4 Jul 2018, Tobias Klauser wrote:
> Part of the todo help message in git-rebase--interactive.sh and
> git-rebase--preserve-merges.sh is unnecessarily indented, making the
> message look weird:
>
> # These lines can be re-ordered; they are executed from top to bottom.
> #
Hi Paul,
On Wed, 4 Jul 2018, Paul Smith wrote:
> One thing I wanted to do was provide a default ca-bundle.crt file along
> with my local build of Git. I need my installation to be relocatable
> and I'm using RUNTIME_PREFIX with Git 2.18.0 (on GNU/Linux).
Understandable. We do this all the time
Hi Paul,
On Wed, 4 Jul 2018, Paul Smith wrote:
> I was excited to see the RUNTIME_PREFIX for POSIX systems patchset go
> by earlier this year. Although I didn't see any mention of it being
> included in the 2.18.0 release notes, it does appear that it was merged
> in for this release.
>
> Has
Hi Junio,
On Tue, 3 Jul 2018, Junio C Hamano wrote:
> Tiago Botelho writes:
>
> > git rev-list --first-parent --bisect-all F..E >revs &&
> > test_line_count = 9 revs &&
> > for rev in E e1 e2 e3 e4 e5 e6 e7 e8
> > do
> > grep "^$(git rev-parse $rev) " revs ||
> > {
> > echo "$rev not
Hi Junio,
On Tue, 3 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Seriously again, I sent a new iteration:
> >
> > https://public-inbox.org/git/pull.1.v3.git.gitgitgad...@gmail.com/
>
> Thanks, will take a look but it is likely that I'
Hi Junio,
On Tue, 3 Jul 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Thu, 28 Jun 2018, Junio C Hamano wrote:
> >
> >> * as/safecrlf-quiet-fix (2018-06-11) 1 commit
> >> (merged to 'next' on 2018-06-13 at b163674843)
> >>
Hi Junio,
On Thu, 28 Jun 2018, Junio C Hamano wrote:
> * js/branch-diff (2018-05-16) 19 commits
> - fixup! Add a function to solve least-cost assignment problems
> - completion: support branch-diff
> - branch-diff: add a man page
> - branch-diff --dual-color: work around bogus white-space
Hi Junio,
On Thu, 28 Jun 2018, Junio C Hamano wrote:
> * ag/rebase-i-rewrite-todo (2018-06-15) 3 commits
> - rebase--interactive: rewrite the edit-todo functionality in C
> - editor: add a function to launch the sequence editor
> - Merge branch 'bc/t3430-fixup' into ag/rebase-i-rewrite-todo
>
Hi Junio & Aaron,
On Thu, 28 Jun 2018, Junio C Hamano wrote:
> * as/sequencer-customizable-comment-char (2018-06-28) 1 commit
> - sequencer: use configured comment character
>
> Honor core.commentchar when preparing the list of commits to replay
> in "rebase -i".
As per
Hi Junio,
On Thu, 28 Jun 2018, Junio C Hamano wrote:
> * jh/partial-clone (2018-06-12) 1 commit
> (merged to 'next' on 2018-06-13 at 818f864b0c)
> + list-objects: check if filter is NULL before using
>
> The recent addition of "partial clone" experimental feature kicked
> in when it
Hi Junio,
On Thu, 28 Jun 2018, Junio C Hamano wrote:
> * as/safecrlf-quiet-fix (2018-06-11) 1 commit
> (merged to 'next' on 2018-06-13 at b163674843)
> + config.c: fix regression for core.safecrlf false
>
> Fix for 2.17-era regression around `core.safecrlf`.
Is this `maint` material?
From: Johannes Schindelin
This command does not do a whole lot so far, apart from showing a usage
that is oddly similar to that of `git tbdiff`. And for a good reason:
the next commits will turn `range-branch` into a full-blown replacement
for `tbdiff`.
At this point, we ignore tbdiff's color
From: Johannes Schindelin
At this stage, `git range-diff` can determine corresponding commits
of two related commit ranges. This makes use of the recently introduced
implementation of the Hungarian algorithm.
The core of this patch is a straight port of the ideas of tbdiff, the
apparently
From: Johannes Schindelin
When showing what changed between old and new commits, we show a diff of
the patches. This diff is a diff between diffs, therefore there are
nested +/- signs, and it can be relatively hard to understand what is
going on.
With the --dual-color option, the preimage
From: Johannes Schindelin
When diffing diffs, it can be quite daunting to figure out what the heck
is going on, as there are nested +/- signs.
Let's make this easier by adding a flag in diff_options that allows
color-coding the outer diff sign with inverted colors, so that the
preimage
to solve least-cost assignment
problems
@@ -1,11 +1,17 @@
Author: Johannes Schindelin
-Add a function to solve least-cost assignment problems
+linear-assignment: a function to solve least-cost assignment problems
-The Jonker-Volgenant algorithm was i
From: Johannes Schindelin
The main information in the `range-diff` view comes from the list of
matching and non-matching commits, the diffs are additional information.
Indenting them helps with the reading flow.
Signed-off-by: Johannes Schindelin
---
builtin/range-diff.c | 10 ++
1
From: Johannes Schindelin
This "color" simply reverts background and foreground. It will be used
in the upcoming "dual color" mode of `git range-diff`, where we will
reverse colors for the -/+ markers and the fragment headers of the
"outer" diff.
Signed-off-by: Joh
From: Johannes Schindelin
As pointed out by Elijah Newren, tbdiff has this neat little alignment
trick where it outputs the commit pairs with patch numbers that are
padded to the maximal patch number's width:
1: cafedead = 1: acefade first patch
[...]
314: beefeada
From: Johannes Schindelin
Arguably the most important part of `git range-diff`'s output is the
list of commits in the two branches, together with their relationships.
For that reason, tbdiff introduced color-coding that is pretty
intuitive, especially for unchanged patches (all dim yellow, like
From: Johannes Schindelin
The bulk of this patch consists of a heavily butchered version of
tbdiff's README written by Thomas Rast and Thomas Gummerer, lifted from
https://github.com/trast/tbdiff.
Signed-off-by: Johannes Schindelin
---
Documentation/git-range-diff.txt | 235
From: Johannes Schindelin
Tab completion of `git range-diff` is very convenient, especially
given that the revision arguments to specify the commit ranges to
compare are typically more complex than, say, your grandfather's `git
log` arguments.
Signed-off-by: Johannes Schindelin
squash! WIP
From: Johannes Schindelin
After using this command extensively for the last two months, this
developer came to the conclusion that even if the dual color mode still
leaves a lot of room for confusion what was actually changed, the
non-dual color mode is substantially worse in that regard
From: Johannes Schindelin
This change brings `git range-diff` yet another step closer to
feature parity with tbdiff: it now shows the oneline, too, and indicates
with `=` when the commits have identical diffs.
Signed-off-by: Johannes Schindelin
---
range-diff.c | 66
From: Johannes Schindelin
We are comparing complete, formatted commit messages with patches. There
are no function names here, so stop looking for them.
Signed-off-by: Johannes Schindelin
---
range-diff.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/range-diff.c b/range-diff.c
From: Johannes Schindelin
When comparing commit messages, we need to keep in mind that they are
indented by four spaces. That is, empty lines are no longer empty, but
have "trailing whitespace". When displaying them in color, that results
in those nagging red lines.
Let's just
From: Johannes Schindelin
When showing the diff between corresponding patches of the two branch
versions, we have to make up a fake filename to run the diff machinery.
That filename does not carry any meaningful information, hence tbdiff
suppresses it. So we should, too.
Signed-off
From: Johannes Schindelin
When displaying a diff of diffs, it is possible that there is an outer
`+` before a context line. That happens when the context changed between
old and new commit. When that context line starts with a tab (after the
space that marks it as context line), our diff
From: Johannes Schindelin
Just like tbdiff, we now show the diff between matching patches. This is
a "diff of two diffs", so it can be a bit daunting to read for the
beginner.
An alternative would be to display an interdiff, i.e. the hypothetical
diff which is the result of first
From: Johannes Schindelin
The problem solved by the code introduced in this commit goes like this:
given two sets of items, and a cost matrix which says how much it
"costs" to assign any given item of the first set to any given item of
the second, assign all items (except when the
From: Johannes Schindelin
This patch lets `git range-diff` use the same order as tbdiff.
The idea is simple: for left-to-right readers, it is natural to assume
that the `git range-diff` is performed between an older vs a newer
version of the branch. As such, the user is probably more interested
Hi Junio,
On Thu, 28 Jun 2018, Junio C Hamano wrote:
> Aaron Schrab writes:
>
> > Use configured comment character when generating comments about branches
> > in an instruction sheet. Failure to honor this configuration causes a
> > failure to parse the resulting instruction sheet.
> >
> >
From: Johannes Schindelin
In ed32b788c06 (version --build-options: report commit, too, if
possible, 2017-12-15), we introduced code to let `git version
--build-options` report the current commit from which the binaries were
built, if any.
To prevent erroneous commits from being reported (e.g
being built from
git_osx_installer's HEAD.
This commit fixes that, and also suppresses the error when no repository could
be found.
Changes since v1:
- the commit message now sports an explanatory paragraph, copy-edited from
Peff's reply.
Johannes Schindelin (1):
Makefile: fix the "built
Hi Peff,
On Thu, 28 Jun 2018, Jeff King wrote:
> On Thu, Jun 28, 2018 at 10:27:32AM -0700, Junio C Hamano wrote:
>
> > Johannes Schindelin writes:
> >
> > >> I.e.:
> > >>
> > >> FOO='with spaces'
> > >> BAR=$FOO sh -c
Hi Junio,
On Thu, 28 Jun 2018, Junio C Hamano wrote:
> What I meant by "many separte grep calls" was to contrast these two
> approaches:
>
> * Have one typical output spelled out as "expect", take an output
>from an actual run into "actual", make them comparable and then
>do a compare
Hi Peff,
On Thu, 28 Jun 2018, Jeff King wrote:
> On Wed, Jun 27, 2018 at 09:35:23PM +0200, Johannes Schindelin via
> GitGitGadget wrote:
>
> > To prevent erroneous commits from being reported (e.g. when unpacking
> > Git's source code from a .tar.gz file into a subdir
Team,
[Cc:ing Tim]
On Thu, 28 Jun 2018, Johannes Schindelin via GitGitGadget wrote:
> In ed32b788c06 (version --build-options: report commit, too, if
> possible, 2017-12-15), we introduced code to let `git version
> --build-options` report the current commit from which the binaries wer
Hi Junio,
On Wed, 27 Jun 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > git rev-list --bisect-all --first-parent F..E >revs &&
> > # only E, e1..e8 should be listed, nothing else
> > test_line_count = 9 revs &&
&
.
Signed-off-by: Johannes Schindelin
Thanks for taking the time to contribute to Git! Please be advised that the
Git community does not use github.com for their contributions. Instead, we use
a mailing list (git@vger.kernel.org) for code submissions, code reviews, and
bug reports. Nevertheless, you
From: Johannes Schindelin
In ed32b788c06 (version --build-options: report commit, too, if
possible, 2017-12-15), we introduced code to let `git version
--build-options` report the current commit from which the binaries were
built, if any.
To prevent erroneous commits from being reported (e.g
Hi Aaron,
On Wed, 27 Jun 2018, Aaron Schrab wrote:
> Use configured comment character when generating comments about branches
> in an instruction sheet. Failure to honor this configuration causes a
> failure to parse the resulting instruction sheet.
Good catch.
Now, if you can refer to the
Hi Vlad,
On Wed, 27 Jun 2018, Vladimir Parfinenko wrote:
> Last sections are squashed into non-formatted block after adding
> "REBASING MERGES".
> To reproduce the error see bottom of page:
> https://git-scm.com/docs/git-rebase
>
> Signed-off-by: Vladimir Parfinenko
ACK!
Thank you so much
Hi Junio,
On Tue, 26 Jun 2018, Junio C Hamano wrote:
> Christian Couder writes:
>
> > Obviousness is often not the same for everybody.
>
> ... which you just learned---what you thought obvious turns out to
> be not so obvious after all, so you adjust to help your readers.
Indeed. And trying
Hi Dana,
On Tue, 26 Jun 2018, dana wrote:
> On 26 Jun 2018, at 16:44, Johannes Schindelin
> wrote:
> >There is of course one other way to fix this, and that is by rewriting
> >this in C.
> >
> >Which Alban has done here ;-)
> >
> >http://public-inb
Hi Paul,
I think I had revewied these 4 patches before, and I'd wager a bet that
you addressed all of my suggestions, if any.
I had a look over patches 2-4, and want to take a little bit more time
tomorrow to pour over patch 1 (which is a little larger, as it lays a lot
of ground work), to make
Hi Paul,
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
> index 84a537f39..fbf78249c 100644
> --- a/builtin/stash--helper.c
> +++ b/builtin/stash--helper.c
> @@ -522,6 +528,41 @@ static int drop_stash(int argc, const char
Hi Paul,
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
> index 1c4387b10..84a537f39 100644
> --- a/builtin/stash--helper.c
> +++ b/builtin/stash--helper.c
> @@ -414,6 +451,77 @@ static int apply_stash(int argc, const char
Hi Paul,
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> This second series of patches contains commits to convert `apply`, `drop`,
> `clear`, `branch`, `pop` stash subcommands to builtins.
>
>
> Joel Teichroeb (4):
> stash: convert apply to builtin
> stash: convert drop and clear
Hi Paul,
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> Renamed some test cases' labels to be more descriptive and under 80
> characters per line.
>
> Signed-off-by: Paul-Sebastian Ungureanu
As I suggested this kind of change, I am obviously happy with this patch.
Apart from minor
Hi Paul,
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> Removed whitespaces after redirection operators.
That is accurate a description of what the patch does. Let's add the why
(and change the tense to present tense, as is the custom in our commit
messages):
This adjusts
Hi Paul,
as a general rule, we try to keep the commit subjects in the imperative,
i.e.
sha1-name.c: add 'get_oidf', which acts like 'get_oid'
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> Compared to 'get_oid', 'get_oidf' has as parameters a
> printf format string and the
Hi,
On Mon, 25 Jun 2018, Paul-Sebastian Ungureanu wrote:
> This first series of patches does bring some changes and improvements to
> the test suite. One of the patches also introduces a new function
> `get_oidf()` which will be hepful for the incoming patches related to
> `git stash`.
For
Hi Junio,
On Tue, 26 Jun 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Tue, 26 Jun 2018, Alban Gruin wrote:
> >
> >> This adds an error when append_todo_help() fails to write its message to
> >> the todo file.
> >>
> >&g
Hi Alban,
On Tue, 26 Jun 2018, Alban Gruin wrote:
> This rewrites the edit-todo functionality from shell to C.
>
> To achieve that, a new command mode, `edit-todo`, is added, and the
> `write-edit-todo` flag is removed, as the shell script does not need to
> write the edit todo help message to
Hi Alban,
On Tue, 26 Jun 2018, Alban Gruin wrote:
> This patch rewrites the edit-todo functionality from shell to C. This is
> part of the effort to rewrite interactive rebase in C.
>
> This patch is based on the fourth iteration of my series rewriting
> append_todo_help() in C.
>
> Changes
Hi, me again,
On Tue, 26 Jun 2018, Johannes Schindelin wrote:
> On Tue, 26 Jun 2018, Johannes Schindelin wrote:
>
> > On Tue, 26 Jun 2018, dana wrote:
> >
> > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> > > index 299ded213..a31
Hi Alban,
On Tue, 26 Jun 2018, Alban Gruin wrote:
> This rewrites append_todo_help() from shell to C. It also incorporates
> some parts of initiate_action() and complete_action() that also write
> help texts to the todo file.
>
> This also introduces the source file rebase-interactive.c. This
Hi Alban,
On Tue, 26 Jun 2018, Alban Gruin wrote:
> diff --git a/sequencer.h b/sequencer.h
> index c5787c6b5..08397b0d1 100644
> --- a/sequencer.h
> +++ b/sequencer.h
> @@ -3,6 +3,7 @@
>
> const char *git_path_commit_editmsg(void);
> const char *git_path_seq_dir(void);
> +const char
Hi Alban,
On Tue, 26 Jun 2018, Alban Gruin wrote:
> This patch rewrites append_todo_help() from shell to C. The C version
> covers a bit more than the old shell version. To achieve that, some
> parameters were added to rebase--helper.
>
> This also introduce a new source file,
Hi,
and now for the review...
On Tue, 26 Jun 2018, Johannes Schindelin wrote:
> On Tue, 26 Jun 2018, dana wrote:
>
> > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> > index 299ded213..a31af6d4c 100644
> > --- a/git-rebase--interactive
Let's Cc: Wink, who authored the commit mentioned as culprit in the commit
message.
On Tue, 26 Jun 2018, dana wrote:
> Fix a trivial white-space issue introduced by commit d48f97aa8
> ("rebase: reindent function git_rebase__interactive", 2018-03-23). This
> affected the instructional comments
Hi Chris,
On Tue, 26 Jun 2018, Christian Couder wrote:
> On Tue, Jun 26, 2018 at 4:10 PM, Johannes Schindelin
> wrote:
> >
> > The point, for me, is: if this test fails, at some stage in the
> > future, for any reason, it will be a major pain to even dissect what
> &
Hi Chris,
On Tue, 26 Jun 2018, Christian Couder wrote:
> On Mon, Jun 25, 2018 at 7:33 PM, Junio C Hamano wrote:
> > Tiago Botelho writes:
> >
> >> +test_expect_success "--bisect-all --first-parent" '
> >> +cat >expect1 < >> +$(git rev-parse CC) (dist=2)
> >> +$(git rev-parse EX) (dist=1)
> >>
Hi Alban,
On Tue, 26 Jun 2018, Alban Gruin wrote:
> This adds an error when append_todo_help() fails to write its message to
> the todo file.
>
> Signed-off-by: Alban Gruin
ACK.
We *may* want to fold that into the commit that adds `append_todo_help()`.
And, as I mentioned previously, I would
Hi Junio & Alban,
On Mon, 25 Jun 2018, Junio C Hamano wrote:
> * ag/rebase-i-append-todo-help (2018-06-14) 2 commits
> - rebase--interactive: rewrite append_todo_help() in C
> - Merge branch 'ag/rebase-p' into ag/rebase-i-append-todo-help
> (this branch is used by ag/rebase-i-rewrite-todo.)
>
Hi,
On Mon, 25 Jun 2018, Alban Gruin wrote:
> Le 25/06/2018 à 17:34, Junio C Hamano a écrit :
> > Alban Gruin writes:
> >
> >> Le 22/06/2018 à 18:27, Junio C Hamano a écrit :
> >>> Alban Gruin writes:
> This rewrites (the misnamed) setup_reflog_action() from shell to C. The
> new
Hi Peff,
On Thu, 21 Jun 2018, Jeff King wrote:
> 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];
> > >
Dear Git users,
It is my pleasure to announce that Git for Windows 2.18.0 is available from:
https://gitforwindows.org/
Changes since Git for Windows v2.17.1(2) (May 29th 2018)
New Features
* Comes with Git v2.18.0.
* Comes with Git Credential Manager v1.16.2.
Bug Fixes
* The
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,
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;
> }
>
>
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
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
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,
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(_var, ...);
> >
> > that takes "char **" and frees the current storage
Hi Mike,
there is a GSoC project going on to make `git stash` a builtin, and I
think that this change makes sense and at the same time needs to be
coordinated with Paul, who is performing that builtin work, so I Cc:ed him
for visibility.
Ciao,
Johannes
On Wed, 20 Jun 2018, Mike Frysinger wrote:
Hi Frank,
On Mon, 9 Aug 2010, Frank Li wrote:
> All:
> I use msysgit 1.7.0.2 at windows xp.
> Problem: git status will list tracked directory as untracked dir.
That is the *least* problem you have with that version: you are vulnerable
to several security issues.
Sadly, there
Hi Junio,
On Tue, 19 Jun 2018, Junio C Hamano wrote:
> Todd Zullinger writes:
>
> > index e500d7c320..352a52e59d 100755
> > --- a/t/t3404-rebase-interactive.sh
> > +++ b/t/t3404-rebase-interactive.sh
> > @@ -977,7 +977,8 @@ test_expect_success 'rebase -i --root reword root
> > commit' '
> >
Hi Junio,
On Tue, 19 Jun 2018, Junio C Hamano wrote:
> Todd Zullinger writes:
>
> > With luck, this will save you a few minutes, assuming the
> > commit message is reasonable (or can be improved with help
> > from Phillip and others). :)
>
> OK.
>
> > Or Junio may just squash this onto
Hi Todd,
On Mon, 18 Jun 2018, Todd Zullinger wrote:
> When testing a reworded root commit, ensure that the squash-onto commit
> which is created and amended is still the root commit.
>
> Suggested-by: Phillip Wood
> Helped-by: Johannes Schindelin
> Signed-off-by: Todd Zu
Hi Stefan,
On Mon, 18 Jun 2018, Stefan Beller wrote:
> On Mon, Jun 18, 2018 at 6:19 AM Alban Gruin wrote:
> >
> > +int setup_reflog_action(struct replay_opts *opts, const char *commit,
> > + int verbose)
> > +{
> > + const char *action;
> > +
> > + if (commit
Hi Todd,
On Mon, 18 Jun 2018, Todd Zullinger wrote:
> Phillip Wood wrote:
> > On 15/06/18 05:31, Johannes Schindelin via GitGitGadget wrote:
> >>
> >> From: Todd Zullinger
> >>
> >> +test_expect_failure 'rebase -i --root reword root commit' '
&g
Hi Phillip,
On Mon, 18 Jun 2018, Phillip Wood wrote:
> On 17/06/18 20:28, Johannes Schindelin wrote:
> >
> > On Sun, 17 Jun 2018, Phillip Wood wrote:
> >
> >> On 17/06/18 06:37, Elijah Newren wrote:
> >>> Ever since commit 18633e1a22 ("rebase -i:
Hi Elijah,
On Sat, 9 Jun 2018, Elijah Newren wrote:
> On Sat, Jun 9, 2018 at 3:11 PM, Johannes Schindelin
> wrote:
> > On Thu, 7 Jun 2018, Elijah Newren wrote:
> >
> >> am-based rebases suffer from an reduced ability to detect directory
> >> renames upstre
Hi Phillip,
On Sun, 17 Jun 2018, Phillip Wood wrote:
> On 17/06/18 06:37, Elijah Newren wrote:
> > Ever since commit 18633e1a22 ("rebase -i: use the rebase--helper builtin",
> > 2017-02-09), when a commit marked as 'reword' in an interactive rebase
> > has conflicts and fails to apply, when the
Hi Elijah,
On Sat, 16 Jun 2018, Elijah Newren wrote:
> Ever since commit 18633e1a22 ("rebase -i: use the rebase--helper builtin",
> 2017-02-09), when a commit marked as 'reword' in an interactive rebase
> has conflicts and fails to apply, when the rebase is resumed that commit
> will be squashed
Hi Peff,
On Thu, 14 Jun 2018, Jeff King wrote:
> On Thu, Jun 14, 2018 at 10:13:42AM +, brian m. carlson wrote:
>
> > > I know that other git server environments like github support that on
> > > client side by allowing tokens to be used as usernames in a BASIC
> > > authentication flow. We
Team,
On Wed, 13 Jun 2018, Junio C Hamano wrote:
> A release candidate Git v2.18.0-rc2 is now available for testing
> at the usual places. It is comprised of 852 non-merge commits
> since v2.17.0, contributed by 65 people, 20 of which are new faces.
>
> The tarballs are found at:
>
>
From: Johannes Schindelin
The code path that triggered that "BUG" really does not want to run
without an explicit commit message. In the case where we want to amend a
commit message, we have an *implicit* commit message, though: the one of
the commit to amend. Therefore, this code p
From: Todd Zullinger
When splitting a repository, running `git rebase -i --root` to reword
the initial commit, Git dies with
BUG: sequencer.c:795: root commit without message.
Signed-off-by: Todd Zullinger
Signed-off-by: Johannes Schindelin
---
t/t3404-rebase-interactive.sh | 9
801 - 900 of 5954 matches
Mail list logo
