Hi Peff,
On Wed, 14 Nov 2018, Jeff King wrote:
> On Tue, Nov 13, 2018 at 04:38:24AM -0800, Johannes Schindelin via
> GitGitGadget wrote:
>
> > Phillip Wood reported a problem where the built-in rebase did not understand
> > options like -C1, i.e. it did not expec
Hi Phillip,
On Tue, 13 Nov 2018, Phillip Wood wrote:
> On 13/11/2018 19:21, Johannes Schindelin wrote:
> > Hi Phillip,
> >
> > On Tue, 13 Nov 2018, Phillip Wood wrote:
> >
> > > Thanks for looking at this. Unfortunately using OPT_PASSTHRU_ARGV seem
Hi Ævar,
On Wed, 14 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> On Wed, Nov 14 2018, Stefan Beller wrote:
>
> >> But maybe I'm being overly paranoid. What do those more familiar with
> >> this think?
> >
> > I am not too worried,
> > * as rebase is a main porcelain, that is even hard to use in a
Hi,
On Wed, 14 Nov 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
> > Agreed. I'm happy to see the test for-loop gone as I noted in
> > https://public-inbox.org/git/87d0rm7zeo@evledraar.gmail.com/ but as
> > noted in that v3 feedback the whole "why would anyone want this?"
:
* Be loud about this bug instead of papering over it.
Johannes Schindelin (1):
config: report a bug if git_dir exists without commondir
config.c | 2 ++
1 file changed, 2 insertions(+)
base-commit: 8858448bb49332d353febc078ce4a3abcc962efe
Published-As:
https://github.com/gitgitgadget/git
From: Johannes Schindelin
This did happen at some stage, and was fixed relatively quickly. Make
sure that we detect very quickly, too, should that happen again.
Signed-off-by: Johannes Schindelin
---
config.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/config.c b/config.c
index
Hi Ævar,
On Wed, 14 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> Add a GIT_TEST_REBASE_USE_BUILTIN=false test mode which is equivalent
> to running with rebase.useBuiltin=false. This is needed to spot that
> we're not introducing any regressions in the legacy rebase version
> while we're carrying
Hi Ævar,
On Wed, 14 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> The rebase.useBuiltin variable introduced in 55071ea248 ("rebase:
> start implementing it as a builtin", 2018-08-07) was turned on by
> default in 5541bd5b8f ("rebase: default to using the builtin rebase",
> 2018-08-08), but had no
Hi Peff,
On Wed, 14 Nov 2018, Jeff King wrote:
> On Mon, Nov 12, 2018 at 05:48:37AM -0800, Johannes Schindelin via
> GitGitGadget wrote:
>
> > diff --git a/t/test-lib.sh b/t/test-lib.sh
> > index 832ede5099..1ea20dc2dc 100644
> > --- a/t/test-lib.sh
> > +++ b
Hi Junio,
On Wed, 14 Nov 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > diff --git a/Makefile b/Makefile
> > index bbfbb4292d..5df0118ce9 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -2590,6
Hi Junio,
On Wed, 14 Nov 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > We really only need the test helpers in that case, but that is not what
> > we test for. So let's skip
Hi Junio,
On Wed, 14 Nov 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > It really makes very, very little sense to use a different git
> > executable than the one the c
Hi,
On Tue, 13 Nov 2018, Tanushree Tumane wrote:
> From: tanushree27
>
> when we cherrypick an existing commit it doesn't change anything and
> therefore it fails prompting to reset (skip commit) or commit using
> --allow-empty attribute and then continue.
This is a nice paragraph, but it
ror, it just tells me that it does not need to rebase (which is
> true)
Hmm. Isn't this the same behavior as with the scripted version? Also: are
we sure that we want to allow options to come *after* the ``
argument?
Ciao,
Dscho
> Best Wishes
>
> Phillip
>
>
> On 13/11/2018
And yet another patch from Git for Windows' cache of treasures.
It was challenging to emulate the functions related to pthread_cond_t as
long as we tried to maintain support for Windows XP, which has nothing close
to that feature. Now that we require Windows Vista or later, we can make use
of the
And yet another patch coming through Git for Windows...
Gaël Lhez (1):
bundle: refuse to create empty bundle
bundle.c| 7 ---
t/t5607-clone-bundle.sh | 4
2 files changed, 8 insertions(+), 3 deletions(-)
base-commit: 8858448bb49332d353febc078ce4a3abcc962efe
Back when bw/config-h was developed (and backported to Git for Windows), I
came up with this patch. It seems to not be strictly necessary, but I like
the safety of falling back to the Git directory when no common directory is
configured (for whatever reason).
Johannes Schindelin (1
From: Johannes Schindelin
Just some defensive programming.
Signed-off-by: Johannes Schindelin
---
config.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/config.c b/config.c
index 4051e38823..279d0d7077 100644
--- a/config.c
+++ b/config.c
@@ -1676,6 +1676,8 @@ static int
.
Johannes Schindelin (1):
mingw: use `CreateHardLink()` directly
compat/mingw.c | 14 +-
1 file changed, 1 insertion(+), 13 deletions(-)
base-commit: 8858448bb49332d353febc078ce4a3abcc962efe
Published-As:
https://github.com/gitgitgadget/git/releases/tags/pr-77%2Fdscho%2Fmingw
From: Johannes Schindelin
The function `CreateHardLink()` is available in all supported Windows
versions (even since Windows XP), so there is no more need to resolve it
at runtime.
Helped-by: Max Kirillov
Signed-off-by: Johannes Schindelin
---
compat/mingw.c | 14 +-
1 file
Hi Junio,
On Tue, 13 Nov 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> For a trivially small change/fix like this, it is OK and even
> >> preferrable to make 1+2 a single step, as applying t/ part only to
> >> try to see the breakage (or
, I decided to simply convert all of the
options intended for git am (or, eventually, for git apply). This happens to
fix that bug, and does so much more: it simplifies the entire logic (and
removes more lines than it adds).
Johannes Schindelin (1):
rebase: really just passthru the `git am` options
From: Johannes Schindelin
Currently, we parse the options intended for `git am` as if we wanted to
handle them in `git rebase`, and then reconstruct them painstakingly to
define the `git_am_opt` variable.
However, there is a much better way (that I was unaware of, at the time
when I mentored
Hi Junio,
On Tue, 13 Nov 2018, Junio C Hamano wrote:
> Rafael Ascensão writes:
>
> > The documentation of `--exclude=` option from rev-list and rev-parse
> > explicitly states that exclude patterns *should not* start with 'refs/'
> > when used with `--branches`, `--tags` or `--remotes`.
> >
>
Hi Junio,
On Tue, 13 Nov 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > The scripted version of the rebase used to execute `git reset --hard`
> > when skipping or aborti
Hi Junio,
On Tue, 13 Nov 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > When calling `merge` on a branch that has already been merged, that
> > `merge` is skipped quietly, but cu
Hi Phillip,
On Mon, 12 Nov 2018, Phillip Wood wrote:
> I've just tried running
>
> bin-wrappers/git rebase -C1 @^
>
> and I get
>
> error: unknown switch `1'
Darn. I think this is the same problem as the `-S` switch problem, but in
reverse: the built-in rebase used to require an argument for
Hi Phillip,
On Mon, 12 Nov 2018, Phillip Wood wrote:
> It's good to see these patches progressing, I've just got a couple of
> comments related to Johannes' points below
>
> On 12/11/2018 16:21, Johannes Schindelin wrote:
> > Hi Elijah,
> >
> > On Wed, 7
Hi,
On Mon, 12 Nov 2018, Carlo Marcelo Arenas Belón wrote:
> There are still some more possible improvements around this code but
> they are orthogonal to this change :
>
> * migrate to approxidate_careful or parse_expiry_date
> * maybe make sure only approxidate are used for expiration
>
>
From: Johannes Schindelin
When we detect that a `merge` can be skipped because the merged commit
is already an ancestor of HEAD, we do not need to commit, therefore
writing the MERGE_HEAD file is useless.
It is actually worse than useless: a subsequent `git commit` will pick
it up and think
From: Johannes Schindelin
Every once in a while, the interactive rebase makes sure that no stale
files are lying around. These days, we need to include MERGE_HEAD into
that set of files, as the `merge` command will generate them.
Signed-off-by: Johannes Schindelin
---
sequencer.c | 2 ++
1
From: Johannes Schindelin
Since `git rebase -r` was introduced, that is possible. But our
machinery did not think that possible, and failed to say anything about
the rebase in progress when in the middle of a merge.
Let's work around that in the minimal fashion.
Signed-off-by: Johannes
From: Johannes Schindelin
When calling `merge` on a branch that has already been merged, that
`merge` is skipped quietly, but currently a MERGE_HEAD file is being
left behind and will then be grabbed by the next `pick` (that did
not want to create a *merge* commit).
Demonstrate this.
Signed
From: Johannes Schindelin
The scripted version of the rebase used to execute `git reset --hard`
when skipping or aborting. When we ported this to C, we did update the
worktree and some reflogs, but we failed to imitate `git reset --hard`'s
behavior regarding files in .git/ such as MERGE_HEAD
at it, I ran into other issues and fixed them since I was at
it anyway.
Johannes Schindelin (5):
rebase -r: demonstrate bug with conflicting merges
rebase -r: do not write MERGE_HEAD unless needed
rebase -i: include MERGE_HEAD into files to clean up
built-in rebase --skip/--abort: clean up
From: Johannes Schindelin
When editing patches e.g. in `git add -e`, it is quite common that a
hunk ends up having no -/+ lines, i.e. it is now supposed to do nothing.
This use case was broken by ad6e8ed37bc1 (apply: reject a hunk that does
not do anything, 2015-06-01) with the good intention
, this feature was broken, and I had to
start identifying and deleting those hunks with no changes.
I finally got around to find the regression, and to fix it. Here is the
outcome of this effort.
Johannes Schindelin (1):
apply --recount: allow "no-op hunks"
apply.c| 2 +
Hi Ævar,
On Mon, 12 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> On Mon, Nov 12 2018, Johannes Schindelin wrote:
>
> > On Fri, 2 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> >
> >> Move a 37 line for-loop mess out of "install" and into a helper
> >> scr
Hi Elijah,
On Wed, 7 Nov 2018, Elijah Newren wrote:
> Interactive rebases are implemented in terms of cherry-pick rather than
> the merge-recursive builtin, but cherry-pick also calls into the recursive
> merge machinery by default and can accept special merge strategies and/or
> special
Hi Elijah,
On Wed, 7 Nov 2018, Elijah Newren wrote:
> While 'quiet' and 'interactive' may sound like antonyms, the interactive
> machinery actually has logic that implements several
> interactive_rebase=implied cases (--exec, --keep-empty, --rebase-merges)
> which won't pop up an editor. The
Hi,
On Mon, 12 Nov 2018, Junio C Hamano wrote:
> Carlo Marcelo Arenas Belón writes:
>
> > b968372279 ("read-cache: unlink old sharedindex files", 2017-03-06)
> > introduced get_shared_index_expire_date using unsigned long to track
> > the modification times of a shared index.
> >
> >
Hi,
On Mon, 12 Nov 2018, Johannes Schindelin via GitGitGadget wrote:
> In our tests with large repositories, we noticed a serious regression of the
> performance of git rebase when using the built-in vs the shell script
> version. It boils down to an incorrect conversion of a git ch
Hi Ævar,
On Fri, 2 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> Back when git was initially written the likes of "git-add", "git-init"
> etc. were installed in the user's $PATH. A few years later everything,
> with a few exceptions like git-upload-pack and git-receive-pack, was
> expected to be
Hi,
On Fri, 2 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> Move a 37 line for-loop mess out of "install" and into a helper
> script. This started out fairly innocent but over the years has grown
> into a hard-to-maintain monster, and my recent ad874608d8 ("Makefile:
> optionally symlink
From: Johannes Schindelin
We really only need the test helpers in that case, but that is not what
we test for. So let's skip the test for now when we know that we want to
test an installed Git.
Signed-off-by: Johannes Schindelin
---
t/test-lib.sh | 2 +-
1 file changed, 1 insertion(+), 1
From: Johannes Schindelin
In the bin-wrappers/* scripts, we already take pains to use `git.exe`
rather than `git`, as this could pick up the wrong thing on Windows
(i.e. if there exists a `git` file or directory in the build directory).
Now we do the same in the tests' start-up code.
This also
From: Johannes Schindelin
It makes very, very little sense to test the built git-sh-i18n when the
user asked specifically to test another one.
Signed-off-by: Johannes Schindelin
---
t/lib-gettext.sh | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/t/lib-gettext.sh b/t
From: Johannes Schindelin
It really makes very, very little sense to use a different git
executable than the one the caller indicated via setting the environment
variable GIT_TEST_INSTALLED.
Signed-off-by: Johannes Schindelin
---
t/test-lib-functions.sh | 3 ++-
1 file changed, 2 insertions
From: Johannes Schindelin
We really need to be able to find the test helpers... Really. This
change was forgotten when we moved the test helpers into t/helper/
Signed-off-by: Johannes Schindelin
---
t/test-lib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/test
play better with BusyBox.
Triggered by a comment of AEvar
[https://public-inbox.org/git/20181102223743.4331-1-ava...@gmail.com/], I
hereby contribute these assorted fixes for the GIT_TEST_INSTALLED feature.
Johannes Schindelin (5):
tests: fix GIT_TEST_INSTALLED's PATH to include t/helper
Hi Ævar,
On Fri, 2 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> * GIT_TEST_INSTALLED breaks entirely under this, as early as the
>heuristic for "are we built?" being "do we have git-init in
>libexecdir?". I tried a bit to make this work, but there's a lot of
>dependencies there.
I
Hi Carlo,
On Mon, 12 Nov 2018, Carlo Marcelo Arenas Belón wrote:
> specially problematic in Windows where unsigned long is only 32bit wide
> and therefore the assumption that a time_t would fit will lead to loss
> of precision in a 64bit OS.
Both patches look correct to me.
Thanks!
Dscho
>
>
Hi,
On Mon, 12 Nov 2018, Junio C Hamano wrote:
> Olga Telezhnaya writes:
>
> > @@ -876,11 +882,13 @@ static void grab_common_values(struct atom_value
> > *val, int deref, struct expand_
> > name++;
> > if (!strcmp(name, "objecttype"))
> >
From: Johannes Schindelin
Currently, we only accept the flag indicating whether the HEAD should be
detached not. In the next commit, we want to introduce another flag: to
toggle between emulating `reset --hard` vs `checkout -q`.
Signed-off-by: Johannes Schindelin
---
builtin/rebase.c | 9
whether we want to emulate reset --hard
(in which case we use the oneway_merge, otherwise we use twoway_merge).
Johannes Schindelin (3):
rebase: consolidate clean-up code before leaving reset_head()
rebase: prepare reset_head() for more flags
built-in rebase: reinstate `checkout -q` behavior
From: Johannes Schindelin
The same clean-up code is repeated quite a few times; Let's DRY up the
code some.
Signed-off-by: Johannes Schindelin
---
builtin/rebase.c | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/builtin/rebase.c b
From: Johannes Schindelin
When we converted a `git checkout -q $onto^0` call to use
`reset_head()`, we inadvertently incurred a change from a twoway_merge
to a oneway_merge, as if we wanted a `git reset --hard` instead.
This has performance ramifications under certain, though
Hi Junio,
On Mon, 12 Nov 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> > static int reset_head(struct object_id *oid, const char *action,
> >> > - const char *switch_to_branch, int detach_head,
> >> > +
Hi Peff,
On Fri, 9 Nov 2018, Jeff King wrote:
> On Fri, Nov 09, 2018 at 06:21:41PM +0100, Johannes Schindelin wrote:
>
> > Actually, you got me thinking about the desc.buffer. And I think there is
> > one corner case where it could cause a problem: `struct tree_desc
Hi Alban,
On Fri, 9 Nov 2018, Alban Gruin wrote:
> p3400 makes a copy of the current repository to test git-rebase
> performance, and creates new branches in the copy with `git checkout
> -b'. If the original repository has branches with the same name as the
> script is trying to create, this
Hi Peff,
On Fri, 9 Nov 2018, Jeff King wrote:
> On Fri, Nov 09, 2018 at 01:34:19AM -0800, Johannes Schindelin via
> GitGitGadget wrote:
>
> > From: Johannes Schindelin
> >
> > When we converted a `git checkout -q $onto^0` call to use
> > `reset_head()`, w
Hi Peff,
On Fri, 9 Nov 2018, Jeff King wrote:
> On Fri, Nov 09, 2018 at 01:34:17AM -0800, Johannes Schindelin via
> GitGitGadget wrote:
>
> > diff --git a/builtin/rebase.c b/builtin/rebase.c
> > index 0ee06aa363..6f6d7de156 100644
> > --- a/builtin/rebase.c
Hi Ævar,
On Fri, 9 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> Addresses feedback on v3, especially Eric's suggestion to split out
> the behavior change (which I was not aware of) into a 3/3.
For the record, I am fine with this iteration, too.
Ciao,
Dscho
Hi,
On Tue, 2 Oct 2018, Ævar Arnfjörð Bjarmason wrote:
> On Tue, Oct 02 2018, Taylor Blau wrote:
>
> > Hi Stefan,
> >
> > On Sat, Sep 29, 2018 at 04:00:04PM -0700, Stefan Xenos wrote:
> >> Hello, List!
> >>
> >> I'm interested in porting something like Mercurial's evolve command to
> >> Git.
>
Hi Jeff,
On Wed, 26 Sep 2018, Jeffrey Walton wrote:
> Several weeks ago I updated to the latest Git for Windows (when
> prompted by the version check). At the time I noticed:
>
> $ git commit -S -am "Fix unset MAKE variable in test scripts"
> gpg: signing failed: No pinentry
> gpg: signing
Hi Paul,
On Wed, 26 Sep 2018, Paul-Sebastian Ungureanu wrote:
> Sorry for the late reply. I had a lot on my plate for the last couple of
> weeks.
I understand. University can be busy times.
> > > +
> > > + git_config(git_diff_basic_config, NULL);
> >
> > Is this not called in as part of
Hi Paul,
On Wed, 26 Sep 2018, Paul-Sebastian Ungureanu wrote:
> Hi,
>
> > > @@ -1443,9 +1448,10 @@ static int push_stash(int argc, const char
> > > **argv, const char *prefix)
> > > OPT_END()
> > >};
> > > - argc = parse_options(argc, argv, prefix, options,
> > > -
Hi,
On Fri, 9 Nov 2018, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
> >> > I'm not sure about the last paragraph, because:
> >> >
> >> > - It talks about presumed benefits for a currently still
> >> > work-in-progress patch series of an other contributor, and I'm not
> >> > really
Hi Phillip,
On Thu, 8 Nov 2018, Phillip Wood wrote:
> On 07/11/2018 09:41, Junio C Hamano wrote:
> > Here are the topics that have been cooking. Commits prefixed with
> > '-' are only in 'pu' (proposed updates) while commits prefixed with
> > '+' are in 'next'. The ones marked with '.' do not
a formerly missing space between the email addresses of Masaya.
Johannes Schindelin (1):
Update .mailmap
.mailmap | 13 +
1 file changed, 13 insertions(+)
base-commit: 8858448bb49332d353febc078ce4a3abcc962efe
Published-As:
https://github.com/gitgitgadget/git/releases/tags/pr-71%2Fdscho
From: Johannes Schindelin
This patch makes the output of `git shortlog -nse v2.10.0..master`
duplicate-free.
Signed-off-by: Johannes Schindelin
---
.mailmap | 13 +
1 file changed, 13 insertions(+)
diff --git a/.mailmap b/.mailmap
index bef3352b0d..eb7b5fc7b9 100644
Hi Junio,
On Fri, 9 Nov 2018, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > This patch makes the output of `git shortlog -nse v2.10.0`
> > duplicate-free.
>
> Did you mean &qu
whether we want to emulate reset --hard
(in which case we use the oneway_merge, otherwise we use twoway_merge).
Johannes Schindelin (2):
rebase: consolidate clean-up code before leaving reset_head()
built-in rebase: reinstate `checkout -q` behavior where appropriate
builtin/rebase.c | 60
From: Johannes Schindelin
When we converted a `git checkout -q $onto^0` call to use
`reset_head()`, we inadvertently incurred a change from a twoway_merge
to a oneway_merge, as if we wanted a `git reset --hard` instead.
This has performance ramifications under certain, though
From: Johannes Schindelin
The same clean-up code is repeated quite a few times; Let's DRY up the
code some.
Signed-off-by: Johannes Schindelin
---
builtin/rebase.c | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index
From: Johannes Schindelin
This patch makes the output of `git shortlog -nse v2.10.0`
duplicate-free.
Signed-off-by: Johannes Schindelin
---
.mailmap | 13 +
1 file changed, 13 insertions(+)
diff --git a/.mailmap b/.mailmap
index bef3352b0d..1d8310073a 100644
--- a/.mailmap
+++ b
I noticed that there were a couple of duplicate entries in git shortlog -nse
v2.19.1.., and then continued a bit to remove the duplicate entries even for
v2.10.0..
Johannes Schindelin (1):
Update .mailmap
.mailmap | 13 +
1 file changed, 13 insertions(+)
base-commit
Hi Junio,
On Thu, 8 Nov 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > But now I have a really crazy idea: how about ~~/ssl/certs/ca-bundle.crt?
> > The `~` prefix is *already* a reserved character,...
>
> We would need to prepare for a future w
Hi Duy,
On Thu, 8 Nov 2018, Duy Nguyen wrote:
> On Thu, Nov 8, 2018 at 2:14 PM Johannes Schindelin
> wrote:
> >
> > On Wed, 7 Nov 2018, Jeff King wrote:
> >
> > > All that said, if we're just interested in allowing this for config,
> > > th
Hi Junio,
On Thu, 8 Nov 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Thu, 8 Nov 2018, Junio C Hamano wrote:
> >
> >> I am tempted to say "///" might also be such a
> >> way, even in the POSIX world, but am not brave en
Hi Peff,
On Wed, 7 Nov 2018, Jeff King wrote:
> All that said, if we're just interested in allowing this for config,
> then we already have such a wrapper function: git_config_pathname().
Good point. I agree that `git_config_pathname()` is a better home for this
feature than
Hi,
On Thu, 8 Nov 2018, Junio C Hamano wrote:
> I am tempted to say "///" might also be such a
> way, even in the POSIX world, but am not brave enough to do so, as I
> suspect that may have a fallout in the Windows world X-<.
It does. //server/share is the way we refer to UNC paths (AKA network
the regression test, and then the (quite simple) fix.
AEvar, sorry for the ASCII-fication of your name, I still did not find the
time to look at the GitGitGadget bug closely where it does the wrong thing
when Cc:ing with non-ASCII names.
Johannes Schindelin (2):
built-in rebase: demonstrate
From: Johannes Schindelin
An unnamed colleague of Ævar Arnfjörð Bjarmason reported a breakage
where a `pull --rebase` (which did not really need to do anything but
stash, see that nothing was changed, and apply the stash again) also
detached the HEAD.
This patch adds a minimal reproducer
From: Johannes Schindelin
When we converted a `git reset --hard` call in the original Unix shell
script to built-in code, we asked to reset the worktree and the index
and explicitly *not* to detach the HEAD. By mistake, though, we still
did. Let's fix this.
Signed-off-by: Johannes Schindelin
Hi Ævar,
On Tue, 6 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
>
> On Tue, Oct 23 2018, Johannes Schindelin via GitGitGadget wrote:
>
> > Johannes Schindelin (2):
> > rebase --autostash: demonstrate a problem with dirty submodules
> > rebase --autostash: fix
Hi,
On Wed, 7 Nov 2018, Junio C Hamano wrote:
> Johannes Sixt writes:
>
> > Am 07.11.18 um 02:32 schrieb Junio C Hamano:
> >> Johannes Sixt writes:
> >>> On Linux, when I recompile for a different architecture, CFLAGS would
> >>> change, so I would have thought that GIT-CFLAGS were the
Hi Hannes,
On Tue, 6 Nov 2018, Johannes Sixt wrote:
> Am 06.11.18 um 15:53 schrieb Johannes Schindelin via GitGitGadget:
> > From: Johannes Schindelin
> >
> > On Windows, an absolute POSIX path needs to be turned into a Windows
> > one.
>
> If I were picky, I
Hi,
On Tue, 6 Nov 2018, Duy Nguyen wrote:
> On Tue, Nov 6, 2018 at 3:55 PM Johannes Schindelin via GitGitGadget
> wrote:
> >
> > From: Johannes Schindelin
> >
> > On Windows, an absolute POSIX path needs to be turned into a Windows
> > one.
> &
Hi,
On Wed, 7 Nov 2018, Junio C Hamano wrote:
> Ramsay Jones writes:
>
> > On 06/11/2018 14:53, Johannes Schindelin via GitGitGadget wrote:
> >> From: Johannes Schindelin
> >>
> >> On Windows, an absolute POSIX path needs to be turned into a
Hi,
On Wed, 7 Nov 2018, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
> > diff --git a/builtin/range-diff.c b/builtin/range-diff.c
> > index f01a0be851..05d1f6b6b6 100644
> > --- a/builtin/range-diff.c
> > +++ b/builtin/range-diff.c
> > @@ -16,11 +16,14 @@ int cmd_range_diff(int
Me again,
On Wed, 7 Nov 2018, Johannes Schindelin wrote:
> On Wed, 7 Nov 2018, Johannes Schindelin wrote:
>
> > On Wed, 7 Nov 2018, Johannes Schindelin wrote:
> >
> > > On Tue, 6 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> > >
> > > >
Hi Ævar,
On Wed, 7 Nov 2018, Johannes Schindelin wrote:
> On Wed, 7 Nov 2018, Johannes Schindelin wrote:
>
> > On Tue, 6 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> >
> > > On Tue, Nov 06 2018, Johannes Schindelin wrote:
> > >
> > > > O
Hi Ævar,
On Wed, 7 Nov 2018, Johannes Schindelin wrote:
> On Tue, 6 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
>
> > On Tue, Nov 06 2018, Johannes Schindelin wrote:
> >
> > > On Mon, 5 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> > >
> > &
Hi Ævar,
On Tue, 6 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> On Tue, Nov 06 2018, Johannes Schindelin wrote:
>
> > On Mon, 5 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
> >
> >> On Mon, Nov 05 2018, Eric Sunshine wrote:
> >>
> >> > On Mon
ows builds.
Johannes Schindelin (1):
Windows: force-recompile git.res for differing architectures
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
base-commit: cd69ec8cde54af1817630331fc441f493866f0d4
Published-As:
https://github.com/gitgitgadget/git/releases/tags/pr-67%2Fdscho%2Fmin
From: Johannes Schindelin
When git.rc is compiled into git.res, the result is actually dependent
on the architecture. That is, you cannot simply link a 32-bit git.res
into a 64-bit git.exe.
Therefore, to allow 32-bit and 64-bit builds in the same directory, we
let git.res depend on GIT-PREFIX
From: Johannes Schindelin
On Windows, an absolute POSIX path needs to be turned into a Windows
one.
Signed-off-by: Johannes Schindelin
---
path.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/path.c b/path.c
index 34f0f98349..a72abf0e1f 100644
--- a/path.c
+++ b/path.c
@@ -11,6
s list has a clever idea how we could specify paths
(unambiguously, even on non-Windows platforms) that Git should interpret as
relative to the runtime prefix?
Johannes Schindelin (1):
mingw: handle absolute paths in expand_user_path()
path.c | 5 +
1 file changed, 5 insertions(+)
b
List,
I have no idea why this mail made it to GitGitGadget's email account but
not to the Git mailing list... Sorry about that.
Ciao,
Johannes
On Wed, 31 Oct 2018, Chris. Webster via GitGitGadget wrote:
> From: "Chris. Webster"
>
> Use File::Spec->devnull() for output redirection to avoid
101 - 200 of 5954 matches
Mail list logo
