Am 05.12.2014 07:12, schrieb Sérgio Basto:
Hi,
I add 2 files that I want ignore on commits
git update-index --assume-unchanged configurations/local.defs
git update-index --assume-unchanged processor/default.defs
git diff -a
is clean
git diff .
is clean
git commit -a
nothing added to commit
bu
On Thu, Dec 4, 2014 at 10:06 PM, Jens Lehmann wrote:
> But I'd need to have separate settings for
> our CI server, e.g. to checkout the sources without the
> largish documentation submodule in one test job (=worktree)
> while checking out the whole documentation for another job
> building the setu
Hi,
I add 2 files that I want ignore on commits
git update-index --assume-unchanged configurations/local.defs
git update-index --assume-unchanged processor/default.defs
git diff -a
is clean
git diff .
is clean
git commit -a
nothing added to commit
but
git commit .
# Changes to be committ
Hi,
There seems to be problems with the checks in the git code for conflicts
between config values of core.autocrlf and core.eol. Because the various
config files are read in separate passes, and the conflict check happens
on the fly, it creates a situation where the order of the config file
entri
On Thu, Dec 4, 2014 at 3:08 PM, Michael Haggerty wrote:
> We don't actually need the locking functionality, because we already
> hold the lock on the reference itself,
No. You do need the lock.
The ref is locked only during transaction_commit()
If you don't want to lock the reflog file and inste
Jeff King wrote:
> Some of the discussion has involved mixing config options into this
> kitchen sink, but that does not make any sense to me (and is why I
> find "git var -l" so odd). Config options are fundamentally different, in
> that they are set and retrieved, not computed (from other confi
On Thu, Dec 04, 2014 at 04:23:31PM -0800, Jonathan Nieder wrote:
> Michael Haggerty 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 still does some of the
Hi Junio,
Please pull l10n update to maint branch.
The following changes since commit b260d265e189728b26e50506ac6ffab6a7d588da:
Git 2.2 (2014-11-26 13:18:34 -0800)
are available in the git repository at:
git://github.com/git-l10n/git-po maint
for you to fetch changes up to ff51f5619d52410
On Fri, Dec 5, 2014 at 3:06 AM, Jens Lehmann wrote:
> Wow, so the .git/config is shared between all worktrees? I
> suspect you have very good reasons for that,
most of config vars are at repo-level, not worktree-level, except
maybe submodule.* and something else. Technically we could use
"include
On Thu, Dec 04, 2014 at 08:28:54PM -0500, Jeff King wrote:
> The minimal fix here would be to add this special case to
> the conditional that checks whether we found a newline.
> But we can make the flow a little clearer by rearranging a
> bit: we first handle lines that we are going to show, and
On Thu, Dec 04, 2014 at 02:14:50PM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > I think the bug is in the reverse-reflog reader in
> > for_each_reflog_ent_reverse. It reads BUFSIZ chunks of the file in
> > reverse order, and then parses them individually. If the trailing
> > newline fo
Michael Haggerty 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 still does some of the bookkeeping for
> us and is more careful than the old code here was.
As y
On Thu, Dec 04, 2014 at 03:52:45PM -0800, Junio C Hamano wrote:
> Yeah, that is what I meant. The earlier part will not go to waste no matter
> what happens to the discussion.
>
> I am not a fan of char[1024], if only because our error message may have
> to mention things whose length is not unde
I'm installing Git 2.2.0 from source distribution on NetBSD 6.1.5
(amd64) and when I specify --mandir=/usr/local/man, it still installs
man pages in the default /usr/local/share/man directory. Is there a fix
available for this?
--
To unsubscribe from this list: send the line "unsubscribe git" i
Michael Haggerty wrote:
> [Subject: expire_reflog(): exit early if the reference has no reflog]
The caller moves on to expire other reflogs, so it's not exiting.
"return early", maybe?
Except the function already returned early. I think the purpose of
this patch is to simplify the no-reflog cas
Yeah, that is what I meant. The earlier part will not go to waste no matter
what happens to the discussion.
I am not a fan of char[1024], if only because our error message may have
to mention things whose length is not under our control, e.g. a filename
in the working tree, but I do share your con
Michael Haggerty wrote:
> --- a/builtin/reflog.c
> +++ b/builtin/reflog.c
> @@ -368,9 +368,11 @@ static int expire_reflog(const char *refname, const
> unsigned char *sha1, void *c
> lock = lock_any_ref_for_update(refname, sha1, 0, NULL);
> if (!lock)
> return error("cann
Michael Haggerty writes:
> I propose this patch series as an alternative to Ronnie's "reflog
> transactions" series.
After coasting my eyes over individual patches, it was delightful to
look at the endgame state of the expiry codepath in builtin/reflog.c
that is left ;-)
--
To unsubscribe from
On Thu, Dec 04, 2014 at 03:41:47PM -0800, Jonathan Nieder wrote:
> Junio C Hamano wrote:
> > Jonathan Nieder writes:
>
> >> Here's a draft for documentation on that.
> >
> > Thanks; looks reasonable; even if the discussion between you and
> > Peff took us to a slightly different direction than w
Michael Haggerty wrote:
> Signed-off-by: Michael Haggerty
> ---
> builtin/reflog.c | 16
> 1 file changed, 8 insertions(+), 8 deletions(-)
Reviewed-by: Jonathan Nieder
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.
Junio C Hamano wrote:
> Jonathan Nieder writes:
>> Here's a draft for documentation on that.
>
> Thanks; looks reasonable; even if the discussion between you and
> Peff took us to a slightly different direction than what you
> described here, the earlier description of long established practice
>
Hi,
Junio C Hamano wrote:
> Jonathan Nieder writes:
>> Here's a draft for documentation on that.
>
> Thanks; looks reasonable; even if the discussion between you and
> Peff took us to a slightly different direction than what you
> described here, the earlier description of long established pract
Hi, I'm trying find a solution where I can change file in a devel
environment , and not commit it into git .
git update-index --assume-unchanged
is one solution , not the best solution but one solution.
I add 2 files that I want ignore on commits
git update-index --assume-unchanged configu
Michael Haggerty wrote:
> --- a/builtin/reflog.c
> +++ b/builtin/reflog.c
> @@ -349,7 +349,7 @@ static int push_tip_to_list(const char *refname, const
> unsigned char *sha1, int
> return 0;
> }
>
> -static int expire_reflog(const char *ref, const unsigned char *sha1, int
> unused, void
Jonathan Nieder writes:
> Signed-off-by: Jonathan Nieder
> ---
> Junio C Hamano wrote:
>> Jonathan Nieder writes:
>
>>> -extern int copy_fd(int ifd, int ofd);
>>> +extern int copy_fd(int ifd, int ofd, struct strbuf *err);
>>
>> It is not limited to this single function, but what contract do we
Michael Haggerty wrote:
> It was called "unused", so at least it was self-consistent.
The missing context is that this was a callback function that had to
match the each_ref_fn signature (where that parameter is 'flags')
until v1.5.4~14 (reflog-expire: avoid creating new files in a
directory insi
From: Ronnie Sahlberg
unlock|close|commit_ref can be made static since there are no more external
callers.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: Stefan Beller
Signed-off-by: Michael Haggerty
---
refs.c | 24
refs.h | 9 -
2 files changed, 12 insertio
The policy objects don't care about "--dry-run". So move it to
expire_reflog()'s flags parameter.
Signed-off-by: Michael Haggerty
---
builtin/reflog.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 319f0d2..a490193 1006
This is our usual convention.
Signed-off-by: Michael Haggerty
---
builtin/reflog.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 3e11bee..df302f4 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -349,7 +349,7
These members are not needed by the policy functions.
Signed-off-by: Michael Haggerty
---
builtin/reflog.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 6294406..01b76d0 100644
--- a/builtin/reflog.c
+++ b/bui
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 "struct
expire_reflog_policy_cb". In future commits we will move some data
from the latter to the former.
Signed-off
From: Stefan Beller
Now the struct ref_lock is used completely internally, so let's
remove it from the header file.
Signed-off-by: Stefan Beller
Signed-off-by: Michael Haggerty
---
refs.c | 9 +
refs.h | 9 -
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/refs.
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
---
builtin/reflog.c | 2 ++
1 file changed, 2 insertions(+)
diff
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
---
builtin/re
Extracted 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, wi
From: Ronnie Sahlberg
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. For now this is only used from log_ref_write,
but later on we will call this function from reflog transactions too,
which m
The policy objects don't care about "--verbose". So move it to
expire_reflog()'s flags parameter.
Signed-off-by: Michael Haggerty
---
builtin/reflog.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 1512b67.
From: Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg
Signed-off-by: Stefan Beller
Reviewed-by: Michael Haggerty
Reviewed-by: Jonathan Nieder
Signed-off-by: Michael Haggerty
---
refs.c | 22 ++
refs.h | 2 +-
2 files changed, 3 insertions(+), 21 deletions(-)
diff --git
Now that expire_reflog() doesn't actually look in the
expire_reflog_policy_cb data structure, we can make it opaque:
* Change its callers to pass it a pointer to an entire "struct
expire_reflog_policy_cb".
* Change it to pass the pointer through as a "void *".
* Change the policy functions, re
The policy objects don't care about "--rewrite". So move it to
expire_reflog()'s flags parameter.
Signed-off-by: Michael Haggerty
---
builtin/reflog.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index cc7a220..6294406 100644
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
---
builtin/reflog.c | 11 +++
1 file
I propose this patch series as an alternative to Ronnie's "reflog
transactions" series.
Both alternatives have been discussed exhaustively on the list [1,2].
My opinion is that there is no need to allow arbitrary reflog changes
via the ref_transaction API, because just about the only things we
wan
This is the first step towards separating the data needed by the
policy code from the data needed by the reflog expiration machinery.
Signed-off-by: Michael Haggerty
---
builtin/reflog.c | 19 ++-
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/builtin/reflog.c b/b
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 expiration.
This change requires a couple of local variables from expire_re
It was called "unused", so at least it was self-consistent.
Signed-off-by: Michael Haggerty
---
builtin/reflog.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 2d85d26..3e11bee 100644
--- a/builtin/reflog.c
+++ b/builtin/refl
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 still does some of the bookkeeping for
us and is more careful than the old code here was.
For example:
* Correctly handle the
The policy objects don't care about "--updateref". So move it to
expire_reflog()'s flags parameter.
Signed-off-by: Michael Haggerty
---
builtin/reflog.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index a490193..597c547 100
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
---
builtin/reflog.c | 133 +++-
From: Ronnie Sahlberg
Inline the function at its one remaining caller (which is within
refs.c) and remove it.
Signed-off-by: Michael Haggerty
---
refs.c | 9 +
refs.h | 9 +
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/refs.c b/refs.c
index c6ee775..f3564cf 1
From: Ronnie Sahlberg
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
Signed-off-by: Stefan Beller
Reviewed-by: Michael Haggerty
Jeff King writes:
> I think the bug is in the reverse-reflog reader in
> for_each_reflog_ent_reverse. It reads BUFSIZ chunks of the file in
> reverse order, and then parses them individually. If the trailing
> newline for a line falls directly on the block boundary, we may not have
> it in our cu
Christoph Mallon writes:
>> Amen to that. I am getting the same thing.
>
> I ran reproduce it reliably on multiple machines (OS X, FreeBSD, ia32,
Oh, I do not doubt you see a problem. I am just saying that I don't
have an easy entry to the issue without it reproducing for me.
--
To unsubscribe
On Thu, Dec 04, 2014 at 09:37:34PM +0100, Christoph Mallon wrote:
> Am 04.12.14 21:18, schrieb Junio C Hamano:
> > Jonathan Nieder writes:
> >> Could you make a test script that illustrates and reproduces the
> >> problem? I.e., a patch to a file like t/t1410-reflog.sh, such that
> >> if I run
>
Jeff King writes:
> On Thu, Dec 04, 2014 at 10:24:09AM -0800, Junio C Hamano wrote:
>
>> I wish this covered a lot more than just this part from an
>> end-user's point of view, but this is definitely one of the most
>> important code paths the mechanism should cover.
>
> Which parts do you mean?
> -Original Message-
> From: brian m. carlson
> Sent: Wednesday, December 03, 2014 19:55
>
> On Wed, Dec 03, 2014 at 06:31:18PM -0500, Jason Pyeron wrote:
> > I remember hitting this a while ago, but just gave up.
> >
> > It seems to be a problem for others too.
> >
> > Any ideas on how
Jeff King writes:
> ... I was thinking of
> just creating a new namespace, like:
>
> git var exec-path
> git var author-ident
>
> and deprecating the 4 existing GIT_* variables.
I'm fine with that. As I wrote in my response to MMoy, I forgot
about other kinds of options the "git" potty take
On 12/04/2014 07:32 PM, Stefan Beller wrote:
> On Thu, Dec 04, 2014 at 10:14:04AM -0800, Jonathan Nieder wrote:
>> Michael Haggerty wrote:
>>
>>> I am still unhappy with the approach of this series, for the reasons
>>> that I explained earlier [1]. In short, I think that the abstraction
>>> level i
On Thu, Dec 04, 2014 at 11:02:37AM -0800, Junio C Hamano wrote:
> > Christian raised the issue of cluttering the "git --option" namespace,
> > and I do agree that's a potential issue.
>
> I am not sure if that is an issue at all. You will need the same
> number of options to cover all the neces
Mike Gerwitz writes:
> It has since improved; I'm looking for the time to update the article,
> or write a follow-up.
Thanks for an amusing read. We also let you merge a signed tag
these days, so that in a variant of your merge scenario #2, your
merge commit can carry your GPG signature, made w
On Thu, Dec 04, 2014 at 10:24:09AM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > diff --git a/prompt.c b/prompt.c
> > index e5b4938..8181eeb 100644
> > --- a/prompt.c
> > +++ b/prompt.c
> > @@ -57,11 +57,19 @@ char *git_prompt(const char *prompt, int flags)
> > r = d
On Thu, Dec 04, 2014 at 06:21:40PM +0100, Ævar Arnfjörð Bjarmason wrote:
> > That is one of the many reasons why I proposed to have a dictionary of
> > the main technical terms for each language before we even localise git
> > in that language. In an ideal word, we would provide a simple solution
Am 04.12.14 21:18, schrieb Junio C Hamano:
> Jonathan Nieder writes:
>> Could you make a test script that illustrates and reproduces the
>> problem? I.e., a patch to a file like t/t1410-reflog.sh, such that
>> if I run
>>
>> cd git
>> make
>> cd t
>> ./t1410-reflog.sh
>>
>> th
Thanks Mike!
Mike Gerwitz wrote:
>> Mike, could you please put your various git commit verification helper
>> scripts into a publicly visible?
>
> You can use this:
>
>
https://gitorious.org/easejs/easejs/source/ee85b058df783ffaa9f8d5ae58f9eb6d7586b0ca:tools/signchk
>
> But note that the default v
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> Jeff King writes:
>>
>>> Christian raised the issue of cluttering the "git --option"
>>> namespace,
>>> and I do agree that's a potential issue.
>>
>> I am not sure if that is an issue at all. You will need the same
>> number of options to cov
Jonathan Nieder writes:
> Christoph Mallon wrote:
>
>> % git rev-parse 'master@{52}'
>> warning: Log for ref refs/heads/master has gap after Thu, 1 Jan 1970
>> 00:00:01 +.
>> 0036
>
> Can you say more? What output did you expect and how does this differ
>
Michael J Gruber writes:
> By default, check-ignore does not list tracked files at all since
> they are not subject to ignore patterns.
>
> Make this clearer in the man page.
>
> Reported-by: Guilherme
> Signed-off-by: Michael J Gruber
> ---
> That really is a bit confusing. Does this help?
Th
Luis Henriques writes:
> Add tests for the --[no-]xmailer option.
>
> Signed-off-by: Luis Henriques
Thanks. Let's squash this in, too. We care about command line
options taking precedence over configured default.
t/t9001-send-email.sh | 26 ++
1 file changed, 14 inse
Am 02.12.2014 um 23:16 schrieb Max Kirillov:
On Tue, Dec 02, 2014 at 09:45:24PM +0100, Jens Lehmann wrote:
But, while hacking the submodule init I became more
convinced that the modules directory should be common and
submodules in checkout should be a checkouts of the
submodule. Because this is
Junio C Hamano writes:
> Jeff King writes:
>
>> Christian raised the issue of cluttering the "git --option"
>> namespace,
>> and I do agree that's a potential issue.
>
> I am not sure if that is an issue at all. You will need the same
> number of options to cover all the necessary "computables"
On Thu, Dec 04, 2014 at 11:33:24AM -0800, Junio C Hamano wrote:
> Luis Henriques writes:
>
> > On Wed, Dec 03, 2014 at 08:56:45AM -0800, Junio C Hamano wrote:
> >
> >> I actually do not think this is a good idea from debuggability.
> >
> > Do you think this could be merged with yet another switch
David Michael writes:
> On Wed, Dec 3, 2014 at 9:24 PM, David Michael wrote:
>> --- /dev/null
>> +++ b/compat/stat.c
>> @@ -0,0 +1,49 @@
>> +#define _POSIX_C_SOURCE 200112L
>> +#include /* NULL */
>> +#include /* *stat, S_IS* */
>> +#include /* mode_t */
>
> Oops, the line
Add tests for the --[no-]xmailer option.
Signed-off-by: Luis Henriques
---
t/t9001-send-email.sh | 32
1 file changed, 32 insertions(+)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index e37efef..7a3f996 100755
--- a/t/t9001-send-email.sh
+++ b/t/t
Luis Henriques writes:
> On Wed, Dec 03, 2014 at 08:56:45AM -0800, Junio C Hamano wrote:
>
>> I actually do not think this is a good idea from debuggability.
>
> Do you think this could be merged with yet another switch? I can't
> think of a name for the switch, something like... "--hide-msgid"?
Stefan Beller wrote:
> Ok, let's see how Michaels series evolves and if I can base the
> transactions series
> on that
That sounds good to me, too, FWIW. That way we don't have to fuss
with conflicts in refs.c. :)
Thanks,
Jonathan
--
To unsubscribe from this list: send the line "unsubscribe git
On Wed, Dec 3, 2014 at 9:24 PM, David Michael wrote:
> --- /dev/null
> +++ b/compat/stat.c
> @@ -0,0 +1,49 @@
> +#define _POSIX_C_SOURCE 200112L
> +#include /* NULL */
> +#include /* *stat, S_IS* */
> +#include /* mode_t */
Oops, the line can be removed now that this is no l
On Wed, Dec 03, 2014 at 08:56:45AM -0800, Junio C Hamano wrote:
> Eric Wong writes:
>
> > Luis Henriques wrote:
> >> On Mon, Mar 24, 2014 at 09:38:27PM +, Luis Henriques wrote:
> >> > Add --[no-]xmailer that allows a user to disable adding the 'X-Mailer:'
> >> > header to the email being sen
Michael J Gruber writes:
> -f/--force is the standard way to force an action, and is used by branch
> for the recreation of existing branches, but not for deleting unmerged
> branches nor for renaming to an existing branch.
>
> Make "-m -f" equivalent to "-M" and "-d -f" equivalent to" -D", i.e.
Jeff King writes:
> On Tue, Dec 02, 2014 at 09:26:00AM -0800, Junio C Hamano wrote:
>
>> Jeff King writes:
>>
>> > There is also "git var", which is a catch-all for printing some deduced
>> > environmental defaults. I'd be just as happy to see it go away, though.
>> > Having:
>> >
>> > git --
Hi Ulrich,
2014-12-04 8:32 GMT+01:00 Ulrich Windl :
> Hi!
>
> I'm native German, but German git messages confuse me (yopu'll have to
> correlate them with the man pages). At the moment git uses the
What in particular makes the German git messages confusing you? What
`git version` do you use?
May
On Thu, Dec 4, 2014 at 10:41 AM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> This is the whole refs-transactions-reflog series[1],
>> which was in discussion for a bit already. It applies to origin/master.
>>
>> The idea is to have the reflog being part of the transactions, which
>> the re
Stefan Beller writes:
> This is the whole refs-transactions-reflog series[1],
> which was in discussion for a bit already. It applies to origin/master.
>
> The idea is to have the reflog being part of the transactions, which
> the refs are already using, so the we're moving towards a database
> l
Michael Haggerty writes:
> ... an alternate proposal, to convert
> expire_reflogs() to take callback functions that decide *what* to
> expire, but which itself does the work of acquiring locks, iterating
> through the reflog entries, rewriting the file, and overwriting the old
> file with the new
On Thu, Dec 04, 2014 at 10:14:04AM -0800, Jonathan Nieder wrote:
> Michael Haggerty wrote:
>
> > I am still unhappy with the approach of this series, for the reasons
> > that I explained earlier [1]. In short, I think that the abstraction
> > level is wrong. In my opinion, consumers of the refs AP
Jeff King writes:
> diff --git a/prompt.c b/prompt.c
> index e5b4938..8181eeb 100644
> --- a/prompt.c
> +++ b/prompt.c
> @@ -57,11 +57,19 @@ char *git_prompt(const char *prompt, int flags)
> r = do_askpass(askpass, prompt);
> }
>
> - if (!r)
> - r = g
Michael Haggerty wrote:
> I am still unhappy with the approach of this series, for the reasons
> that I explained earlier [1]. In short, I think that the abstraction
> level is wrong. In my opinion, consumers of the refs API should barely
> even have to *know* about reflogs, let alone implement re
Add completion for git-tag options including
all options that are currently shown in "git tag -h".
Signed-off-by: Ralf Thielow
---
contrib/completion/git-completion.bash | 10 ++
1 file changed, 10 insertions(+)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/g
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Hey Patrick,
On Thu, Dec 04, 2014 at 17:21:06 +, Patrick Schleizer wrote:
> git log --pretty="format:%H$t%aN$t%s$t%G?" --show-signature
> [...]
> But when I run that command, spaces are missing. (Using a user that does
> not know my gpg public key
Jeff King writes:
> On Wed, Dec 03, 2014 at 01:21:03PM -0800, Brodie Rao wrote:
>
>> > I think it is also not sufficient. This patch seems to cover only
>> > objects. But we assume that we can atomically rename() new versions of
>> > files into place whenever we like without disrupting existing r
Junio C Hamano wrote:
> We may want to see it done the other way around, though. That is,
> to allow the pack-refs race fix, which was reviewed and has been
> cooking, graduate without having to depend on this API rewrite, so
> that we may be able to merge it down even to v2.2.x maintenance
> tra
Hi,
Michael Haggerty wrote:
> On 12/04/2014 09:29 AM, Stefan Beller wrote:
>> This is the whole refs-transactions-reflog series[1],
>> which was in discussion for a bit already. It applies to origin/master.
>
> I am still unhappy with the approach of this series, for the reasons
> that I explaine
On Thu, Dec 4, 2014 at 5:12 PM, Michael J Gruber
wrote:
> Ævar Arnfjörð Bjarmason schrieb am 04.12.2014 um 16:49:
>> On Thu, Dec 4, 2014 at 10:55 AM, Jeff King wrote:
>>> On Thu, Dec 04, 2014 at 09:29:04AM +0100, Torsten Bögershausen wrote:
>>>
How about
alias git='LANGUAGE=de_DE.UTF-8
Dear git mailing list,
Dear Mike Gerwitz,
according to http://mikegerwitz.com/papers/git-horror-story#script-trust
the output of:
git log --pretty="format:%H$t%aN$t%s$t%G?" --show-signature
should look like this:
-
f72924356896ab95a542c495b796555d016cbddd Mike GerwitzYet
another
On 12/04/2014 09:29 AM, Stefan Beller wrote:
> This is the whole refs-transactions-reflog series[1],
> which was in discussion for a bit already. It applies to origin/master.
I am still unhappy with the approach of this series, for the reasons
that I explained earlier [1]. In short, I think that t
Stefan Beller writes:
> diff --git a/refs.c b/refs.c
> index b54b5b3..2942227 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -3532,7 +3532,7 @@ struct ref_update {
> unsigned char new_sha1[20];
> unsigned char old_sha1[20];
> int flags; /* REF_NODEREF? */
> - int have_old; /* 1 i
Michael J Gruber writes:
> The main issue at hand is really that we have localised git but not its
> man pages. Even if you understand English, the man pages don't help you
> at all if you can't connect the technical terms used there to their
> localised counterparts in git's messages. (NO_GETTEX
Ævar Arnfjörð Bjarmason schrieb am 04.12.2014 um 16:49:
> On Thu, Dec 4, 2014 at 10:55 AM, Jeff King wrote:
>> On Thu, Dec 04, 2014 at 09:29:04AM +0100, Torsten Bögershausen wrote:
>>
>>> How about
>>> alias git='LANGUAGE=de_DE.UTF-8 git'
>>> in your ~/.profile ?
>>> (Of course you need to change
On 12/04/2014 09:29 AM, Stefan Beller wrote:
Somewhat short commit message, especially the motivation is missing.
What do we gain with this patch ?
In the struct the compiler needs to layout 2*20 bytes for the sha's.
It follows an int, typically 4 bytes.
It follows another int, now with one bit.
T
>>> Torsten Bögershausen schrieb am 04.12.2014 um 09:29 in
Nachricht <54801b50.4080...@web.de>:
> On 12/04/2014 08:32 AM, Ulrich Windl wrote:
>> Hi!
>>
>> I'm native German, but German git messages confuse me (yopu'll have to
> correlate them with the man pages). At the moment git uses the locale
On Thu, Dec 4, 2014 at 10:55 AM, Jeff King wrote:
> On Thu, Dec 04, 2014 at 09:29:04AM +0100, Torsten Bögershausen wrote:
>
>> How about
>> alias git='LANGUAGE=de_DE.UTF-8 git'
>> in your ~/.profile ?
>> (Of course you need to change de to the language you want )
>
> Besides being awkward in scrip
By default, check-ignore does not list tracked files at all since
they are not subject to ignore patterns.
Make this clearer in the man page.
Reported-by: Guilherme
Signed-off-by: Michael J Gruber
---
That really is a bit confusing. Does this help?
Documentation/git-check-ignore.txt | 3 +++
1 - 100 of 129 matches
Mail list logo
