On Thu, Jan 31, 2019 at 2:44 AM Duy Nguyen wrote:
> On Thu, Jan 31, 2019 at 1:25 PM Eric Sunshine wrote:
> > I find, however, that the top-level git-switch "DESCRIPTION" section,
> > which talks about "switching branches" doesn't actually ever explain
> > what it means to "switch" to a branch. Ev
On Tue, Jan 29, 2019 at 02:15:36PM -0800, Junio C Hamano wrote:
> * dl/merge-cleanup-scissors-fix (2019-01-27) 5 commits
> - init docs: correct a punctuation typo
> - merge: add scissors line on merge conflict
> - merge: cleanup messages like commit
> - t7600: clean up 'merge --squash c3 with c
On Thu, Jan 31, 2019 at 1:25 PM Eric Sunshine wrote:
> I find, however, that the top-level git-switch "DESCRIPTION" section,
> which talks about "switching branches" doesn't actually ever explain
> what it means to "switch" to a branch. Even adding a simple sentence
> stating that "switching to a
On Wed, Jan 30, 2019 at 4:50 AM Nguyễn Thái Ngọc Duy wrote:
> The new command "git switch" is added to avoid the confusion of
> one-command-do-all "git checkout" for new users. They are also helpful
> to avoid ambiguation context.
>
> For these reasons, promote it everywhere possible. This include
Just to clarify, I made a mistake above. Instead of "untracked", I
meant "unstaged".
I apologise for the confusion.
On Thu, Jan 31, 2019 at 9:01 AM Angelo Melonas wrote:
>
> Good day,
>
> I found a potential bug in Git for Windows. The bug can be reproduced
> as follows:
>
> 1. Modify a file so t
Hi Ævar,
On Wed, 30 Jan 2019, Ævar Arnfjörð Bjarmason wrote:
> Let's get some numbers then. On master, go to the "t" directory and run
> this:
>
> for f in t[0-9]*.sh; do (echo '#!/bin/sh' && echo "echo ok 1 $f" && echo
> sleep 1 && echo echo 1..1) >$f; done
>
> That effectively turns all o
On Thu, Jan 31, 2019 at 1:24 AM Eric Sunshine wrote:
> On Thu, Jan 31, 2019 at 12:29 AM Duy Nguyen wrote:
> > On Thu, Jan 31, 2019 at 7:50 AM Eric Sunshine
> > wrote:
> > > On Wed, Jan 30, 2019 at 4:49 AM Nguyễn Thái Ngọc Duy
> > > wrote:
> > > > +'git switch' [] [--guess]
> > > > +'git swit
On Wed, Jan 30, 2019 at 4:50 AM Nguyễn Thái Ngọc Duy wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh
> @@ -0,0 +1,91 @@
> +test_expect_success 'switch and create branch' '
> + test_when_finished git switch master &&
> + git switc
On Wed, Jan 30, 2019 at 4:49 AM Nguyễn Thái Ngọc Duy wrote:
> The shortcut of these options do not make much sense when used with
> switch. And their descriptions are also tied to checkout
> out. Move -b/-B to cmd_checkout() and new -c/-C with the same
> functionality in cmd_switch_branch()
>
> Si
Good day,
I found a potential bug in Git for Windows. The bug can be reproduced
as follows:
1. Modify a file so that it shows up as "untracked" when executing the
"git status" command.
2. Attempt to "git add" the file, but change the case of a single
letter. The command executes but no warning or
On Thu, Jan 31, 2019 at 12:29 AM Duy Nguyen wrote:
> On Thu, Jan 31, 2019 at 7:50 AM Eric Sunshine wrote:
> > On Wed, Jan 30, 2019 at 4:49 AM Nguyễn Thái Ngọc Duy
> > wrote:
> > > +'git switch' [] [--guess]
> > > +'git switch' [] --detach [>]
> > > +'git switch' [] [[-c|-C|--orphan] ] []
> >
>
On Thu, Jan 31, 2019 at 3:02 AM SZEDER Gábor wrote:
>
> I think we should remove most (all?) CI-related microprojects.
Yeah, I agree that they don't make sense anymore.
> Ok, after suggesting the removal of five microproject ideas, here is a
> suggestion for a new one:
>
> Find a test script t
On Wed, Dec 12, 2018 at 2:23 AM Duy Nguyen wrote:
>
> On Tue, Dec 11, 2018 at 7:12 AM Elijah Newren wrote:
> >
> > On Mon, Dec 10, 2018 at 7:13 PM Junio C Hamano wrote:
> > >
> > > Duy Nguyen writes:
> > >
> > > > Elijah wanted another mode (and I agree) that modifies worktree but
> > > > leave
On Thu, Jan 31, 2019 at 7:50 AM Eric Sunshine wrote:
>
> On Wed, Jan 30, 2019 at 4:49 AM Nguyễn Thái Ngọc Duy
> wrote:
> > "git checkout" doing too many things is a source of confusion for many
> > users (and it even bites old timers sometimes). To remedy that, the
> > command will be split into
On Tue, Jan 22, 2019 at 10:17:59AM +0100, Christian Couder wrote:
> - microprojects idea for interested students (like
> https://git.github.io/SoC-2018-Microprojects/)
> Suggestions for microprojects or project ideas are welcome! Volunteers
> for mentoring or org admin are welcome too!
I think we
On Wed, Jan 30, 2019 at 4:49 AM Nguyễn Thái Ngọc Duy wrote:
> "git checkout" doing too many things is a source of confusion for many
> users (and it even bites old timers sometimes). To remedy that, the
> command will be split into two new ones: switch and
> something-to-checkout-paths. The good o
Hi,
Jeremy Huddleston Sequoia wrote:
> Unfortunately, I was quick to celebrate. This picks up the bundled
> file instead of a system-wide file. I'd love it if we could still
> honor system-wide config/attributes in addition to
> RUNTIME_PREFIX-relative ones (eg: user overrides system which
> ov
On Wed, Jan 30, 2019 at 6:21 PM Max Kirillov wrote:
> If packed-refs is marked as sorted but not really sorted it causes
> very hard to comprehend misbehavior of reference resolving - a reference
> is reported as not found.
>
> As the scope of the issue is not clear, make it visible by failing
> p
If packed-refs is marked as sorted but not really sorted it causes
very hard to comprehend misbehavior of reference resolving - a reference
is reported as not found.
As the scope of the issue is not clear, make it visible by failing
pack-refs command - the one which would not suffer performance pe
> On Jan 30, 2019, at 13:09, Jeremy Huddleston Sequoia
> wrote:
>
>
>
>> On Jan 30, 2019, at 11:32, Johannes Schindelin
>> wrote:
>>
>> Hi Jeremy,
>>
>> On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
>>
On Jan 29, 2019, at 3:10 PM, Junio C Hamano wrote:
Jeremy H
On Thu, Jan 31, 2019 at 12:05 AM Philip Oakley wrote:
>
> On 30/01/2019 20:57, Ævar Arnfjörð Bjarmason wrote:
> >
> > * "Big repos". We had discussions about this in years past. It's a very
> >spawly and vague topic. Do we mean big history, big blobs, big (in
> >size/depth/width) checkouts
On Tue, Jan 22, 2019 at 02:50:27AM -0500, Jeff King wrote:
> If you're not coming, you can probably stop reading this message now.
> The rest is all logistics.
Here are a few additional last-minute logistics:
> For people who want to try to join remotely, I don't think we're going
> to have a pa
On 30/01/2019 20:57, Ævar Arnfjörð Bjarmason wrote:
On Tue, Jan 22 2019, Jeff King wrote:
There's no set agenda; we'll decide what to discuss that day. But if
anybody would like to mention topics they are interested in (whether you
want to present on them, or just have an open discussion), plea
On 1/30/2019 3:57 PM, Ævar Arnfjörð Bjarmason wrote:
On Tue, Jan 22 2019, Jeff King wrote:
...
* "Structured remote logging". We had an RFC spec for turning our trace
format into something more structural with a way to send it to a
remote server. There were both implementation & priv
On Wed, Jan 30, 2019 at 1:51 PM Victor Porton wrote:
>
> On 30/01/2019 23:49, Jacob Keller wrote:
> > On Wed, Jan 30, 2019 at 7:22 AM Victor Porton wrote:
> >> I want Git to display all branches created by me.
> >>
> >> So we need the new feature of Git, to display all branches created by a
> >>
On Wed, Jan 30, 2019 at 7:22 AM Victor Porton wrote:
>
> I want Git to display all branches created by me.
>
> So we need the new feature of Git, to display all branches created by a
> given user ("me" by default).
>
> I think, the similar feature for tags may also be useful.
>
Branches don't con
SZEDER Gábor wrote:
> The 'git cat-file's error message and hints are translated, so they
> should be checked by 'test_i18ngrep' instead of plain old grep.
Thanks, here's v2 with test_i18ngrep
8<--
Subject: [PATCH] t1512: test ambiguous cat-file --batch and --batch-output
Test the n
> On Jan 30, 2019, at 11:32, Johannes Schindelin
> wrote:
>
> Hi Jeremy,
>
> On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
>
>>> On Jan 29, 2019, at 3:10 PM, Junio C Hamano wrote:
>>>
>>> Jeremy Huddleston Sequoia writes:
>>>
Useful for setting up osxkeychain in Xcode.app's
> On Jan 30, 2019, at 11:26, Johannes Schindelin
> wrote:
>
> Hi Jeremy,
>
> On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
>
>> This patch has been trimmed down significantly from its original version
>> when rebasing on top of git 2.18 because git 2.18 included support for
>> runti
From: Jeff Hostetler
Add optional platform-specific code to log information about
the current process.
On Windows, this includes whether git.exe is running under a
debugger and information about the ancestors of the process.
The purpose of this information is to help indicate if the
process was
From: Jeff Hostetler
Created design document for Trace2 feature.
Signed-off-by: Jeff Hostetler
---
Documentation/technical/api-trace2.txt | 1347
1 file changed, 1347 insertions(+)
create mode 100644 Documentation/technical/api-trace2.txt
diff --git a/Documentation/t
From: Jeff Hostetler
Add trace2_region_enter() and trace2_region_leave() calls around the
various phases of a status scan. This gives elapsed time for each
phase in the GIT_TR2_PERF and GIT_TR2_EVENT trace target.
Also, these Trace2 calls now use s->repo rather than the_repository.
Signed-off-
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
builtin/reset.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/builtin/reset.c b/builtin/reset.c
index 59898c972e..b65b4a66db 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -340,6 +340,7 @@ int cmd_reset(int argc, const ch
From: Jeff Hostetler
Create a new unified tracing facility for git. The eventual intent is to
replace the current trace_printf* and trace_performance* routines with a
unified set of git_trace2* routines.
In addition to the usual printf-style API, trace2 provides higer-level
event verbs with fix
From: Jeff Hostetler
Add trace2 process classification for editor and pager
child processes.
Signed-off-by: Jeff Hostetler
---
editor.c | 1 +
pager.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/editor.c b/editor.c
index c985eee1f9..71547674ab 100644
--- a/editor.c
+++ b/editor.c
@@
From: Jeff Hostetler
Add trace2 classification for long-running processes
started in sub-process.c
Signed-off-by: Jeff Hostetler
---
sub-process.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sub-process.c b/sub-process.c
index 8d2a1707cf..3f4af93555 100644
--- a/sub-process.c
+++ b/sub
From: Derrick Stolee
When studying the performance of 'git push' we would like to know
how much time is spent at various parts of the command. One area
that could cause performance trouble is 'git pack-objects'.
Add trace2 regions around the three main actions taken in this
command:
1. Enumerat
From: Jeff Hostetler
Add trace2 events to measure reading and writing the index.
Signed-off-by: Jeff Hostetler
---
read-cache.c | 51 ++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/read-cache.c b/read-cache.c
index bfff271a3d..
From: Jeff Hostetler
Classify certain child processes as hooks.
Signed-off-by: Jeff Hostetler
---
builtin/am.c | 1 +
builtin/receive-pack.c | 4
builtin/worktree.c | 1 +
sequencer.c| 2 ++
transport.c| 1 +
5 files changed, 9 insertions(+)
diff --g
On Tue, Jan 22 2019, Jeff King wrote:
> There's no set agenda; we'll decide what to discuss that day. But if
> anybody would like to mention topics they are interested in (whether you
> want to present on them, or just have an open discussion), please do so
> here. A little advance notice can he
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
builtin/checkout.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 6fadf412e8..8939ae99ed 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -262,6 +262,8 @@ static int check
From: Jeff Hostetler
Add trace2 child classification for transport processes.
Signed-off-by: Jeff Hostetler
---
connect.c | 3 +++
transport-helper.c | 2 ++
2 files changed, 5 insertions(+)
diff --git a/connect.c b/connect.c
index 24281b6082..3c6f829a05 100644
--- a/connect.c
+++ b/
Sorry to spam the list, but here is V4. After building V3 on 3 platforms
without error and submitting, the compilers on platforms 4 and 5 complained
about a variable declaration. (sigh) [] fix declaration after first
statement [] add -DNO_UNIX_SOCKETS to BASIC_CFLAGS when NO_UNIX_SOCKETS is
defined
From: Jeff Hostetler
Create unit tests for Trace2.
Signed-off-by: Jeff Hostetler
---
Makefile | 1 +
t/helper/test-tool.c | 1 +
t/helper/test-tool.h | 1 +
t/helper/test-trace2.c| 274 ++
t/t0210-trace2-normal.sh | 135
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
builtin/rebase.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 774264bae8..49cef31184 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -850,6 +850,14 @@ int cmd_rebas
> On Jan 30, 2019, at 11:15, Johannes Schindelin
> wrote:
>
> Hi Jeremy,
>
> On Wed, 30 Jan 2019, Jeremy Huddleston Sequoia wrote:
>
>>> On Jan 30, 2019, at 01:50, brian m. carlson
>>> wrote:
>>>
>>> On Tue, Jan 29, 2019 at 11:38:15AM -0800, Jeremy Huddleston Sequoia wrote:
See
>>>
From: Jeff Hostetler
Add trace2 child classification for transport processes.
Signed-off-by: Jeff Hostetler
---
connect.c | 3 +++
transport-helper.c | 2 ++
2 files changed, 5 insertions(+)
diff --git a/connect.c b/connect.c
index 24281b6082..3c6f829a05 100644
--- a/connect.c
+++ b/
From: Jeff Hostetler
Create a new unified tracing facility for git. The eventual intent is to
replace the current trace_printf* and trace_performance* routines with a
unified set of git_trace2* routines.
In addition to the usual printf-style API, trace2 provides higer-level
event verbs with fix
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
builtin/rebase.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 774264bae8..49cef31184 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -850,6 +850,14 @@ int cmd_rebas
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
builtin/reset.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/builtin/reset.c b/builtin/reset.c
index 59898c972e..b65b4a66db 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -340,6 +340,7 @@ int cmd_reset(int argc, const ch
V3 addresses: [] re-fix the trace2 tests using an inline environment
variable rather than exporting and unsetting. [] overhaul the design
document to include prototype declarations and more file format information.
[] incorporate most of the suggestions from clang-format. [] add ability to
trace to
From: Jeff Hostetler
Create unit tests for Trace2.
Signed-off-by: Jeff Hostetler
---
Makefile | 1 +
t/helper/test-tool.c | 1 +
t/helper/test-tool.h | 1 +
t/helper/test-trace2.c| 274 ++
t/t0210-trace2-normal.sh | 135
From: Jeff Hostetler
Created design document for Trace2 feature.
Signed-off-by: Jeff Hostetler
---
Documentation/technical/api-trace2.txt | 1347
1 file changed, 1347 insertions(+)
create mode 100644 Documentation/technical/api-trace2.txt
diff --git a/Documentation/t
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
builtin/checkout.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 6fadf412e8..8939ae99ed 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -262,6 +262,8 @@ static int check
From: Jeff Hostetler
Add trace2 process classification for editor and pager
child processes.
Signed-off-by: Jeff Hostetler
---
editor.c | 1 +
pager.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/editor.c b/editor.c
index c985eee1f9..71547674ab 100644
--- a/editor.c
+++ b/editor.c
@@
From: Derrick Stolee
When studying the performance of 'git push' we would like to know
how much time is spent at various parts of the command. One area
that could cause performance trouble is 'git pack-objects'.
Add trace2 regions around the three main actions taken in this
command:
1. Enumerat
From: Jeff Hostetler
Add trace2 events to measure reading and writing the index.
Signed-off-by: Jeff Hostetler
---
read-cache.c | 51 ++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/read-cache.c b/read-cache.c
index bfff271a3d..
From: Jeff Hostetler
Classify certain child processes as hooks.
Signed-off-by: Jeff Hostetler
---
builtin/am.c | 1 +
builtin/receive-pack.c | 4
builtin/worktree.c | 1 +
sequencer.c| 2 ++
transport.c| 1 +
5 files changed, 9 insertions(+)
diff --g
From: Jeff Hostetler
Add trace2 classification for long-running processes
started in sub-process.c
Signed-off-by: Jeff Hostetler
---
sub-process.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sub-process.c b/sub-process.c
index 8d2a1707cf..3f4af93555 100644
--- a/sub-process.c
+++ b/sub
From: Jeff Hostetler
Add trace2_region_enter() and trace2_region_leave() calls around the
various phases of a status scan. This gives elapsed time for each
phase in the GIT_TR2_PERF and GIT_TR2_EVENT trace target.
Also, these Trace2 calls now use s->repo rather than the_repository.
Signed-off-
From: Jeff Hostetler
Add optional platform-specific code to log information about
the current process.
On Windows, this includes whether git.exe is running under a
debugger and information about the ancestors of the process.
The purpose of this information is to help indicate if the
process was
> On Jan 30, 2019, at 05:43, Johannes Schindelin
> wrote:
>
> Hi Jeremy,
>
> On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
>
>> Signed-off-by: Jeremy Huddleston Sequoia
>> ---
>> GIT-VERSION-GEN | 4
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/GIT-VERSION-GEN b/GIT-V
> On Jan 30, 2019, at 05:36, Johannes Schindelin
> wrote:
>
> Hi Jeremy,
>
> On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
>
>> Signed-off-by: Jeremy Huddleston Sequoia
>
>
> That commit message is again very short. Only because I remember the
> previous patch's commit message do
Hi Junio,
On Wed, 30 Jan 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Tue, 29 Jan 2019, Junio C Hamano wrote:
> >
> >> Jeremy Huddleston Sequoia writes:
> >>
> >> > Signed-off-by: Jeremy Huddleston Sequoia
> >> > ---
> >> > builtin/help.c | 2 +-
> >> > 1 file changed,
Hi Jeremy,
On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
> > On Jan 29, 2019, at 3:10 PM, Junio C Hamano wrote:
> >
> > Jeremy Huddleston Sequoia writes:
> >
> >> Useful for setting up osxkeychain in Xcode.app's gitconfig
> >>
> >> Signed-off-by: Jeremy Huddleston Sequoia
> >> ---
>
On Wed, Jan 30 2019, Johannes Schindelin wrote:
> Hi Ævar,
>
> On Wed, 30 Jan 2019, Ævar Arnfjörð Bjarmason wrote:
>
>> On Wed, Jan 30 2019, Johannes Schindelin wrote:
>>
>> > On Tue, 29 Jan 2019, Ævar Arnfjörð Bjarmason wrote:
>> >
>> >> On Tue, Jan 29 2019, Jeff King wrote:
>> >>
>> >> > On Tu
Hi Jeremy,
On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
> This patch has been trimmed down significantly from its original version
> when rebasing on top of git 2.18 because git 2.18 included support for
> runtime prefix support for darwin, making this patch mostly duplicative.
>
> The
Hi Jeremy,
On Wed, 30 Jan 2019, Jeremy Huddleston Sequoia wrote:
> > On Jan 30, 2019, at 01:50, brian m. carlson
> > wrote:
> >
> > On Tue, Jan 29, 2019 at 11:38:15AM -0800, Jeremy Huddleston Sequoia wrote:
> >> See
> >
> > It's my understanding that Radars aren't public. Could you summarize
> On Jan 30, 2019, at 04:42, Johannes Schindelin
> wrote:
>
> Hi Jeremy,
>
> On Wed, 30 Jan 2019, Jeremy Huddleston Sequoia wrote:
>
>>> On Jan 30, 2019, at 03:33, Eric Sunshine wrote:
>>>
>>> On Tue, Jan 29, 2019 at 3:11 PM Jeremy Huddleston Sequoia
>>> wrote:
This was causing prob
Hi Jeremy,
On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
> See
>
> Signed-off-by: Jeremy Huddleston Sequoia
You know yourself how to improve this commit message rather dramatically.
> ---
> git-mergetool--lib.sh | 6 --
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff
On 1/29/2019 5:15 PM, Junio C Hamano wrote:
* jh/trace2 (2019-01-28) 14 commits
- trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
- trace2:data: add subverb for rebase
- trace2:data: add subverb to reset command
- trace2:data: add subverb to checkout command
- pack-object
Roland Hieber writes:
> The output of git-reflog is currently only customizable by calling
> reflog with --pretty=... or overriding the default "oneline" pretty
> format in the configuration.
Sounds like a good idea to me, but the patch needs a bit more work:
> Documentation/git-reflog.txt |
> On Jan 30, 2019, at 05:12, Johannes Schindelin
> wrote:
>
> Hi Jeremy,
>
> On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
>
>> Signed-off-by: Jeremy Huddleston Sequoia
>
> As Eric pointed out, commits with such a vanishing commit message are
> very, very sad commits. And somewhere
Jeremy Sequoia writes:
>> On Jan 29, 2019, at 15:59, SZEDER Gábor wrote:
>>
>>> On Tue, Jan 29, 2019 at 03:46:07PM -0800, Jeremy Huddleston Sequoia wrote:
>>>
>>>
On Jan 29, 2019, at 2:47 PM, Junio C Hamano wrote:
This obviously won't be acceptable as-is to my tree. Shouldn'
Force pushing to subtree remotes can occasionally be a useful workflow,
particularly when the remote uses a workflow like GitHub pull requests.
Signed-off-by: Joshua Watt
---
contrib/subtree/git-subtree.sh | 14 +-
contrib/subtree/git-subtree.txt | 9 +
2 files changed, 22
On 1/25/2019 3:03 PM, Josh Steadmon wrote:
On 2019.01.22 13:22, Jeff Hostetler via GitGitGadget wrote:
This patch series contains a greatly refactored version of my original
Trace2 series [1] from August 2018.
A new design doc in Documentation/technical/api-trace2.txt (in the first
commit) e
Sent from my iPhone...
> On Jan 30, 2019, at 04:51, Johannes Schindelin
> wrote:
>
> Hi Jeremy,
>
> On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
>
>>> On Jan 29, 2019, at 2:47 PM, Junio C Hamano wrote:
>>>
>>> Jeremy Huddleston Sequoia writes:
>>>
Signed-off-by: Jeremy Hu
Hi Ævar,
On Wed, 30 Jan 2019, Ævar Arnfjörð Bjarmason wrote:
> On Wed, Jan 30 2019, Johannes Schindelin wrote:
>
> > On Tue, 29 Jan 2019, Ævar Arnfjörð Bjarmason wrote:
> >
> >> On Tue, Jan 29 2019, Jeff King wrote:
> >>
> >> > On Tue, Jan 29, 2019 at 06:56:08AM -0800, Derrick Stolee via
> >> >
Sent from my iPhone
Hi everyone
I have asked this question in Super User but I have not got answer. I
have described details in the my question__ link in available in
bottom__ but for more information I add following info:
I checked one of my past projects and I notice that
".git/objects/pack" directory exist but th
On Wed, Jan 30, 2019 at 10:24:44AM -0500, Jason Pyeron wrote:
> > -Original Message-
> > From: git-ow...@vger.kernel.org On Behalf Of
> > tbo...@web.de
> > Sent: Wednesday, January 30, 2019 10:02 AM
> > To: git@vger.kernel.org; adrigi...@gmail.com
> > Cc: Torsten Bögershausen
> > Subject:
Johannes Schindelin writes:
> Hi Junio,
>
> On Tue, 29 Jan 2019, Junio C Hamano wrote:
>
>> Jeremy Huddleston Sequoia writes:
>>
>> > Signed-off-by: Jeremy Huddleston Sequoia
>> > ---
>> > builtin/help.c | 2 +-
>> > 1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/builtin
Duy Nguyen writes:
>> My function is a modified version of check_describe().
>
> Whoa. That function is 12 years old! I think our style has evolved a
> bit since then.
;-).
> I mean chaining within a test. This is to make sure any failure
> triggers the test failure (as it should, if some comma
Jeremy Huddleston Sequoia writes:
> This was causing problems with ppc/sha1ppc.S
"causing problems"? How? The source file is already tracked so
"git add" to record updates to it would work just fine, and "git
status" would report "modified" for it, with or without "*.S" in the
.gitignore file,
> -Original Message-
> From: git-ow...@vger.kernel.org On Behalf Of
> tbo...@web.de
> Sent: Wednesday, January 30, 2019 10:02 AM
> To: git@vger.kernel.org; adrigi...@gmail.com
> Cc: Torsten Bögershausen
> Subject: [PATCH v3 1/1] Support working-tree-encoding "UTF-16LE-BOM"
>
> From: Tors
On Wed, Jan 30, 2019 at 4:30 AM Jeff Hostetler wrote:
> BTW, how do you find these? I ran both "make sparse" and
> "make DEVELOPER=1" and it didn't complain about these items.
$ make hdr-check
available since ebb7baf02f ("Makefile: add a hdr-check target", 2018-09-19)
Carlo
I want Git to display all branches created by me.
So we need the new feature of Git, to display all branches created by a
given user ("me" by default).
I think, the similar feature for tags may also be useful.
From: Sun Chao
The objects in alt-odb are removed from `all_objects` twice in
`load_all_objects`
and `scan_alt_odb_packs`, remove it from the later function.
Signed-off-by: Sun Chao
---
builtin/pack-redundant.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/builtin/pack-redundant.c b/buil
From: Torsten Bögershausen
Users who want UTF-16 files in the working tree set the .gitattributes
like this:
test.txt working-tree-encoding=UTF-16
The unicode standard itself defines 3 allowed ways how to encode UTF-16.
The following 3 versions convert all back to 'g' 'i' 't' in UTF-8:
a) UTF-1
The output of git-reflog is currently only customizable by calling
reflog with --pretty=... or overriding the default "oneline" pretty
format in the configuration. To save typing, teach reflog to fall back
to a default format specified in the config option "reflog.pretty"
unless a different pretty
Hi Junio,
On Tue, 29 Jan 2019, Junio C Hamano wrote:
> Jeremy Huddleston Sequoia writes:
>
> > Signed-off-by: Jeremy Huddleston Sequoia
> > ---
> > builtin/help.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/builtin/help.c b/builtin/help.c
> > index 7739a5c15
Hi Jeremy,
On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
> Signed-off-by: Jeremy Huddleston Sequoia
> ---
> GIT-VERSION-GEN | 4
> 1 file changed, 4 insertions(+)
>
> diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
> index d1a2814ec7..6fb90854b9 100755
> --- a/GIT-VERSION-GEN
> +++
Hi Jeremy,
On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
> Signed-off-by: Jeremy Huddleston Sequoia
That commit message is again very short. Only because I remember the
previous patch's commit message do I have a clue what this is about.
You definitely need to write something here abo
Hi Jeremy,
On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
> 480871e09e ("format-patch: show base info before email signature",
> 2016-09-07) added a helper function to recreate the signature at the end
> of the e-mail, i.e. "-- " line followed by the version string of Git,
> using output f
Hi Jeremy,
On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
> Signed-off-by: Jeremy Huddleston Sequoia
As Eric pointed out, commits with such a vanishing commit message are
very, very sad commits. And somewhere, a kitten dies every time you submit
such a commit.
> +test_expect_success ' -
On Wed, Jan 30 2019, Johannes Schindelin wrote:
> Hi Ævar,
>
> On Tue, 29 Jan 2019, Ævar Arnfjörð Bjarmason wrote:
>
>> On Tue, Jan 29 2019, Jeff King wrote:
>>
>> > On Tue, Jan 29, 2019 at 06:56:08AM -0800, Derrick Stolee via
>> > GitGitGadget wrote:
>> >
>> >> From: Derrick Stolee
>> >>
>> >>
Hi Jeremy,
On Tue, 29 Jan 2019, Jeremy Huddleston Sequoia wrote:
> > On Jan 29, 2019, at 2:47 PM, Junio C Hamano wrote:
> >
> > Jeremy Huddleston Sequoia writes:
> >
> >> Signed-off-by: Jeremy Huddleston Sequoia
> >> ---
> >> t/test-lib.sh | 3 +++
> >> 1 file changed, 3 insertions(+)
> >
>
On Wed, Jan 30, 2019 at 11:31:15AM +0100, Sebastian Staudt wrote:
> > Yeah, my reasoning was that we handed off to diff-index, so if it
> > doesn't work, then it has its own bug. ;) But I agree it is probably
> > better to just be explicit.
>
> Thanks for that valuable feedback.
> Is there some t
On Wed, Jan 30, 2019 at 11:23:14AM +0100, Sebastian Staudt wrote:
> > >> +grep 'A-\d\+-g[0-9a-f]\+' '$TRASH_DIRECTORY/out'
> > >
> > > Using "\d" isn't portable.
> >
> > True, but not just \d. I think using \ before special characters to
> > force an otherwise basic regular expression to be E
Hi Jeremy,
On Wed, 30 Jan 2019, Jeremy Huddleston Sequoia wrote:
> > On Jan 30, 2019, at 03:33, Eric Sunshine wrote:
> >
> > On Tue, Jan 29, 2019 at 3:11 PM Jeremy Huddleston Sequoia
> > wrote:
> >> This was causing problems with ppc/sha1ppc.S
> >
> > What problems, exactly?
>
> The file is
1 - 100 of 144 matches
Mail list logo