i have been trying to contact you
i have been trying to contact you
i have been trying to contact you
Hi,
Using git 2.17.1 in Ubuntu 18.04 I'm seeing some strange behaviour
when using "git describe" with the repo at
http://github.com/endlessm/linux
First to rewind to a recent commit on the eos3.4 branch and observe:
$ git reset --hard 282b7f72f11f5617947df941a247b0a286faac35
$ git describe
i have been trying to contact you
i have been trying to contact you
I think I'm running into a bug with git diff on v2.18.0. When I diff
the attached files, part of the diff ends up looking like:
...
STARTCHAR U+00F0
ENCODING 240
SWIDTH 500 0
-DWIDTH 8 0
-BBX 7 12 1 0
-BITMAP
-12
-0C
-14
-22
-02
-3E
-42
-42
-82
-84
-84
-78
+DWIDTH 8 0
+BBX 8 12 0 0
+BITMAP
+1B
i have been trying to contact you
On Sat, Aug 25, 2018 at 04:00:31AM -0400, Jeff King wrote:
> This is a follow-up to the discussion in:
>
> https://public-inbox.org/git/20180822030344.ga14...@sigill.intra.peff.net/
>
> The general idea is that the majority of callers don't care about actual
> plus/minus ordering from oidcmp()
On Sun, Aug 26, 2018 at 11:39:30AM -0400, Randall S. Becker wrote:
> My first reactions were:
>
> 1. Someone is trying a phishing scam on the distribution list. It has
> happened before.
>
> 2. Someone set up the wrong email address for their GitHub account.
>
> I hope it's not #1.
The emails
Hi Junio,
On Wed, 8 Aug 2018, Junio C Hamano wrote:
> Pratik Karki writes:
>
> > This commit implements support for an --onto argument that is actually a
> > "symmetric range" i.e. `...`.
> >
> > The equivalent shell script version of the code offers two different
> > error messages for the
On Sun, Aug 26, 2018 at 4:39 AM Bentzy Sagiv wrote:
>
> git version 2.7.4
> __
>
> First try: NOT passing origin url explicitly
>
> ubuntu@ci-bentzy:/var/lib/jenkins$ sudo git push
Since you
On August 26, 2018 11:35 AM, pedro rijo, wrote:
> Subject: Re: [GitHub] Your password was reset
>
> just wondering if there's something going on? Is there a github account
> associated with the mailing list email? seems odd...
>
> GitHub escreveu no dia domingo, 26/08/2018 à(s)
> 10:35:
> >
>
just wondering if there's something going on? Is there a github
account associated with the mailing list email? seems odd...
GitHub escreveu no dia domingo, 26/08/2018 à(s) 10:35:
>
> Hello amc2399,
>
> We wanted to let you know that your GitHub password was reset.
>
> If you did not perform
git version 2.7.4
__
First try: NOT passing origin url explicitly
ubuntu@ci-bentzy:/var/lib/jenkins$ git remote -v
origin https://USER @ bitbucket.org/OWNER/jenkinsconf-repo.git (fetch)
origin
Am 14.08.2018 um 03:58 schrieb Jeff King:
> Your suggestion can be implemented using khash (my patch below).
>
>> Before:
>> Benchmark #1: ./git-cat-file --batch-all-objects --buffer --unordered
>> --batch-check='%(objectname)'
>>
>> Time (mean ± σ): 269.5 ms ± 26.7 ms[User: 247.7 ms,
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/difftool.c | 2 +-
builtin/hash-object.c | 2 +-
builtin/replace.c | 2 +-
builtin/update-index.c | 2 +-
cache.h| 4 ++--
diff.c | 20 -
notes-merge.c | 2 +-
read-cache.c
Signed-off-by: Nguyễn Thái Ngọc Duy
---
apply.c| 9 ++---
builtin/checkout.c | 3 ++-
diff.c | 2 +-
ll-merge.c | 17 +
ll-merge.h | 5 -
merge-blobs.c | 3 ++-
merge-recursive.c | 3 ++-
notes-merge.c | 3 ++-
This function calls do_diff_cache() which eventually needs to set this
"istate" to unpack_options->src_index (*). This is an unfornate fact
that unpack_trees() _will_ destroy src_index so we can't really pass a
const index_state there. Just remove 'const'.
(*) Right now diff_cache() in diff-lib.c
Signed-off-by: Nguyễn Thái Ngọc Duy
---
blame.c | 20 +++-
builtin/diff.c | 2 +-
builtin/log.c| 2 +-
builtin/merge.c | 2 +-
builtin/range-diff.c | 2 +-
diff-no-index.c | 9 +++--
diff.c | 4 ++--
diff.h
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/grep.c | 4 ++--
builtin/log.c | 2 +-
grep.c | 13 -
grep.h | 7 +--
revision.c | 4 ++--
5 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/commit.c | 2 +-
builtin/pull.c | 3 ++-
sequencer.c | 6 ++---
wt-status.c | 64
wt-status.h | 17 +
5 files changed, 56 insertions(+), 36 deletions(-)
diff --git
Signed-off-by: Nguyễn Thái Ngọc Duy
---
diff-lib.c | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/diff-lib.c b/diff-lib.c
index 88a98b1c06..c54773fe12 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -70,7 +70,7 @@ static int match_stat_with_submodule(struct
Signed-off-by: Nguyễn Thái Ngọc Duy
---
blame.c| 7 ---
builtin/cat-file.c | 6 --
builtin/log.c | 3 ++-
combine-diff.c | 27 ---
diff.c | 17 +
diff.h | 9 +++--
diffcore-pickaxe.c | 4 ++--
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/merge.c | 8 +---
builtin/pull.c | 7 +--
cache.h | 6 --
merge.c | 20 +++-
sequencer.c | 6 +++---
5 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/builtin/merge.c
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/log.c | 2 +-
patch-ids.c | 4 ++--
patch-ids.h | 3 ++-
revision.c| 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index 33084102e0..2910122d90 100644
--- a/builtin/log.c
+++
Signed-off-by: Nguyễn Thái Ngọc Duy
---
ref-filter.c | 2 +-
wt-status.c | 24 +---
wt-status.h | 4 +++-
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 0bccfceff2..1b229b84da 100644
--- a/ref-filter.c
+++ b/ref-filter.c
The reason rerere(), rerere_forget() and rerere_remaining() take a
struct repository instead of struct index_state is not obvious from
the patch:
deep in update_paths() and find_conflict(), hold_locked_index() and
read_index() are called. These functions assumes the index path at
$GIT_DIR/index
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/blame.c | 2 +-
line-log.c | 4 ++--
line-range.c| 22 ++
line-range.h| 6 --
4 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c
index c2da673ac8..97632828db
Signed-off-by: Nguyễn Thái Ngọc Duy
---
archive-zip.c | 14 +-
builtin/grep.c | 3 ++-
combine-diff.c | 2 +-
diff.c | 40 +++-
diff.h | 3 ++-
diffcore-pickaxe.c | 4 ++--
grep.c | 21
Signed-off-by: Nguyễn Thái Ngọc Duy
---
archive.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/archive.c b/archive.c
index 0a07b140fe..994495af05 100644
--- a/archive.c
+++ b/archive.c
@@ -391,7 +391,7 @@ static void parse_treeish_arg(const char **argv,
if
Signed-off-by: Nguyễn Thái Ngọc Duy
---
combine-diff.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/combine-diff.c b/combine-diff.c
index de7695e728..4fa7707b57 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1054,7 +1054,8 @@ static void show_patch_diff(struct
Signed-off-by: Nguyễn Thái Ngọc Duy
---
read-cache.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index 8e92b1e21f..b9df81e94e 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -823,7 +823,7 @@ struct cache_entry *make_cache_entry(struct
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/merge-tree.c | 2 +-
merge-blobs.c| 15 +++
merge-blobs.h| 7 +--
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index f8023bae1e..f32941fdab 100644
---
Signed-off-by: Nguyễn Thái Ngọc Duy
---
apply.c | 8 +---
cache.h | 2 +-
diff.c | 6 +++---
ws.c| 5 ++---
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/apply.c b/apply.c
index d80b3547c2..fc52993548 100644
--- a/apply.c
+++ b/apply.c
@@ -2131,10 +2131,12 @@ static
Signed-off-by: Nguyễn Thái Ngọc Duy
---
tree-diff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tree-diff.c b/tree-diff.c
index d29127b029..b5ff14711c 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -607,7 +607,7 @@ static void try_to_follow_renames(const struct object_id
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/pull.c | 2 +-
submodule.c| 28 +---
submodule.h| 9 ++---
transport.c| 9 ++---
4 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index
This continues the journey of getting rid of the_index at least in
library code. The focus of part 4 is diff code. Since 'struct
repository *' is passed around more (and even more in part 5), I take
this opportunity to remove some the_repository references too.
Besides some small conflicts on
Hello amc2399,
We wanted to let you know that your GitHub password was reset.
If you did not perform this action, you can recover access by entering
git@vger.kernel.org into the form at https://github.com/password_reset
To see this and other security events for your account, visit
We heard that you lost your GitHub password. Sorry about that!
But don’t worry! You can use the following link to reset your password:
Hello amc2399,
We wanted to let you know that your GitHub password was reset.
If you did not perform this action, you can recover access by entering
git@vger.kernel.org into the form at https://github.com/password_reset
To see this and other security events for your account, visit
We heard that you lost your GitHub password. Sorry about that!
But don’t worry! You can use the following link to reset your password:
Hello amc2399,
We wanted to let you know that your GitHub password was reset.
If you did not perform this action, you can recover access by entering
git@vger.kernel.org into the form at https://github.com/password_reset
To see this and other security events for your account, visit
43 matches
Mail list logo