On 12/09/2014 12:32 AM, Stefan Beller wrote:
On Fri, Dec 05, 2014 at 12:08:32AM +0100, Michael Haggerty wrote:
Move expire_reflog() into refs.c and rename it to reflog_expire().
Turn the three policy functions into function pointers that are passed
into reflog_expire(). Add function prototypes
Hi Bert,
your commit is more than half a year old. Do you intent to include that
into Git master? If not, what's the reason?
Bye
Christoph
Am 10.12.2014 um 08:42 schrieb Bert Wesarg:
Maybe this is easier to apply:
Junio C Hamano gits...@pobox.com on Thu, 2014/12/11 15:10:
Christian Hesse m...@eworm.de writes:
However... Even if GnuPG 2.2.x (or whatever future release) will become
next stable: It will not reintroduce support for rfc1991.
How certain are we about the deprecation?
The sixth beta of
Junio C Hamano gits...@pobox.com on Thu, 2014/12/11 14:41:
Christian Hesse m...@eworm.de writes:
GnuPG 2.1 homedir looks different, so just creat it on the fly by
importing needed private and public keys and ownertrust.
This solves an issue with gnupg 2.1 running interactive pinentry when
On Fri, Dec 12, 2014 at 09:23:05AM +0100, Michael Haggerty wrote:
On 12/09/2014 12:32 AM, Stefan Beller wrote:
+enum expire_reflog_flags {
+ EXPIRE_REFLOGS_DRY_RUN = 1 0,
+ EXPIRE_REFLOGS_UPDATE_REF = 1 1,
+ EXPIRE_REFLOGS_VERBOSE = 1 2,
+ EXPIRE_REFLOGS_REWRITE = 1 3
+};
GnuPG 2.1 homedir looks different, so just creat it on the fly by
importing needed private and public keys and ownertrust.
This solves an issue with gnupg 2.1 running interactive pinentry when
old secret key is present.
Signed-off-by: Christian Hesse m...@eworm.de
---
t/lib-gpg.sh | 10
GnuPG = 2.1.0 does not longer support RFC1991, so skip these
tests.
Signed-off-by: Christian Hesse m...@eworm.de
---
t/lib-gpg.sh | 3 +++
t/t7004-tag.sh | 14 +++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 4e57942..b0138ad
Signed-off-by: Christian Hesse m...@eworm.de
---
t/lib-gpg.sh | 3 +-
t/lib-gpg/keyring.gpg | 88 ++
t/lib-gpg/pubring.gpg | Bin 2359 - 0 bytes
t/lib-gpg/secring.gpg | Bin 3734 - 0 bytes
4 files changed, 89 insertions(+), 2
On Fri, Dec 12, 2014 at 3:50 AM, Christian Hesse m...@eworm.de wrote:
GnuPG 2.1 homedir looks different, so just creat it on the fly by
s/creat/create/
importing needed private and public keys and ownertrust.
This solves an issue with gnupg 2.1 running interactive pinentry when
old secret
GnuPG 2.1 homedir looks different, so just create it on the fly by
importing needed private and public keys and ownertrust.
This solves an issue with gnupg 2.1 running interactive pinentry when
old secret key is present.
Signed-off-by: Christian Hesse m...@eworm.de
---
t/lib-gpg.sh |
Inline the function at its one remaining caller (which is within
refs.c) and remove it.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 9 +
refs.h | 9 +
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/refs.c b/refs.c
index 618ef9c..166c0f6
The policy objects don't care about --rewrite. So move it to
expire_reflog()'s flags parameter.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Stefan Beller sbel...@google.com
---
builtin/reflog.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
From: Stefan Beller sbel...@google.com
Now the struct ref_lock is used completely internally, so let's
remove it from the header file.
Signed-off-by: Stefan Beller sbel...@google.com
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 9 +
refs.h | 9 -
2 files
Move expire_reflog() into refs.c and rename it to reflog_expire().
Turn the three policy functions into function pointers that are passed
into reflog_expire(). Add function prototypes and documentation to
refs.h.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Stefan Beller
Prior to v1.5.4~14, expire_reflog() had to be an each_ref_fn because
it was passed to for_each_reflog(). Since then, there has been no
reason for it to implement the each_ref_fn interface. So...
* Remove the unused parameter (which took the place of flags, but
was really unused).
* Declare the
Add a new data type, struct expire_reflog_cb, for holding the data
that expire_reflog() passes to expire_reflog_ent() via
for_each_reflog_ent(). For now it only holds a pointer to a struct
expire_reflog_policy_cb, which still contains all of the actual data.
In future commits we will move some
From: Ronnie Sahlberg sahlb...@google.com
The ref_transaction_update function can already be used to create refs by
passing null_sha1 as the old_sha1 parameter. Simplify by replacing
transaction_create with a thin wrapper.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
Signed-off-by: Stefan
From: Stefan Beller sbel...@google.com
Instead of calculating whether to put a plus or minus sign, offload
the responsibilty to the fprintf function.
Signed-off-by: Stefan Beller sbel...@google.com
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 7 ++-
1 file changed, 2
From: Ronnie Sahlberg sahlb...@google.com
Break out the code to create the string and writing it to the file
descriptor from log_ref_write and add it into a dedicated function
log_ref_write_fd. It is a nice unit of work.
For now this is only used from log_ref_write, but in the future it
might
Now that expire_reflog() doesn't actually look in the
expire_reflog_policy_cb data structure, we can make it opaque:
* Change the callers of expire_reflog() to pass it a pointer to an
entire struct expire_reflog_policy_cb rather than a pointer to a
struct cmd_reflog_expire_cb.
* Change
Extract two functions, reflog_expiry_prepare() and
reflog_expiry_cleanup(), from expire_reflog(). This is a further step
towards separating the code for deciding on expiration policy from the
code that manages the physical deletion of reflog entries.
This change requires a couple of local
The policy objects don't care about --verbose. So move it to
expire_reflog()'s flags parameter.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Stefan Beller sbel...@google.com
---
builtin/reflog.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff
The policy objects don't care about --updateref. So move it to
expire_reflog()'s flags parameter.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Stefan Beller sbel...@google.com
---
builtin/reflog.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git
From: Ronnie Sahlberg sahlb...@google.com
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
Signed-off-by: Stefan Beller sbel...@google.com
Reviewed-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
We want to separate the options relevant to the expiry machinery from
the options affecting the expiration policy. So add a flags argument
to expire_reflog() to hold the former.
The argument doesn't yet do anything.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Stefan Beller
This is v2 of the series. Thanks to Jonathan, Stefan, Junio, and
Ronnie for their feedback on v1 [1]. I think I have addressed all of
the issues that were raised.
Changes since v1:
* Several improvements to commit messages and comments; added some
Reviewed-by comments from the mailing list.
*
From: Ronnie Sahlberg sahlb...@google.com
unlock|close|commit_ref can be made static since there are no more external
callers.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
Signed-off-by: Stefan Beller sbel...@google.com
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 24
Add a flags field to struct expire_reflog_cb, and pass the flags
argument through to expire_reflog_ent(). In a moment we will start
using it to pass through flags that expire_reflog_ent() needs.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Stefan Beller sbel...@google.com
---
The policy objects don't care about --dry-run. So move it to
expire_reflog()'s flags parameter.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Stefan Beller sbel...@google.com
---
builtin/reflog.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git
We don't actually need the locking functionality, because we already
hold the lock on the reference itself, which is how the reflog file is
locked. But the lock_file code can do some of the bookkeeping for us,
and it is more careful than the old code here was. For example:
* It correctly handles
This is the first step towards separating the data needed by the
policy code from the data needed by the reflog expiration machinery.
(In a moment we will add a *new* struct expire_reflog_cb for the use
of expire_reflog() itself, then move fields selectively from
expire_reflog_policy_cb to
These members are not needed by the policy functions.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Stefan Beller sbel...@google.com
---
builtin/reflog.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/builtin/reflog.c
Extract from expire_reflog_ent() a function that is solely responsible
for deciding whether a reflog entry should be expired. By separating
this business logic from the mechanics of actually expiring entries,
we are working towards the goal of encapsulating reflog expiry within
the refs API, with
This is our usual convention.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
---
builtin/reflog.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 160541a..ff51dbf
There is very little cleanup needed if the reference has no reflog. If
we move the initialization of log_file down a bit, there's even less.
So instead of jumping to the cleanup code at the end of the function,
just do the cleanup and return inline.
Signed-off-by: Michael Haggerty
On Wed, Dec 10, 2014 at 01:18:15AM -0800, Jonathan Nieder wrote:
That seems like wishful thinking to me. Some subset of developers will
be happy reading the documentation in the header file, and will not
commonly run the tool. Therefore they will also not bother to examine
the output of
On Fri, Dec 12, 2014 at 9:27 AM, Christoph Grüninger f...@grueninger.de wrote:
Hi Bert,
your commit is more than half a year old. Do you intent to include that
into Git master? If not, what's the reason?
Thats a really odd question to a person who posted this patch to the
mailling list the
Hi Philip,
On Thu, 11 Dec 2014, Philip Oakley wrote:
diff --git a/Documentation/config.txt b/Documentation/config.txt
index c26a7c8..81570b7 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -354,10 +354,11 @@ proxy use, while defaulting to a common proxy for
Christian Hesse schrieb am 12.12.2014 um 10:54:
Christian Hesse m...@eworm.de on Fri, 2014/12/12 09:35:
Junio C Hamano gits...@pobox.com on Thu, 2014/12/11 15:10:
Christian Hesse m...@eworm.de writes:
However... Even if GnuPG 2.2.x (or whatever future release) will become
next stable: It
On 12/06/2014 03:46 AM, Stefan Beller wrote:
This goes on top of Michaels series. The idea of this series is make the
reflogs being part of the transaction API, so it will be part of the contract
of transaction_commit to either commit all the changes or none at all.
Currently when using the
On Fri, Dec 12, 2014 at 12:56 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
Prior to v1.5.4~14, expire_reflog() had to be an each_ref_fn because
it was passed to for_each_reflog(). Since then, there has been no
reason for it to implement the each_ref_fn interface. So...
* Remove the unused
On Fri, Dec 12, 2014 at 12:56 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
There is very little cleanup needed if the reference has no reflog. If
we move the initialization of log_file down a bit, there's even less.
So instead of jumping to the cleanup code at the end of the function,
just
Christian Hesse m...@eworm.de writes:
GnuPG 2.1 homedir looks different, so just creat it on the fly by
importing needed private and public keys and ownertrust.
This solves an issue with gnupg 2.1 running interactive pinentry when
old secret key is present.
Signed-off-by: Christian Hesse
Jeff King wrote:
I'm not sure any such thought as intended to be out of date went into
it.
Junio started the documentation in v1.5.4-rc1~49 (2007-11-24). I'm
not sure if there was a discussion preceding that commit. My
understanding was always that putting the documentation out-of-line
was
Christian Hesse m...@eworm.de writes:
Signed-off-by: Christian Hesse m...@eworm.de
---
Could you explain why it is a good idea to do this to the future
readers of git log who encounter this change?
Note that I do not have a particular objection to this change. If
the original were using a
Is there a way to reject pushes that change the history of
first-parents, caused by a backwards merge? To clarify by example
(using branches instead of separate repositories):
$ git init
Initialized empty Git repository in /tmp/tmp.O0efpRrV4p/.git/
$ touch foo
$ git add foo
$ git commit -m
On Fri, Dec 12, 2014 at 12:56 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
We don't actually need the locking functionality, because we already
hold the lock on the reference itself, which is how the reflog file is
locked. But the lock_file code can do some of the bookkeeping for us,
and
Jeff King p...@peff.net writes:
enum expire_reflog_flags {
EXPIRE_REFLOGS_DRY_RUN= 1 0,
EXPIRE_REFLOGS_UPDATE_REF = 1 1,
EXPIRE_REFLOGS_VERBOSE= 1 2,
EXPIRE_REFLOGS_REWRITE= 1 3
}
Do we have a preference in the coding style on this one?
I
Call strbuf_complete_line() instead of open-coding it. Also remove
surrounding comments indicating the intent to complete a line since
this information is already included in the function name.
Signed-off-by: Rene Scharfe l@web.de
---
builtin/fmt-merge-msg.c | 3 +--
notes-utils.c
Jonathan Nieder jrnie...@gmail.com writes:
Jeff King wrote:
I'm not sure any such thought as intended to be out of date went into
it.
Junio started the documentation in v1.5.4-rc1~49 (2007-11-24). I'm
not sure if there was a discussion preceding that commit. My
understanding was always
On Fri, Dec 12, 2014 at 10:31 AM, Jonathan Nieder jrnie...@gmail.com wrote:
Jeff King wrote:
I'm not sure any such thought as intended to be out of date went into
it.
Junio started the documentation in v1.5.4-rc1~49 (2007-11-24). I'm
not sure if there was a discussion preceding that
On Fri, Dec 12, 2014 at 10:31:14AM -0800, Jonathan Nieder wrote:
Separate from the question of history, I honestly prefer this way of
doing API documentation relative to 90% of the API documentation in
headers I've seen in other projects. I suspect you don't. That's
okay --- it's possible
On Fri, Dec 12, 2014 at 11:19:23AM -0800, Stefan Beller wrote:
* Assuming we put everything into headers now, we'd need to discuss
- Do we want to extract it to technical/api-$somedoc later at all?
(There seems to be some disagreement?)
- How do we extract (plain sed for lines starting
Jeff King wrote:
I agree there are some formatting problems in the strbuf.h patch I sent
earlier. I'm happy to fix them and resend, but I'm not 100% sure that
fixing all the problems I see will not leave problems for you. I can fix
them and you can review if you want. Or alternatively, if you
On Fri, Dec 12, 2014 at 12:56 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
Extract from expire_reflog_ent() a function that is solely responsible
for deciding whether a reflog entry should be expired. By separating
this business logic from the mechanics of actually expiring entries,
we are
On Fri, Dec 12, 2014 at 12:57 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
Inline the function at its one remaining caller (which is within
refs.c) and remove it.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
Reviewed-by: Stefan Beller sbel...@google.com
---
refs.c | 9 +
After queuing these three, I _think_ it is better to have something
like this patch on top, as it is distracting to let the GPG message
while setting up the test gpghome leak into the test output,
especially without running these tests with -v option.
The splitting of RFC1991 prerequiste part is
After queuing these three, I _think_ it is better to have something
like this patch on top, as it is distracting to let the GPG message
while setting up the test gpghome leak into the test output,
especially without running these tests with -v option.
The splitting of RFC1991 prerequiste part is
Importing PGP key public and security ring works, but this is supposed
for runtime. As name suggests we prefer exported format for import.
The extra benefit is that we do not have all secret keys in one binary
blob and all public keys in another. Instead public and secret keys for
one key pair
Junio C Hamano gits...@pobox.com on Fri, 2014/12/12 12:33:
After queuing these three, I _think_ it is better to have something
like this patch on top, as it is distracting to let the GPG message
while setting up the test gpghome leak into the test output,
especially without running these tests
On Fri, Dec 12, 2014 at 8:17 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 12/06/2014 03:46 AM, Stefan Beller wrote:
This goes on top of Michaels series. The idea of this series is make the
reflogs being part of the transaction API, so it will be part of the contract
of
Michael Haggerty mhag...@alum.mit.edu writes:
This is v2 of the series. Thanks to Jonathan, Stefan, Junio, and
Ronnie for their feedback on v1 [1]. I think I have addressed all of
the issues that were raised.
Changes since v1:
* Several improvements to commit messages and comments; added
On Fri, Dec 12, 2014 at 11:17 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 12/06/2014 03:46 AM, Stefan Beller wrote:
This goes on top of Michaels series. The idea of this series is make the
reflogs being part of the transaction API, so it will be part of the contract
of
On Fri, Dec 12, 2014 at 11:35:52AM -0800, Jonathan Nieder wrote:
If I were doing it, I would first de-asciidoc within technical/ and
then move into the header in a separate patch. Or first move with
asciidoc intact and then de-asciidoc in a separate patch. Combining
the two into a single
Some of strbuf is documented as comments above functions,
and some is separate in Documentation/technical/api-strbuf.txt.
This makes it annoying to find the appropriate documentation.
We'd rather have it all in one place, which means all in the
text document, or all in the header.
Let's choose
Using a hanging indent is much more readable. This means we
won't format as asciidoc anymore, but since we don't have a
working system for extracting these comments anyway, it's
probably more important to just make the source readable.
Signed-off-by: Jeff King p...@peff.net
---
strbuf.h | 74
This is much easier to read when the whole thing is stuffed
inside a comment block. And there is precedent for this
convention in markdown (and just in general ascii text).
Signed-off-by: Jeff King p...@peff.net
---
As a side note, I actually find markdown much more pleasant to read and
write
The original API doc had something like:
Functions
-
* Life cycle
... some life-cycle functions ...
* Related to the contents of the buffer
... functions related to contents
etc
This grouping can be hard to read in the comment sources,
given the
On Fri, Dec 12, 2014 at 04:28:00PM -0500, Jeff King wrote:
1. All comments created in this way are started with /**
to indicate they are part of the API documentation. This
may help later with extracting the text to pretty-print
it.
By the way, two thoughts I had while working
Christian Hesse m...@eworm.de writes:
Importing PGP key public and security ring works, but this is supposed
for runtime. As name suggests we prefer exported format for import.
The extra benefit is that we do not have all secret keys in one binary
blob and all public keys in another. Instead
From: Justin Guenther jguent...@gmail.com
This function uses (non-local) $f to store the value of its first parameter.
This can interfere with the user's environment.
Signed-off-by: Justin Guenther jguent...@gmail.com
---
contrib/completion/git-prompt.sh | 2 +-
1 file changed, 1 insertion(+),
A postaláda túllépte, kérjük kattintson ide
https://formcrafts.com/a/7434
e-mail Thanks
Administrator E-Mail rendszer.
Köszönjük az együttm#369;ködést!
E-mail Web Team @ 2014
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Jeff King p...@peff.net writes:
+/**
+ * * Related to the contents of the buffer
+ */
+
+/**
+ * Strip whitespace from the beginning and end of a string.
+ * Equivalent to performing `strbuf_rtrim()` followed by `strbuf_ltrim()`.
+ */
extern void strbuf_trim(struct strbuf *);
+
+/**
Jeff King p...@peff.net writes:
Using a hanging indent is much more readable. This means we
won't format as asciidoc anymore, but since we don't have a
working system for extracting these comments anyway, it's
probably more important to just make the source readable.
Yeah.
Those who want to
Jeff King wrote:
Signed-off-by: Jeff King p...@peff.net
---
Documentation/technical/api-strbuf.txt | 351 -
strbuf.h | 458
-
2 files changed, 390 insertions(+), 419 deletions(-)
delete mode 100644
On Fri, Dec 12, 2014 at 04:27:26PM -0500, Jeff King wrote:
On Fri, Dec 12, 2014 at 11:35:52AM -0800, Jonathan Nieder wrote:
If I were doing it, I would first de-asciidoc within technical/ and
then move into the header in a separate patch. Or first move with
asciidoc intact and then
Jeff King wrote:
Using a hanging indent is much more readable. This means we
won't format as asciidoc anymore, but since we don't have a
working system for extracting these comments anyway, it's
probably more important to just make the source readable.
Signed-off-by: Jeff King
Jeff King wrote:
This is much easier to read when the whole thing is stuffed
inside a comment block. And there is precedent for this
convention in markdown (and just in general ascii text).
Signed-off-by: Jeff King p...@peff.net
---
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
As a
Jeff King wrote:
If you look at the original header file, these groupings actually did
exist (though we did not remotely follow them as functions were added),
and looked like:
/* content related */
I'd be happy with something like that, too, but went with the style that
By default, git-diff shows changes and pathnames relative to the
repository root. Setting the diff.relative config option to true shows
pathnames relative to the current directory and excludes changes outside
this directory.
Signed-off-by: Brandon Phillips kel...@shysecurity.com
---
A postaláda túllépte, kérjük kattintson ide
https://formcrafts.com/a/7434
e-mail Thanks
Administrator E-Mail rendszer.
Köszönjük az együttm#369;ködést!
E-mail Web Team @ 2014
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
81 matches
Mail list logo
