On Sat, Dec 31, 2016 at 10:59:11PM -0600, A. Wilcox wrote:
> I'm attempting to package Git for our new Linux distribution and I
> have run in to a failure on our PowerPC builder while running the test
> suite.
>
> The PowerPC builder runs a tiny version of grep(1) that was not built
> with PCRE.
Jeff King writes:
> On Wed, Dec 28, 2016 at 09:28:37AM -0800, Stefan Beller wrote:
>
>> gitview did not have meaningful contributions since 2007, which gives the
>> impression it is either a mature or dead project.
>>
>> In both cases we should not carry it in git.git as the README for contrib
>
On Sat, Dec 31, 2016 at 06:40:33PM -0800, Junio C Hamano wrote:
> What people seem to do is to teach the branch that ends with F that
> its upstream is the local branch that ends with E, so that they can
> be lazy when rebasing a branch that knows its upstream. I suspect
> that you would end up w
On Sun, Jan 01, 2017 at 12:36:11PM -0800, Jacob Keller wrote:
> But how likely is it to end up with differing binaries running on the
> exact same repository concurrently? Basically, I am trying to see
> whether or not we could accidentally end up causing problems by trying
> to race with other gi
On Sun, Jan 1, 2017 at 4:43 AM, Philip Oakley wrote:
> From: "Jacob Keller"
>> I do have one comment regarding this series. Is it ever possible for
>> an older version of git to be running a process while a new version of
>> git which cleans up dirs runs? Is this expected? I just want to make
>>
Just automatically update gitk when working in a terminal on the same repo
The commit is also on github if that makes things easier
https://github.com/schuellerf/gitk.git
(inotify branch)
https://github.com/schuellerf/gitk/tree/inotify
Features:
* Detects inotify support
if inotify is not detec
In addition to converting to struct object_id, write some hardcoded
buffer sizes in terms of GIT_SHA1_RAWSZ.
Signed-off-by: brian m. carlson
---
builtin/fast-export.c | 58 +--
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/builtin
Convert the remaining uses of unsigned char [20] to struct object_id.
Signed-off-by: brian m. carlson
---
wt-status.c | 44 ++--
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index 08a4d0bd3..e07a46d21 100644
---
Convert several functions to use struct object_id, and rename them so
that they no longer refer to SHA-1.
Signed-off-by: brian m. carlson
---
builtin/grep.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 8887b6
Convert most of the code to use struct object_id, including struct
origin_data and struct merge_parents. Convert several instances of
hardcoded numbers into references to GIT_SHA1_HEXSZ.
Signed-off-by: brian m. carlson
---
builtin/fmt-merge-msg.c | 70 ---
Convert most leaf functions to use struct object_id.
Signed-off-by: brian m. carlson
---
builtin/commit.c | 46 +++---
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 711f96cc4..6597d01f7 100644
---
Convert most leaf functions to struct object_id. Rewrite several
hardcoded numbers in terms of GIT_SHA1_HEXSZ, using an intermediate
variable where that makes sense.
Signed-off-by: brian m. carlson
---
builtin/diff-tree.c | 38 --
1 file changed, 20 insertion
Signed-off-by: brian m. carlson
---
builtin/clone.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/clone.c b/builtin/clone.c
index 5ef81927a..e0916e5f3 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -681,7 +681,7 @@ static void update_head(const stru
Convert struct reflog_info to use struct object_id by changing the
structure definition and applying the following semantic patch:
@@
struct reflog_info E1;
@@
- E1.osha1
+ E1.ooid.hash
@@
struct reflog_info *E1;
@@
- E1->osha1
+ E1->ooid.hash
@@
struct reflog_info E1;
@@
- E1.nsha1
+ E1.noid.ha
Convert each_loose_object_fn and each_packed_object_fn to take a pointer
to struct object_id. Update the various callbacks. Convert several
40-based constants to use GIT_SHA1_HEXSZ.
Signed-off-by: brian m. carlson
---
builtin/cat-file.c | 8
builtin/count-objects.c | 4 ++--
bu
There are places in the code where we would like to provide a struct
object_id *, yet read the hash directly from the pack. Provide an
nth_packed_object_oid function that mirrors the nth_packed_object_sha1
function.
The required cast is questionable, but should be safe on all known
platforms. Th
Convert the remaining uses of unsigned char [20] to struct object_id.
Signed-off-by: brian m. carlson
---
builtin/merge-base.c | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index db95bc29c..cfe2a796f
There are a few leaf functions in various files that call
resolve_refdup. Convert these functions to use struct object_id
internally to prepare for transitioning resolve_refdup itself.
Signed-off-by: brian m. carlson
---
builtin/notes.c| 18 +-
builtin/receive-pack.c |
Convert various uses of unsigned char [20] to struct object_id. Rename
replace_object_sha1 to rename_object_oid. Finally, specify a constant
in terms of GIT_SHA1_HEXSZ.
Signed-off-by: brian m. carlson
---
builtin/replace.c | 112 +++---
1 file ch
Make each_reflog_ent_fn take two struct object_id pointers instead of
two pointers to unsigned char. Convert the various callbacks to use
struct object_id as well. Also, rename fsck_handle_reflog_sha1 to
fsck_handle_reflog_oid.
Signed-off-by: brian m. carlson
---
builtin/fsck.c | 16
Signed-off-by: brian m. carlson
---
builtin/branch.c | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 9d30f55b0..faf472ff8 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -32,7 +32,7 @@ static const
Additionally convert several uses of the constant 40 into
GIT_SHA1_HEXSZ.
Signed-off-by: brian m. carlson
---
builtin/merge.c | 136
1 file changed, 68 insertions(+), 68 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 00
Convert the functions in this file and struct commit_name to struct
object_id.
Signed-off-by: brian m. carlson
---
builtin/describe.c | 50 +-
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/builtin/describe.c b/builtin/describe.c
This is another series in the continuing conversion to struct object_id.
This series converts more of the builtin directory and some of the
refs code to use struct object_id. Additionally, it implements an
nth_packed_object_oid function which provides a struct object_id
version of the nth_packed_o
Hey Stephan,
On Sun, Jan 1, 2017 at 9:57 PM, Stephan Beyer wrote:
int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
@@ -643,6 +794,10 @@ int cmd_bisect__helper(int argc, const char **argv,
const char *prefix)
N_("print out the bis
Signed-off-by: Ramsay Jones
---
Hi Christian,
If you need to re-roll your 'cc/split-index-config' branch, could
you please squash this into the relevant patch (commit 8a7e3ef9a6,
"read-cache: touch shared index files when used", 26-12-2016).
Thanks!
ATB,
Ramsay Jones
read-cache.c | 2 +-
1
Hi Pranit,
On 12/31/2016 11:43 AM, Pranit Bauva wrote:
>>> +
>>> +static int bisect_auto_next(struct bisect_terms *terms, const char *prefix)
>>> +{
>>> + if (!bisect_next_check(terms, NULL))
>>> + return bisect_next(terms, prefix);
>>> +
>>> + return 0;
>>> +}
>>
>> Hmm, the h
On 1 January 2017 at 14:50, Johannes Sixt wrote:
> Am 01.01.2017 um 15:23 schrieb Luke Diamand:
>>
>> On 31 December 2016 at 11:44, Pranit Bauva wrote:
>>>
>>> diff --git a/t/t9813-git-p4-preserve-users.sh
>>> b/t/t9813-git-p4-preserve-users.sh
>>> index 0fe231280..2384535a7 100755
>>> --- a/t/t9
Am 01.01.2017 um 15:23 schrieb Luke Diamand:
On 31 December 2016 at 11:44, Pranit Bauva wrote:
diff --git a/t/t9813-git-p4-preserve-users.sh b/t/t9813-git-p4-preserve-users.sh
index 0fe231280..2384535a7 100755
--- a/t/t9813-git-p4-preserve-users.sh
+++ b/t/t9813-git-p4-preserve-users.sh
@@ -126
On 31 December 2016 at 11:44, Pranit Bauva wrote:
> test_must_fail should only be used for testing git commands. To test the
> failure of other commands use `!`.
>
> Reported-by: Stefan Beller
> Signed-off-by: Pranit Bauva
> ---
> t/t3510-cherry-pick-sequence.sh | 6 +++---
> t/t5504-fetch-re
From: "Jacob Keller"
Sent: Sunday, January 01, 2017 9:24 AM
On Sat, Dec 31, 2016 at 6:32 PM, Junio C Hamano wrote:
Jeff King writes:
On Sat, Dec 31, 2016 at 04:12:40AM +0100, Michael Haggerty wrote:
This is a re-roll of an old patch series. v1 [1] got some feedback,
which I think was all
Jeff King writes:
> On Sat, Dec 31, 2016 at 08:58:43AM +0100, Michael Haggerty wrote:
>
>> > The return value is always "0" or "-1". It seems like it would be
>> > simpler to just return the descriptor instead of 0.
>> >
>> > I guess that makes it hard to identify the case when we chose not to
>
On 01.01.17 05:59, A. Wilcox wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA256
>
> Hello!
>
> I'm attempting to package Git for our new Linux distribution and I
> have run in to a failure on our PowerPC builder while running the test
> suite.
>
> The PowerPC builder runs a tiny version
On Sun, Jan 1, 2017 at 1:24 AM, Jacob Keller wrote:
> On Sat, Dec 31, 2016 at 6:32 PM, Junio C Hamano wrote:
>> Jeff King writes:
>>
>>> On Sat, Dec 31, 2016 at 04:12:40AM +0100, Michael Haggerty wrote:
>>>
This is a re-roll of an old patch series. v1 [1] got some feedback,
which I thi
On Sat, Dec 31, 2016 at 6:32 PM, Junio C Hamano wrote:
> Jeff King writes:
>
>> On Sat, Dec 31, 2016 at 04:12:40AM +0100, Michael Haggerty wrote:
>>
>>> This is a re-roll of an old patch series. v1 [1] got some feedback,
>>> which I think was all addressed in v2 [2]. But it seems that v2 fell
>>>
On 01/01/2017 04:28 AM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> +if (errno == ENOENT || errno == EISDIR) {
>> +/*
>> + * The logfile doesn't already exist,
>> + * but that is not
Am 31.12.2016 um 09:14 schrieb Mike Hommey:
Hi,
I've had this kind of things to do more than once, and had to do it a
lot today, so I figured it would be worth discussing whether git-rebase
should be enhanced to support this, or if this should go in a separate
tool or whatever.
So here is what
On 01/01/2017 03:09 AM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> This function doesn't do anything beyond call files_log_ref_write(), so
>
> s/call/&ing/; I think.
Thanks; will fix.
Michael
38 matches
Mail list logo
