If HEAD of a repository points to a conflict reference, such as:
* There exist a reference named 'refs/heads/jx/feature1', but HEAD
points to 'refs/heads/jx', or
* There exist a reference named 'refs/heads/feature', but HEAD points
to 'refs/heads/feature/bad'.
When we push to delete a refere
git-subtree's log format string uses "%ad" and "%cd", which
respect the user's configured log.date value.
This is problematic for git-subtree because it needs to use real
dates so that copied commits come through unchanged.
Add a test and tweak the format strings to use %aD and %cD
so that the de
git-subtree's log format string uses "%ad" and "%cd", which
respect the user's configured log.date value.
This is problematic for git-subtree because it needs to use real
dates so that copied commits come through unchanged.
Add a test and tweak the format strings to use %aD and %cD
so that the de
From: "Junio C Hamano"
Junio C Hamano writes:
I was trying to use, essentially, 'cat list.txt' as the command,...
One thing that needs to be made clear is that I do not think we want
to encourage `cat list.txt #` abuse in the first place.
OK [1]
It is an
unacceptable hack for us to en
Dave Borowitz writes:
> From: Junio C Hamano
>
> Prior to this patch, when git-send-pack was exec'ed, as is done by
> git-remote-http, it did not reread the config, so it did not respect
> the configured value of http.signingkey. Thus it was impossible to
> specify a signing key over HTTP, other
A release candidate Git v2.5.0-rc3 is now available for testing at
the usual places. It is comprised of 579 non-merge commits since
v2.4.0, contributed by 70 people, 21 of which are new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following publ
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
Tagged v2.5-rc3 today; hopefully we can have an uneventful 2.5 next
week and then start the next cycle. I'll eject/drop the stalled
topics and
From: Junio C Hamano
Prior to this patch, when git-send-pack was exec'ed, as is done by
git-remote-http, it did not reread the config, so it did not respect
the configured value of http.signingkey. Thus it was impossible to
specify a signing key over HTTP, other than the default key in the
keyrin
On Tue, Jul 21, 2015 at 3:48 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> While I still think that it is more important to prevent such a
>> situation from occurring in the first place, ignoring .idx that lack
>> corresponding .pack should be fairly simple, perhaps like this.
>> ...
>
Compared them with v9, signed them off, and merged to 'next'.
Haven't pushed the result out yet.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Add an err argument to log_ref_setup that can explain the reason
for a failure. This then eliminates the need to manage errno through
this function since we can just add strerror(errno) to the err string
when meaningful. No callers relied on errno from this function for
anything else than the error
This is necessary because alternate ref backends might store reflogs
somewhere other than .git/logs. Code that now directly manipulates
.git/logs should instead go through git-reflog.
Signed-off-by: David Turner
---
Documentation/git-reflog.txt | 4
builtin/reflog.c | 33 +
On Tue, 2015-07-21 at 13:49 -0700, Junio C Hamano wrote:
> David Turner writes:
>
> > Junio, now that Michael has marked this as reviewed, do you want to pull
> > from github, or do you want me to send a re-roll to the mailing list?
>
> Let's see the final round; that would give me a chance to p
This is just for clarity.
Signed-off-by: David Turner
---
refs.c | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/refs.c b/refs.c
index ca68509..cf1abeb 100644
--- a/refs.c
+++ b/refs.c
@@ -3118,6 +3118,16 @@ static int copy_msg(char *buf, const char *msg)
The safe_create_reflog function creates a reflog, if it does not
already exist.
The log_ref_setup function becomes private and gains a force_create
parameter to force the creation of a reflog even if log_all_ref_updates
is false or the refname is not one of the special refnames.
The new parameter
Add a flag to allow forcing the creation of a reflog even if the ref
name and core.logAllRefUpdates setting would not ordinarily cause ref
creation.
In a moment, we will use this to add options to git tag and git
update-ref to force reflog creation.
Signed-off-by: David Turner
---
refs.c | 34 +
This is in support of alternate ref backends which don't necessarily
store reflogs as files.
Signed-off-by: David Turner
---
git-stash.sh | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index 8e9e2cd..1d5ba7a 100755
--- a/git-stash.sh
+++ b/g
Allow the creation of a ref (e.g. stash) with a reflog already in
place. For most refs (e.g. those under refs/heads), this happens
automatically, but for others, we need this option.
Currently, git does this by pre-creating the reflog, but alternate ref
backends might store reflogs somewhere other
Junio C Hamano writes:
> Duy Nguyen writes:
>
>> Thank you both for catching this. Just a small suggestion. Perhaps we
>> should do this instead. apply_sparse_checkout() is the function where
>> all "action" manipulation (add, delete, update files..) for sparse
>> checkout occurs and it should n
David Turner writes:
> Junio, now that Michael has marked this as reviewed, do you want to pull
> from github, or do you want me to send a re-roll to the mailing list?
Let's see the final round; that would give me a chance to properly
sign-off your patch, and also give others a chance to eyeball
Junio C Hamano writes:
> While I still think that it is more important to prevent such a
> situation from occurring in the first place, ignoring .idx that lack
> corresponding .pack should be fairly simple, perhaps like this.
> ...
Sorry for the noise, but this patch is worthless. We already ha
On Tue, 2015-07-21 at 13:20 -0700, Michael Haggerty wrote:
> On 07/21/2015 08:44 AM, David Turner wrote:
> > This reroll addresses Michael Haggerty's comments:
> >
> > - Error messages are now in the form error: reason
> > - We no longer unnecessarily set errno in write_ref_to_lockfile
> > - Corre
From: "Junio C Hamano"
Junio C Hamano writes:
"Philip Oakley" writes:
... Ideally, if part of this
mainstream Git, it would get picked up automatically by them
(rather than being local 'fixes' endlessly carried forward).
Actually, that is not "ideal", but what I want to avoid.
As I do n
On 07/21/2015 08:44 AM, David Turner wrote:
> This reroll addresses Michael Haggerty's comments:
>
> - Error messages are now in the form error: reason
> - We no longer unnecessarily set errno in write_ref_to_lockfile
> - Corrected a spelling error in the new docs and another in the tests
> - Corr
On 07/21/2015 01:02 PM, Michael Haggerty wrote:
> On 07/21/2015 09:42 AM, Junio C Hamano wrote:
>> David Turner writes:
>>
>>> diff --git a/builtin/update-ref.c b/builtin/update-ref.c
>>> index 6763cf1..d9646ef 100644
>>> --- a/builtin/update-ref.c
>>> +++ b/builtin/update-ref.c
>>> @@ -14,6 +14,7
Junio C Hamano writes:
> "Philip Oakley" writes:
>
>> ... Ideally, if part of this
>> mainstream Git, it would get picked up automatically by them
>> (rather than being local 'fixes' endlessly carried forward).
>
> Actually, that is not "ideal", but what I want to avoid.
>
> As I do not do Windo
On 07/21/2015 09:42 AM, Junio C Hamano wrote:
> David Turner writes:
>
>> diff --git a/builtin/update-ref.c b/builtin/update-ref.c
>> index 6763cf1..d9646ef 100644
>> --- a/builtin/update-ref.c
>> +++ b/builtin/update-ref.c
>> @@ -14,6 +14,7 @@ static const char * const git_update_ref_usage[] = {
On 07/21/2015 08:45 AM, David Turner wrote:
> The safe_create_reflog function creates a reflog, if it does not
> already exist.
>
> The log_ref_setup function becomes private and gains a force_create
> parameter to force the creation of a reflog even if log_all_ref_updates
> is false or the refnam
On 07/21/2015 08:45 AM, David Turner wrote:
> Theis are necessary because alternate ref backends might store reflogs
s/Theis are/This is/
> somewhere other than .git/logs. Code that now directly manipulates
> .git/logs should instead go through git-reflog.
>
> Signed-off-by: David Turner
> [..
On Tue, Jul 21, 2015 at 1:57 PM, Junio C Hamano wrote:
> I wouldn't be surprised if such a configuration to have leftover
> ".idx" files that lack ".pack" affected performance, but I think you
> really have to work on getting into such a situation (unless your
> operating system is very cooperativ
There's one last error formatting niggle below.
On 07/21/2015 08:44 AM, David Turner wrote:
> Add an err argument to log_ref_setup that can explain the reason
> for a failure. This then eliminates the need to manage errno through
> this function since we can just add strerror(errno) to the err str
Jakub Narębski writes:
>> * tf/gitweb-project-listing (2015-03-19) 5 commits
>> - gitweb: make category headings into links when they are directories
>> - gitweb: optionally set project category from its pathname
>> - gitweb: add a link under the search box to clear a project filter
>> - gitw
Jakub Narębski writes:
> On 2015-07-21, Junio C Hamano wrote:
>
>> --
>> [Stalled]
>>
>> * sg/config-name-only (2015-05-28) 3 commits
>> - completion: use new 'git config' options to reliably list variable names
>> - SQUASH
>> - config: add opti
Zoë Blade writes:
H, the pattern has too many question marks to make a simple
panda brain spin.
> "^((\\.|((int|est|ext)?\\.?|i(nt)?\\.?/e(xt)?\\.?) ).+)$"
it can start with a dot, or match "something" at the beginning,
followed by a SP (is a tab allowed there instead of SP, I have to
wond
Dave Borowitz writes:
> Should I formally send a patch with your configuration one-liner?
Yeah, the log message, that explains the motivation of the change
and the decision to read which part of the configuration, is much
more important than the actual patch, so please do so ;-)
--
To unsubscrib
On Mon, Jul 20, 2015 at 12:50 AM, Christian Couder
wrote:
> On Sun, Jul 19, 2015 at 12:00 AM, Karthik Nayak wrote:
>> From: Karthik Nayak
>>
>> Using 'ref-filter' APIs implement the '--merged' and '--no-merged'
>> options into 'tag.c'. The '--merged' option lets the user to only
>> list tags mer
On Mon, Jul 20, 2015 at 11:42 PM, Eric Sunshine wrote:
> On Mon, Jul 20, 2015 at 4:01 AM, Christian Couder
> wrote:
>> On Mon, Jul 20, 2015 at 8:24 AM, Eric Sunshine
>> wrote:
>>> On Sat, Jul 18, 2015 at 3:12 PM, Karthik Nayak
>>> wrote:
+static int filter_pattern_match(struct ref_filter
"Philip Oakley" writes:
> ... Ideally, if part of this
> mainstream Git, it would get picked up automatically by them
> (rather than being local 'fixes' endlessly carried forward).
Actually, that is not "ideal", but what I want to avoid.
As I do not do Windows, it simply is wrong for me to appl
On Thu, Jul 16, 2015 at 3:08 PM, Dave Borowitz wrote:
> On Thu, Jul 16, 2015 at 2:10 PM, Junio C Hamano wrote:
>> Dave Borowitz writes:
>>
>>> On Thu, Jul 16, 2015 at 1:12 PM, Junio C Hamano wrote:
Dave Borowitz writes:
> On Thu, Jul 16, 2015 at 1:06 PM, Junio C Hamano wrote:
>>
Junio C Hamano writes:
> I however do not think that we mark the in-core structure that
> corresponds to an open ".idx" file in any way when such a failure
> happens. If we really cared enough, we could do so, saying "we know
> there is .idx file, but do not bother looking at it again, as we
> k
Doug Kelly writes:
> I just wanted to relay an issue we've seen before at my day job (and
> it just recently cropped up again). When moving users from Git for
> Windows 1.8.3 to 1.9.5, we found a few users started having operations
> take an excruciatingly long amount of time. At some point, we
On 2015-07-21, Junio C Hamano wrote:
> --
> [Stalled]
>
> * sg/config-name-only (2015-05-28) 3 commits
> - completion: use new 'git config' options to reliably list variable names
> - SQUASH
> - config: add options to list only variable names
>
From: "Junio C Hamano"
Philip Oakley writes:
This updates two patches in the series based on Eric Sunshine's
comments.
Patch 8b updates the commit message to make clear what was going
wrong.
Patch 10b improves the perl code.
Is v2b like saying v3 or something else? Does 8b replaces 8 or
Hi all,
I just wanted to relay an issue we've seen before at my day job (and
it just recently cropped up again). When moving users from Git for
Windows 1.8.3 to 1.9.5, we found a few users started having operations
take an excruciatingly long amount of time. At some point, we traced
the issue to
Lawrence Siebert wrote:
> On Fri, Jul 3, 2015 at 10:31 AM, Junio C Hamano wrote:
>> John Keeping writes:
>>> Or even `git rev-list --count HEAD -- "$FILENAME"`.
>>
>> Ahh, OK. I didn't know we already had "rev-list --count".
>>
>> Then please disregard the suggestion to add the option to "log";
On 2015-07-02 at 00:37, Junio C Hamano wrote:
> What's cooking in git.git (Jul 2015, #01; Wed, 1)
> --
> * tf/gitweb-project-listing (2015-03-19) 5 commits
> - gitweb: make category headings into links when they are directories
> - gitweb: optional
On Mon, Jul 20, 2015 at 10:59 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Your caller is iterating over the elements in a format string,
>> e.g. 'A %(align:20)%(foo) B %(bar) C', and its caller is iterating
>> over a list of refs, e.g. 'maint', 'master' branches. With that
>> format
David Turner writes:
> diff --git a/builtin/update-ref.c b/builtin/update-ref.c
> index 6763cf1..d9646ef 100644
> --- a/builtin/update-ref.c
> +++ b/builtin/update-ref.c
> @@ -14,6 +14,7 @@ static const char * const git_update_ref_usage[] = {
>
> static char line_termination = '\n';
> static
On Mon, 2015-07-20 at 22:15 -0700, Junio C Hamano wrote:
> David Turner writes:
>
> >> * dt/refs-backend-preamble (2015-07-13) 7 commits
> >> - git-stash: use update-ref --create-reflog instead of creating files
> >> - update-ref and tag: add --create-reflog arg
> >> - refs: add REF_FORCE_CREA
Add a flag to allow forcing the creation of a reflog even if the ref
name and core.logAllRefUpdates setting would not ordinarily cause ref
creation.
In a moment, we will use this to add options to git tag and git
update-ref to force reflog creation.
Signed-off-by: David Turner
---
refs.c | 34 +
Add an err argument to log_ref_setup that can explain the reason
for a failure. This then eliminates the need to manage errno through
this function since we can just add strerror(errno) to the err string
when meaningful. No callers relied on errno from this function for
anything else than the error
Allow the creation of a ref (e.g. stash) with a reflog already in
place. For most refs (e.g. those under refs/heads), this happens
automatically, but for others, we need this option.
Currently, git does this by pre-creating the reflog, but alternate ref
backends might store reflogs somewhere other
The safe_create_reflog function creates a reflog, if it does not
already exist.
The log_ref_setup function becomes private and gains a force_create
parameter to force the creation of a reflog even if log_all_ref_updates
is false or the refname is not one of the special refnames.
The new parameter
Theis are necessary because alternate ref backends might store reflogs
somewhere other than .git/logs. Code that now directly manipulates
.git/logs should instead go through git-reflog.
Signed-off-by: David Turner
---
Documentation/git-reflog.txt | 4
builtin/reflog.c | 33 +++
This is just for clarity.
Signed-off-by: David Turner
---
refs.c | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/refs.c b/refs.c
index f090720..2efa2dc 100644
--- a/refs.c
+++ b/refs.c
@@ -3118,6 +3118,16 @@ static int copy_msg(char *buf, const char *msg)
This is in support of alternate ref backends which don't necessarily
store reflogs as files.
Signed-off-by: David Turner
---
git-stash.sh | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh
index 8e9e2cd..1d5ba7a 100755
--- a/git-stash.sh
+++ b/g
This reroll addresses Michael Haggerty's comments:
- Error messages are now in the form error: reason
- We no longer unnecessarily set errno in write_ref_to_lockfile
- Corrected a spelling error in the new docs and another in the tests
- Corrected some copypasta in a test.
--
To unsubscribe from
On 07/09/2015 03:50 PM, David Turner wrote:
> The current state of the discussion on alternate ref backends is that
> we're going to continue to store pseudorefs (e.g. CHERRY_PICK_HEAD) as
> files in $GIT_DIR. So this re-roll of the refs backend preamble
> doesn't do anything to pseudorefs. It ju
On 07/09/2015 03:50 PM, David Turner wrote:
> Allow the creation of a ref (e.g. stash) with a reflog already in
> place. For most refs (e.g. those under refs/heads), this happens
> automatically, but for others, we need this option.
>
> Currently, git does this by pre-creating the reflog, but alte
On 07/09/2015 03:50 PM, David Turner wrote:
> Theis are necessary because alternate ref backends might store reflogs
> somewhere other than .git/logs. Code that now directly manipulates
> .git/logs should instead go through git-reflog.
>
> Signed-off-by: David Turner
> ---
> Documentation/git-r
On 20 Jul 2015, at 22:17, Junio C Hamano wrote:
>> +PATTERNS("fountain",
>> "^((\\.|(([Ii][Nn][Tt]|[Ee][Ss][Tt]|[Ee][Xx][Tt])?\\.?|[Ii]([Nn][Tt])?\\.?/[Ee]([Xx][Tt])?\\.?)
>> ).+)$",
>> + "[^ \t-]+"),
>
> Wouldn't IPATTERN() be a better choice here?
Good point, thank you! Much better:
I
Add support for Fountain, a plain text screenplay format. Git
facilitates not just programming specifically, but creative writing
in general, so it makes sense to also support other plain text
documents besides source code.
In the structure of a screenplay specifically, scenes are roughly
analogo
On 07/09/2015 03:50 PM, David Turner wrote:
> Add an err argument to log_ref_setup that can explain the reason
> for a failure. This then eliminates the need to manage errno through
> this function since we can just add strerror(errno) to the err string
> when meaningful. No callers relied on errno
On 21.07.15 12:28, Paul Mackerras wrote:
> On Tue, Jul 21, 2015 at 12:19:23PM +0200, Beat Bolli wrote:
>> Guys,
>>
>> can I get a Yea or Nay for this patch?
>>
>> Does it go in via Paul's gitk repo or directly through Junio?
>
> I'll put it in. It goes into my repo and from there into Junio's.
>
On Tue, Jul 21, 2015 at 12:19:23PM +0200, Beat Bolli wrote:
> Guys,
>
> can I get a Yea or Nay for this patch?
>
> Does it go in via Paul's gitk repo or directly through Junio?
I'll put it in. It goes into my repo and from there into Junio's.
I'm on vacation and travelling this week, so please
Guys,
can I get a Yea or Nay for this patch?
Does it go in via Paul's gitk repo or directly through Junio?
Thanks,
Beat
On 18.07.15 13:15, Beat Bolli wrote:
> When referring to earlier commits in commit messages or other text, one
> of the established formats is
>
> ("", )
>
> Add a "Co
When gitk is run with " --not " args, things work
fine until one tries to modify the view.
There it considers "--not" to be an extra git-log argument on its own, and
groups the negative refs together with the
positive refs, which naturally gives completely wrong results.
Not sure what the best c
67 matches
Mail list logo
