Need to update git-svn.perl to match Documentation/git-svn.txt so
--preserve-merges|p can be used in dcommit. Similar to
https://github.com/git/git/commit/b64e1f58158d1d1a8eafabbbf002a1a3c1d72929#diff-f9a64e34cbe6c3ee4f62698008a33773R571
Nate.
Documentation/git-svn.txt
626 -m::
627 --merge::
Hi,
I'm having some problems with the `git log` command.
Setup:
Happens in multiple versions, tested on 1.8.* and 2.*
The problem happens when I try to get a pretty log for a commit with a
wrong date.
Executing the command:
`git log --encoding=UTF-8 --date=raw
On Thu, May 29, 2014 at 4:33 AM, Pasha Bolokhov
pasha.bolok...@gmail.com wrote:
Agree, but partial here means... what? just a little doc?
I'm sorry, I tried to be cute and failed :$
This is not official name for documentation files that are meant for inclusion
and not as standalone manpages.
Hello,
mingw.h defines a preprocessor macro main(), so that it can wrap the
original function and hoook into initialization.
The real main() function can have different types of its second
parameter (char**, const char**, char*[]). It is not easy to match
the type and gcc issues a const
From: Karsten Blees bl...@dcon.de
Date: Fri, 7 Jan 2011 19:47:23 +0100
The code in the MinGW main macro is getting more and more complex, move to
a separate initialization function for readabiliy and extensibility.
Signed-off-by: Karsten Blees bl...@dcon.de
Signed-off-by: Erik Faye-Lund
Fix const warnings in http-fetch.c and remote-curl.c main() where is
argv declared as const.
The fix should work for all future declarations of main, no matter
whether the second parameter's type is char**, const char**, or
char *[].
Signed-off-by: Stepan Kasal ka...@ucw.cz
---
compat/mingw.h |
On Thu, May 29, 2014 at 5:29 PM, Rodrigo Fernandes rtfrodr...@gmail.com wrote:
I get an empty response on the date field, but since pretty has `%ad`
it should follow the --date and return the date even if wrong.
...
I tried to check the source code but have no idea where to start,
maybe if
On do, 2014-05-29 at 11:29 +0100, Rodrigo Fernandes wrote:
The problem happens when I try to get a pretty log for a commit with a
wrong date.
The commit is:
===
$ git cat-file commit e9dddaf24c9de45d9b4efdf38eff7c30eb200f48
tree d63aeb159635cb231e191505a95a129a3b4a7b38
parent
Am 29.05.2014 04:07, schrieb Jonathan Leonard:
The title pretty much says it all.
But you do not give much information about your special use
case. I assume you have submodule repositories for which some
developers have a valid ssh key and others don't (maybe
because they should only have read
Signed-off-by: Stepan Kasal ka...@ucw.cz
---
Hi,
mingw does not have FIFOs, so it cannot run git-daemon tests.
Stepan
t/lib-git-daemon.sh | 5 +
1 file changed, 5 insertions(+)
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
index bc4b341..9b1271c 100644
--- a/t/lib-git-daemon.sh
On Thu, May 29, 2014 at 5:11 AM, Pasha Bolokhov
pasha.bolok...@gmail.com wrote:
+ len = strlen(n_git); /* real_path() has stripped trailing slash */
+ for (i = len - 1; i 0 !is_dir_sep(n_git[i]); i--) ;
+ basename = n_git + i;
+ if (is_dir_sep(*basename))
+
On Wed, May 28, 2014 at 03:57:35PM -0400, David Turner wrote:
+ifdef NO_SSE
+ BASIC_CFLAGS += -DNO_SSE
This is not a great name. This implies the system does not have SSE
(SSE 1), but in fact what you're concerned about is SSE 4. This will be
confusing for users of older x86-64
Dennis I think that could be an improvement.
Duy, can you point me where is the date print from normal `git log` or
`git show` so I can compare?
On Thu, May 29, 2014 at 12:07 PM, Dennis Kaarsemaker
den...@kaarsemaker.net wrote:
On do, 2014-05-29 at 11:29 +0100, Rodrigo Fernandes wrote:
The
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
git-compat-util.h | 1 +
wrapper.c | 68 ++-
2 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/git-compat-util.h b/git-compat-util.h
index f6d3a46..f23e4e4 100644
Too large files may lead to failure to allocate memory. If it happens
here, it could impact quite a few commands that involve
diff. Moreover, too large files are inefficient to compare anyway (and
most likely non-text), so mark them binary and skip looking at their
content.
Noticed-by: Dale R.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
diff.c| 13 +++--
diffcore-rename.c | 6 --
diffcore.h| 3 ++-
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/diff.c b/diff.c
index f72769a..54281cb 100644
--- a/diff.c
+++ b/diff.c
@@
On Thu, May 29, 2014 at 7:24 PM, Rodrigo Fernandes rtfrodr...@gmail.com wrote:
Duy, can you point me where is the date print from normal `git log` or
`git show` so I can compare?
It's the same function, show_date() in date.c.
--
Duy
--
To unsubscribe from this list: send the line unsubscribe
On Thu, May 29, 2014 at 01:36:14PM +0200, Stepan Kasal wrote:
Signed-off-by: Stepan Kasal ka...@ucw.cz
---
Hi,
mingw does not have FIFOs, so it cannot run git-daemon tests.
Thanks. I took a peek at the mkfifo call here. It is used to make sure
the daemon has started before we run the
On Thu, May 29, 2014 at 7:22 AM, Azat Khuzhin a3at.m...@gmail.com wrote:
Hi there,
Using the latest version of git-multimail there is an issue with
migration:
$ ~azat/git-multimail/git-multimail/migrate-mailhook-config --overwrite
Traceback (most recent call last):
...
File
This patch series can also be found at
https://github.com/rsahlberg/git/tree/ref-transactions
Ronnie please review these remaining patches in this series.
Sahlberg (44):
refs.c: constify the sha arguments for
ref_transaction_create|delete|update
refs.c: allow passing NULL to
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
fast-import.c | 29 +++--
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 4a7b196..587ef4a 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1735,15 +1735,32 @@
Change s_update_ref to use a ref transaction for the ref update.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
builtin/fetch.c | 21 +
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index faa1233..b13e8f9 100644
---
Update repack_without_refs to take an err argument and update it if there
is a failure. Pass the err variable from ref_transaction_commit to this
function so that callers can print a meaningful error message if _commit
fails due to a problem in repack_without_refs.
Add a new function
Add an err argument to delete_loose_ref so that we can pass a descriptive
error string back to the caller. Pass the err argument from transaction
commit to this function so that transaction users will have a nice error
string if the transaction failed due to delete_loose_ref.
Add a new function
Change the reference transactions so that we pass the reflog message
through to the create/delete/update function instead of the commit message.
This allows for individual messages for each change in a multi ref
transaction.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
branch.c
Change prune_ref to delete the ref using a ref transaction. To do this we also
need to add a new flag REF_ISPRUNING that will tell the transaction that we
do not want to delete this ref from the packed refs. This flag is private to
refs.c and not exposed to external callers.
Signed-off-by: Ronnie
Track the status of a transaction in a new status field. Check the field for
sanity, i.e. that status must be OPEN when _commit/_create/_delete or
_update is called or else die(BUG:...)
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
refs.c | 36 +++-
1
Move the check for check_refname_format from lock_any_ref_for_update
to lock_ref_sha1_basic. At some later stage we will get rid of
lock_any_ref_for_update completely.
This leaves lock_any_ref_for_updates as a no-op wrapper which could be removed.
But this wrapper is also called from an external
Allow passing a list of refs to skip checking to name_conflict_fn.
There are some conditions where we want to allow a temporary conflict and skip
checking those refs. For example if we have a transaction that
1, guarantees that m is a packed refs and there is no loose ref for m
2, the transaction
No external users call write_ref_sha1 any more so lets declare it static.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
refs.c | 6 +-
refs.h | 3 ---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/refs.c b/refs.c
index 6414afc..aefa5bc 100644
--- a/refs.c
+++
Wrap all the ref updates inside a transaction.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
builtin/receive-pack.c | 31 ++-
1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index c323081..13f4a63
In _commit, ENOTDIR can happen in the call to lock_ref_sha1_basic, either when
we lstat the new refname and it returns ENOTDIR or if the name checking
function reports that the same type of conflict happened. In both cases it
means that we can not create the new ref due to a name conflict.
For
Switch to using ref transactions in walker_fetch(). As part of the refactoring
to use ref transactions we also fix a potential memory leak where in the
original code if write_ref_sha1() would fail we would end up returning from
the function without free()ing the msg string.
Note that this
Change delete_ref to use a ref transaction for the deletion. At the same time
since we no longer have any callers of repack_without_ref we can now delete
this function.
Change delete_ref to return 0 on success and -1 on failure instead of the
previous 0 on success either 1 or -1 on failure.
On Wed, May 28, 2014 at 4:39 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Ronnie Sahlberg wrote:
I rely on the fact that if the transaction has failed then it is safe
to call ref_transaction_commit since it is guaranteed to return an
error too.
Yes, I am saying that behavior for
These patches are the remaining patches that need review in this series.
Please review them.
On Thu, May 29, 2014 at 9:07 AM, Ronnie Sahlberg sahlb...@google.com wrote:
This patch series can also be found at
https://github.com/rsahlberg/git/tree/ref-transactions
Ronnie please review these
On Thu, May 29, 2014 at 05:50:56PM +0700, Duy Nguyen wrote:
On Thu, May 29, 2014 at 5:29 PM, Rodrigo Fernandes rtfrodr...@gmail.com
wrote:
I get an empty response on the date field, but since pretty has `%ad`
it should follow the --date and return the date even if wrong.
...
I
Duy Nguyen pclo...@gmail.com writes:
On Thu, May 29, 2014 at 6:49 AM, David Turner dtur...@twopensource.com
wrote:
I assume that most of the time spent in check_refname_component() is
while reading the packed-refs file, right?
Yes.
I wonder if we can get away without SSE code by saving
Ronnie Sahlberg wrote:
On Wed, May 28, 2014 at 4:39 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Usually when ref_transaction_commit is called I can do
struct strbuf err = STRBUF_INIT;
if (ref_transaction_commit(..., err))
die(%s, err.buf);
and I know that
On Wed, May 28, 2014 at 03:12:15AM +, Naumov, Michael (North Sydney) wrote:
Some git tools such as GitExtensions for Windows use environment
variable TERM=msys which causes the weird ANSI sequence shown for the
messages returned from server-side hooks
We add those ANSI sequences to help
Hi,
Ronnie Sahlberg wrote:
Update repack_without_refs to take an err argument and update it if there
is a failure. Pass the err variable from ref_transaction_commit to this
function so that callers can print a meaningful error message if _commit
fails due to a problem in repack_without_refs.
Jens Lehmann jens.lehm...@web.de writes:
Am 29.05.2014 04:07, schrieb Jonathan Leonard:
The title pretty much says it all.
But you do not give much information about your special use
case.
Perhaps git grep insteadOf Documentation/ is all that is needed?
--
To unsubscribe from this list:
On Wed, May 28, 2014 at 06:17:25PM -0500, Felipe Contreras wrote:
This is the last mail I sent to you, because you ignore them anyway, and
remove them from the mailing list.
[...]
[2], a mail you conveniently removed from the tracked record.
[...]
You also conveniently removed this mail
Jeff King p...@peff.net writes:
...
to at least make --format date output consistent with the rest of git
(and to make %at consistent with %ad and --date=raw). That still
doesn't address Rodrigo's concern, though (we would print 0 +).
For that, we would want on top:
1. Teach
Richard Hansen rhan...@bbn.com writes:
These are the same tests as in t9903, but run in zsh instead of bash.
Signed-off-by: Richard Hansen rhan...@bbn.com
---
t/lib-zsh.sh | 30 ++
t/t9904-zsh-prompt.sh | 10 ++
2 files changed, 40
From: David Lang da...@lang.hm
well, as others noted, the problem is actually caused by doing the diffs, and
that is something that is a very common thing to do with source code.
To some degree, my attitude comes from When I Was A Boy, when you got
16k for both your bytecode and your data,
Jeff King p...@peff.net writes:
On Wed, May 28, 2014 at 06:17:25PM -0500, Felipe Contreras wrote:
This is the last mail I sent to you, because you ignore them anyway, and
remove them from the mailing list.
[...]
[2], a mail you conveniently removed from the tracked record.
[...]
You also
- Original Message -
From: Jennifer H Gerald
This Email is to notify you that your Email address have Won you an Award
Sum of 1.500,000.00 (1.5 Million Euros) in an E-mail balloting program
Held in Europe.
On Thu, May 29, 2014 at 09:23:06PM +0200, David Kastrup wrote:
I do not think Junio or anyone else has the technical ability to remove
messages from the archive.
You can post self-destructing messages by adding X-no-archive: yes if I
am not mistaken. But that only concerns stuff you post
On Thu, May 29, 2014 at 11:57:15AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
...
to at least make --format date output consistent with the rest of git
(and to make %at consistent with %ad and --date=raw). That still
doesn't address Rodrigo's concern, though (we would
Jeff,
I have no idea what was the tool. The repo is not mine. I found the
problem when I was doing some tests and the commit parsing was failing
on that repo.
Cumprimentos,
Rodrigo Fernandes
On Thu, May 29, 2014 at 8:49 PM, Jeff King p...@peff.net wrote:
On Thu, May 29, 2014 at 11:57:15AM
On Wed, May 28, 2014 at 04:45:57PM -0700, Pasha Bolokhov wrote:
Move backwards from the end of the string (more efficient for
lines which do not have trailing spaces or have just a couple).
The original code reads the string from left to right. In theory, that
means we could get away with not
On Thu, May 29, 2014 at 1:13 PM, Jeff King p...@peff.net wrote:
On Wed, May 28, 2014 at 04:45:57PM -0700, Pasha Bolokhov wrote:
Move backwards from the end of the string (more efficient for
lines which do not have trailing spaces or have just a couple).
The original code reads the string
Signed-off-by: Richard Hansen rhan...@bbn.com
---
On 2014-05-29 15:02, Thomas Rast wrote:
Richard Hansen rhan...@bbn.com writes:
These are the same tests as in t9903, but run in zsh instead of bash.
Signed-off-by: Richard Hansen rhan...@bbn.com
---
t/lib-zsh.sh | 30
From: Linus Torvalds torva...@linux-foundation.org
Date: Thu, 29 May 2014 15:19:40 -0700
Subject: [RFC PATCH] git log: support auto decorations
This works kind of like --color=auto - add decorations for interactive
use, but do not change defaults when scripting or when piping the output
to
- Branches is a more common way to say heads in these days.
- Remote-tracking branches are used a lot more these days and it is
worth mentioning that it is one of the primary side effects of
the command to update them.
- Avoid X. That means Y. If Y is easier to understand to
While it is not *wrong* per-se to say that pulling a rewound/rebased
branch will lead to an unnecessary merge conflict, that is not what
the leading + sign to allow non-fast-forward update of remote-tracking
branch is at all.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
Replace desription of old-style Pull: lines in remotes/
configuration with modern remote.*.fetch variables.
As this note applies only to git pull, enable it only
in git-pull manual page.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
Documentation/pull-fetch-param.txt | 12
1
The text made it sound as if the leading plus is the only thing that
is optional, and forgot that lhs is the same as lhs:, i.e. fetch
it and do not store anywhere.
Signed-off-by: Junio C Hamano gits...@pobox.com
---
Documentation/pull-fetch-param.txt | 1 +
1 file changed, 1 insertion(+)
diff
Noticed that this page has antiquated description, which may still
be correct, that can use some modernization.
There are a few more larger updates coming, but these are small
enough to be reviewed separately and quickly, so I am sending them
out early.
Junio C Hamano (5):
fetch doc: update
In old days before Git 1.5, it was customery for git fetch to use
the same local branch namespace to keep track of the remote-tracking
branches, and it was necessary to tell users not to check them out
and commit on them. Since everybody uses the separate remote layout
these days, there is no
But you do not give much information about your special use
case. I assume you have submodule repositories for which some
developers have a valid ssh key and others don't (maybe
because they should only have read access via https)?
Precisely. Specifically this is for a collection (17 or
On Thu, May 29, 2014 at 11:36 PM, Junio C Hamano gits...@pobox.com wrote:
Duy Nguyen pclo...@gmail.com writes:
On Thu, May 29, 2014 at 6:49 AM, David Turner dtur...@twopensource.com
wrote:
I assume that most of the time spent in check_refname_component() is
while reading the packed-refs
I observe test failures with git 2.0.0 which are attributable to the
change to run network tests by default. I'm lumping them both together
into one report because I'm lazy and I've blown too much time on this
already.
I've got Apache 2.2.24 on this box, and t5551-http-fetch-smart.sh fails
in a
On Fri, May 30, 2014 at 6:41 AM, Jeff King p...@peff.net wrote:
On Fri, May 30, 2014 at 06:24:30AM +0700, Duy Nguyen wrote:
I wonder if we can get away without SSE code by saving stat info of
the packed-refs version that we have verified. When we read pack-refs,
if stat info matches, skip
On Thu, May 29, 2014 at 04:12:38PM -0700, Jonathan Leonard wrote:
We are using GitHub.
[...]
But why is https special? Why not fall back to the git
protocol? Or http? (And no: I'm not serious here ;-)
HTTPS isn't special except in that it is the least privileged
transport type (and
On Fri, May 30, 2014 at 06:43:18AM +0700, Duy Nguyen wrote:
The first time we read packed_refs, check_refname_format() is called
in read_packed_refs()-create_ref_entry() as usual. If we find no
problem, we store packed_refs stat() info in maybe packed_refs.stat.
Next time we read
Hello!
I've tried to changing the URL of a remote temporarily because of network
issues. I tried something like this:
git -c remote.foo.url=http://gitserver.example/repo.git push foo bar
Tracing shows that git push does not use the provided URL for the remote foo
and instead uses the URL
On Thu, May 29, 2014 at 11:44:37PM +0100, Nix wrote:
I observe test failures with git 2.0.0 which are attributable to the
change to run network tests by default. I'm lumping them both together
into one report because I'm lazy and I've blown too much time on this
already.
Weird. I also see a
These were originally removed by 0232852 (t5537: move
http tests out to t5539, 2014-02-13). However, they were
accidentally re-added in 1ddb4d7 (Merge branch
'nd/upload-pack-shallow', 2014-03-21).
This looks like an error in manual conflict resolution.
Here's what happened:
1. v1.9.0 shipped
On Fri, May 30, 2014 at 02:03:56AM +0200, f...@fuz.su wrote:
I've tried to changing the URL of a remote temporarily because of network
issues. I tried something like this:
git -c remote.foo.url=http://gitserver.example/repo.git push foo bar
Tracing shows that git push does not use the
On Thu, May 29, 2014 at 03:31:58PM -0700, Linus Torvalds wrote:
From: Linus Torvalds torva...@linux-foundation.org
Date: Thu, 29 May 2014 15:19:40 -0700
Subject: [RFC PATCH] git log: support auto decorations
I will spare you the usual lecture on having these lines in the message
body. ;)
I
On Fri, May 30, 2014 at 7:07 AM, Jeff King p...@peff.net wrote:
But then we're just trusting that the trust me flag on disk is
correct. Why not just trust that packed-refs is correct in the first
place?
IOW, consider this progression of changes:
1. Check refname format when we read
On Fri, May 30, 2014 at 11:12 AM, Jonathan Leonard johana...@gmail.com wrote:
But you do not give much information about your special use
case. I assume you have submodule repositories for which some
developers have a valid ssh key and others don't (maybe
because they should only have read
On Thu, May 29, 2014 at 6:58 PM, Jeff King p...@peff.net wrote:
I will spare you the usual lecture on having these lines in the message
body. ;)
We do it for the kernel because they often get lost otherwise.
Particularly the date/author.
git doesn't tend to have the same kind of deep email
75 matches
Mail list logo
