Allow extracting To/Cc addresses from the first patch
(typically the cover letter), and use them as To/Cc addresses of the
remainder of the series.
Signed-off-by: Michael S. Tsirkin m...@redhat.com
---
Documentation/git-send-email.txt | 12
git-send-email.perl | 16
On 29 April 2014 13:32:29 GMT+10:00, Felipe Contreras
felipe.contre...@gmail.com wrote:
James Denholm wrote:
No, true, but my point was more related to that it's ones own task,
perhaps being the better term than job, to debate the merits of one's
own work when the merits are currently unknown
Add tests for the new feature.
Signed-off-by: Michael S. Tsirkin m...@redhat.com
---
t/t9001-send-email.sh | 45 +
1 file changed, 45 insertions(+)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 1ecdacb..97cc094 100755
---
On 04/29/2014 05:23 AM, Jeff King wrote:
On Mon, Apr 28, 2014 at 10:49:30PM +0200, Torsten Bögershausen wrote:
OK, thanks for the description.
In theory we can make Git composition ignoring by changing
index_file_exists() in name-hash.c.
(Both names must be precomposed first and compared then)
On Mon, Apr 28, 2014 at 05:23:25PM +0200, Erik Faye-Lund wrote:
On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko ma...@slonopotamus.org
wrote:
nedalloc was initially added in f0ed82 to fix slowness of standard WinXP
memory allocator. Since WinXP is EOLed, this point is no longer valid.
Jeff King wrote:
[1] I do not know about others, but I typically cut and paste from
another terminal, and use the following alias in my config:
[alias]
ll = !git --no-pager log -1 --pretty='tformat:%h (%s, %ad)'
--date=short
I have:
[alias]
short = show --quiet
Marat Radchenko wrote:
We need to make a decision: drop nedalloc, update nedalloc to later release,
patch nedalloc to make it work under MinGW-W64 or disable nedalloc under
MinGW-W64 (still leaving it enabled under MinGW).
I say go for the latter (disable for mingw-264). It can be fixed
- Ursprungligt meddelande -
Från: Felipe Contreras felipe.contre...@gmail.com
Till: James Denholm nod.h...@gmail.com, Felipe Contreras
felipe.contre...@gmail.com
Kopia: David Kastrup d...@gnu.org, Jeremy Morton
ad...@game-point.net, Johan Herland jo...@herland.net,
Git mailing
James Denholm wrote:
You cannot expect that anybody but yourself is willing to propose,
debate the merits of and otherwise defend patches that you have
authored (herein your patches, implying authorship, not
ownership).
This is the original comment:
David Kastrup wrote:
It becomes easier
Felipe Contreras felipe.contre...@gmail.com writes:
Contributors don't have any responsibility to champion their patches.
It is pro bono work.
No, that's just the appearance that should be upheld in the higher
society. It's ok to get paid for work on Git as long as you don't
mention it in
Unlike MinGW, MinGW-W64 has lseek already properly defined in io.h.
Signed-off-by: Marat Radchenko ma...@slonopotamus.org
Acked-by: Eric Faye-Lund kusmab...@gmail.com
---
compat/mingw.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/compat/mingw.h b/compat/mingw.h
index e033e72..262b300
Differences with v1:
- Dropped MINGW: compat/bswap.h: include stdint.h, it isn't needed after
MINGW: git-compat-util.h: use inttypes.h for printf macros
- Split MINGW: config.mak.uname allow using CURL for non-msysGit builds
into MINGW: config.mak.uname: allow using cURL for non-msysGit
To ease cross-compilation process, introduce a single variable
with the prefix to all compiler-related executables.
Define CROSS_COMPILE=foo- if your compiler and binary utilities
are foo-cc, foo-ar, foo-strip, etc. More specific variables
override this, so if you set CC=gcc
-D__USE_MINGW_ACCESS only affects MinGW and does nothing when
MSVC is used.
Signed-off-by: Marat Radchenko ma...@slonopotamus.org
Acked-by: Eric Faye-Lund kusmab...@gmail.com
---
config.mak.uname | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.mak.uname
fork() is not used in MinGW builds but causes a compiler warning
on x86_64 MinGW-W64: conflicting types for built-in function 'fork'
Signed-off-by: Marat Radchenko ma...@slonopotamus.org
Acked-by: Eric Faye-Lund kusmab...@gmail.com
---
compat/mingw.h | 2 --
1 file changed, 2 deletions(-)
diff
On MinGW, compat/mingw.h defines a 'mingw_main' wrapper function.
Fix `warning: passing argument 2 of 'mingw_main' from incompatible
pointer type` in http-fetch.c and remote-curl.c by dropping 'const'.
Signed-off-by: Marat Radchenko ma...@slonopotamus.org
---
http-fetch.c | 5 +++--
pid_t is available in sys/types.h on both MinGW and MinGW-W64
Signed-off-by: Marat Radchenko ma...@slonopotamus.org
Acked-by: Eric Faye-Lund kusmab...@gmail.com
---
compat/mingw.h | 1 -
compat/msvc.h | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/compat/mingw.h
1. Unlike MinGW, MinGW-W64 already provides _ReadWriteBarrier macro,
so don't try to redefine it.
2. MinGW-W64 has a strange definition FORCEINLINE as
extern __inline__ __attribute__((__always_inline__,__gnu_inline__))
'extern' doesn't work together with 'static', so #undef MinGW-W64
On MinGW-W64, MsgWaitForMultipleObjects is guarded with #ifndef NOGDI.
Removal -DNOGDI=1 from config.mak.uname has an undesirable effect of
bringing in wingdi.h with weird #define ERROR 0 that conflicts with
internal Git enums. So, just #undef NOGDI in compat/poll/poll.c.
Signed-off-by: Marat
HAVE_LIBCHARSET_H and NO_R_TO_GCC_LINKER are not specific to
msysGit, they're general MinGW settings.
Logic behind HAVE_LIBCHARSET_H: if user is on MinGW and has iconv,
we expect him to have libcharset.h. If user doesn't have iconv,
he has to explicitly say so via NO_ICONV=1.
Signed-off-by:
Is it absolutely valid and possible to have cURL in generic
MinGW environment. Building Git without cURL is still possible
by passing NO_CURL=1
Signed-off-by: Marat Radchenko ma...@slonopotamus.org
Acked-by: Eric Faye-Lund kusmab...@gmail.com
---
config.mak.uname | 2 --
1 file changed, 2
A few trivial updates, a few important fixes.
Daniel Liew (1):
git-remote-hg: use internal clone's hgrc
Felipe Contreras (7):
remote-hg: fix parsing of custom committer
remote-hg: update to 'public' phase when pushing
remote-{hg,bzr}: store marks only on success
remote-hg: properly
From: Daniel Liew delcyp...@gmail.com
Use the hgrc configuration file in the internal mercurial repository in
addition to the other system wide hgrc files. This is done by using the
'ui' object from the 'repository' object which will have loaded the
repository hgrc file if it exists.
Other tools use the 'committer' extra field differently, so let's make
the parsing more reliable and don't assume it's in a certain format.
Reported-by: Kevin Cox kevin...@kevincox.ca
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-remote-hg.py | 8 ++--
1 file changed, 6
This is what Mercurial does.
Reported-by: Nathan Palmer
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-remote-hg.py | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/git-remote-hg.py b/git-remote-hg.py
index c849abb..204ceeb 100755
---
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5810-remote-hg.sh | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/t/t5810-remote-hg.sh b/t/t5810-remote-hg.sh
index 594a0a1..ba8b2d8 100755
--- a/t/t5810-remote-hg.sh
+++ b/t/t5810-remote-hg.sh
@@
Cleanup 51be46e (remote-hg: do not fail on invalid bookmarks).
Having a 40-characters string is not ideal, and having three tests for
basically the same relatively rare situation is overkill.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-remote-hg.py | 2 +-
This can happen when there's a synchronization issue between marks-git
and marks-hg; a key is missing in marks-hg, and when we receive a reset
command the value of ctx basically comes from None.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-remote-hg.py | 5 +
1 file
Commit 2594a79 (remote-hg: fix bad state issue) originally introduced
this code in order to avoid synchronization issues while pushing,
because `git fast-export` might end up writing the marks before a crash
in the remote helper occurs.
However, the problem is in `git fast-export`; the marks
We want to ignore secondary heads, otherwise we will import revisions
that won't have any ref pointing to them and might eventually be pruned,
which would cause problems with the synchronization of marks.
This can only be expressed properly as '::b - ::a', but that's not
efficient, specially in
On 04/28/2014 07:59 PM, Ronnie Sahlberg wrote:
On Fri, Apr 25, 2014 at 6:31 PM, Michael Haggerty mhag...@alum.mit.edu
wrote:
On 04/25/2014 06:14 PM, Ronnie Sahlberg wrote:
Change ref_transaction_commit to take a pointer to a pointer for the
transaction. This allows us to clear the
On 04/28/2014 09:16 PM, Ronnie Sahlberg wrote:
On Fri, Apr 25, 2014 at 4:16 PM, Michael Haggerty mhag...@alum.mit.edu
wrote:
On 04/25/2014 06:14 PM, Ronnie Sahlberg wrote:
Change create_branch to use a ref transaction when creating the new branch.
ref_transaction_create will check that the
David Kastrup wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
Contributors don't have any responsibility to champion their
patches. It is pro bono work.
No, that's just the appearance that should be upheld in the higher
society. It's ok to get paid for work on Git as long
David Kastrup wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
David Kastrup wrote:
Even while the ones getting the benefits from your work will not
feel an obligation to make it worth your while, there is a
difference in satisfaction between getting your work trashed and
Felipe Contreras felipe.contre...@gmail.com writes:
David Kastrup wrote:
Well, there you have it. The ones that do any kind of relevant change
are the ones that need thinking about and consideration. And when you
are so verbose about them that
a) you are getting on people's nerves
b)
From: Karsten Blees bl...@dcon.de
Date: Fri, 7 Jan 2011 17:20:21 +0100
Dynamic linking is generally preferred over static linking, and MSVCRT.dll
has been integral part of Windows for a long time.
This also fixes linker warnings for _malloc and _free in zlib.lib, which
seems to be compiled for
David Kastrup wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
David Kastrup wrote:
Well, there you have it. The ones that do any kind of relevant change
are the ones that need thinking about and consideration. And when you
are so verbose about them that
a) you are
Felipe Contreras felipe.contre...@gmail.com writes:
David Kastrup wrote:
The default behavior of git push.
This is a minor change that not many people would notice, and it has not
actually happend. But fine, let's count it as one.
Shrug. Your diatribe is to a good part about the default
Previously 'git rev-parse --show-toplevel' was used to determine the
canonical work-tree only when the installed git version was detected to
be 1.7.0 or better. The fall-back logic used the core.worktree config
variable which in the case of a submodule is a relative path from the
submodule's
I've no right to say this, given that I've no contributions
thus far to the project, little history in open source at all,
and have only been following the list for less than a week,
but I'll say it anyway, mayhaps.
And I don't mean this to cause offence, or inspire outrage,
or any similar sort
On 28/04/2014 17:37, Junio C Hamano wrote:
Christian Couderchrisc...@tuxfamily.org writes:
From: Junio C Hamanogits...@pobox.com
Christian Couderchrisc...@tuxfamily.org writes:
...
+ trailer. After some alphanumeric characters, it can contain
+ some non alphanumeric
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
git-pull.sh | 65 -
1 file changed, 34 insertions(+), 31 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index d4e25f1..3dfd856 100755
--- a/git-pull.sh
+++
And branch.$name.pullmode.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
t/t5505-remote.sh | 2 +-
t/t5520-pull.sh | 54 +++---
2 files changed, 24 insertions(+), 32 deletions(-)
diff --git a/t/t5505-remote.sh
Also, deprecate --no-rebase since there's no need for it any more.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-pull.txt | 8 ++--
git-pull.sh| 6 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/git-pull.txt | 18 ++
git-pull.sh | 2 +-
t/t4013-diff-various.sh | 2 +-
t/t5500-fetch-pack.sh| 2 +-
t/t5524-pull-msg.sh | 2 +-
t/t5700-clone-reference.sh
It is very typical for Git newcomers to inadvertently create merges and worst:
inadvertently pushing them. This is one of the reasons many experienced users
prefer to avoid 'git pull', and recommend newcomers to avoid it as well.
To avoid these problems and keep 'git pull' useful, it has been
Also 'branch.name.rebase' to 'branch.name.pullmode'.
This way 'pull.mode' can be set to 'merge', and the default can be
something else.
The old configurations still work, but get deprecated.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
Documentation/config.txt | 34
It is very typical for Git newcomers to inadvertently create merges and
worst; inadvertently pushing them. This is one of the reasons many
experienced users prefer to avoid 'git pull', and recommend newcomers to
avoid it as well.
To avoid these problems and keep 'git pull' useful, it has been
On Tue, Apr 29, 2014 at 1:05 PM, Jeremy Morton ad...@game-point.net wrote:
On 28/04/2014 17:37, Junio C Hamano wrote:
Christian Couderchrisc...@tuxfamily.org writes:
From: Junio C Hamanogits...@pobox.com
Christian Couderchrisc...@tuxfamily.org writes:
...
+ trailer. After some
David Kastrup wrote:
Felipe Contreras felipe.contre...@gmail.com writes:
David Kastrup wrote:
The default behavior of git push.
This is a minor change that not many people would notice, and it has not
actually happend. But fine, let's count it as one.
Shrug. Your diatribe is to
James Denholm wrote:
I've no right to say this, given that I've no contributions I'm not
saying that you shouldn't work on the git codebase, you could very
easily fork it and make the innovative SCMS none of us can see, and
kill git. Can be done, if hunting really is the best choice as you
Postkassen har overskredet grænsen for opbevaring. re-validere din postkasse
ved hjælp af nedenstående link.
https://knlhymiopiojda.typeform.com/to/HDCcIw
Tak,
Webmail System Administrator
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
Felipe Contreras wrote
[PATCH v5 1/6] pull: rename pull.rename to pull.mode
s/pull.rename/pull.rebase/
--
View this message in context:
http://git.661346.n2.nabble.com/PATCH-v5-0-6-Reject-non-ff-pulls-by-default-tp7609118p7609129.html
Sent from the git mailing list archive at Nabble.com.
--
On 29 April 2014 21:47:42 GMT+10:00, Felipe Contreras
felipe.contre...@gmail.com wrote:
James Denholm wrote:
I've no right to say this, given that I've no contributions I'm not
saying that you shouldn't work on the git codebase, you could very
easily fork it and make the innovative SCMS none
Junio C Hamano gits...@pobox.com writes:
Jeff King p...@peff.net writes:
On Mon, Apr 28, 2014 at 02:22:21PM +0200, Matthieu Moy wrote:
I'd be OK with doing the moral equivalent for now (perhaps just taking
Junio's proposal[1]), and I can deal with the refactoring later when
re-rolling the
Most of the plumbing for having branch name aliases already exists
in the form of symbolic references, and people do use them for this
purpose; but I get the impression that it's not really supported
officially, and I'm not aware of any porcelain features to
facilitate this use-case.
I'd like to
On 29/04/2014 12:47, Christian Couder wrote:
Also, if there were no current branch name because you're committing in a
detached head state, it would be nice if you could have some logic to
determine that, and instead write the trailer as:
Made-on-branch: (detached HEAD: AB12CD34)
You
On 29/04/2014 12:47, Christian Couder wrote:
Also, if there were no current branch name because you're committing in a
detached head state, it would be nice if you could have some logic to
determine that, and instead write the trailer as:
Made-on-branch: (detached HEAD: AB12CD34)
You
James Denholm wrote:
So that we can all have egg on our faces when it takes off and is
proven superior... Right?
I don't know what you mean by we, but it certainly doesn't include
you.
% git log --author=nod.h...@gmail.com master
empty
--
Felipe Contreras
--
To unsubscribe from this
Marat Radchenko wrote:
Felipe Contreras wrote
[PATCH v5 1/6] pull: rename pull.rename to pull.mode
s/pull.rename/pull.rebase/
Right. Will fix.
--
Felipe Contreras
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
On Tue, Apr 29, 2014 at 2:35 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 04/28/2014 09:16 PM, Ronnie Sahlberg wrote:
On Fri, Apr 25, 2014 at 4:16 PM, Michael Haggerty mhag...@alum.mit.edu
wrote:
On 04/25/2014 06:14 PM, Ronnie Sahlberg wrote:
Change create_branch to use a ref
On Mon, Apr 28, 2014 at 5:51 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg sahlb...@google.com wrote:
Update ref_transaction_update() do some basic error checking and return
true on error. Update all callers to check ref_transaction_update()
Stepan Kasal ka...@ucw.cz writes:
Hello Junio,
thank you for pointing out the problems.
Let me explain the background:
After some discussion a one line fix to win32/poll.c was accepted to
msysgit/git
at 2012-05-16 https://github.com/msysgit/git/pull/7
The description of the commit
On Mon, Apr 28, 2014 at 7:18 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg sahlb...@google.com wrote:
Change update_branch() to use ref transactions for updates.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
fast-import.c | 20
Matthieu Moy matthieu@grenoble-inp.fr writes:
I also agree that droppage of S does not have to wait for that
topic.
So, shall I rewrite my patch on top of master? (not hard, but there will
be a minor conflict to resolve when merging with Peff's cooking series).
Sure, the one near the
Jeff King p...@peff.net writes:
This patch just adds a test to demonstrate the breakage.
Some possible fixes are:
1. Tell everyone that NFD in the git repo is wrong, and
they should make a new commit to normalize all their
in-repo files to be precomposed.
This is probably
Michael Haggerty mhag...@alum.mit.edu writes:
I have no compunctions about using update() to create or delete a
reference. My point of view is that update() is the general case, and
create() and delete() are special-cases that exist only for the
convenience of callers. For example, our
Jeff King p...@peff.net writes:
On Mon, Apr 28, 2014 at 08:00:04PM -0700, Dan Albert wrote:
I noticed that we are just filling in the password here, since we'll
always fill cred.username from srvc-user. The lines directly above are:
if (!srvc-user) {
Duy Nguyen pclo...@gmail.com writes:
I do think it is sensible to keep two arrays of struct cache_entry
around (one for base and one for incremental changes) inside
index_state, and the patch seems to do so via struct split_index
that does have a copy of saved_cache. If the write-out
Jean-Noël Avila avila...@gmail.com writes:
In your daily management of the pu
branch for git, do you have to use the -f flag a lot?
During the day I prepare and validate all the branches I am going to
publish, and at the end of the day, I run git push (no options)
with something like this
On Tue, Apr 29, 2014 at 10:12:52AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
This patch just adds a test to demonstrate the breakage.
Some possible fixes are:
1. Tell everyone that NFD in the git repo is wrong, and
they should make a new commit to normalize
Kevin Cagle (kcagle) [CONT - Type 2] kca...@micron.com writes:
$ git subtree add -P oldGit https://github.com/git/git.git tags/v1.9.2
Will produce this error:
10ff115f5c572299de4e04ade0d7adb3c75fbf1f is not a valid 'commit' object
The bug isn't found in 1.7.1 (installed subtree manually)
David Turner dtur...@twopensource.com writes:
Document RUN_SETUP_GENTLY
Signed-off-by: David Turner dtur...@twitter.com
---
Documentation/technical/api-builtin.txt | 5 +
1 file changed, 5 insertions(+)
diff --git a/Documentation/technical/api-builtin.txt
On Tue, Apr 29, 2014 at 12:18 PM, Ronnie Sahlberg sahlb...@google.com wrote:
On Mon, Apr 28, 2014 at 5:44 PM, Eric Sunshine sunsh...@sunshineco.com
wrote:
On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg sahlb...@google.com wrote:
Update replace.c to use ref transactions for updates.
Jeff King p...@peff.net writes:
I don't think we have a str_utf8_cmp that ignores normalizations (or
maybe strcoll will do this?). But in theory we could use it everywhere
we use strcasecmp for ignore_case. And then we would not need to have
our readdir wrapper, maybe? I admit I haven't
On Tue, Apr 29, 2014 at 2:25 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 04/28/2014 07:59 PM, Ronnie Sahlberg wrote:
On Fri, Apr 25, 2014 at 6:31 PM, Michael Haggerty mhag...@alum.mit.edu
wrote:
On 04/25/2014 06:14 PM, Ronnie Sahlberg wrote:
Change ref_transaction_commit to take a
Michael S. Tsirkin m...@redhat.com writes:
Add tests for the new feature.
Signed-off-by: Michael S. Tsirkin m...@redhat.com
---
t/t9001-send-email.sh | 45 +
1 file changed, 45 insertions(+)
diff --git a/t/t9001-send-email.sh
By default, git sets core.ignorecase=true when git init or git clone
is run on a machine with a case-insensitive filesystem. Here's a
test-case for some problems that this causes:
git checkout master
touch TestCase
git add TestCase
git commit -m 'add TestCase'
git checkout -b with-camel
touch
On Tue, Apr 29, 2014 at 12:01:10PM -0700, Junio C Hamano wrote:
Michael S. Tsirkin m...@redhat.com writes:
Add tests for the new feature.
Signed-off-by: Michael S. Tsirkin m...@redhat.com
---
t/t9001-send-email.sh | 45 +
1 file changed,
Sorry about that -- the documentation of RUN_SETUP confused me. So I
have a new patch that edits that as well.
--
RUN_SETUP_GENTLY and improve RUN_SETUP docs
Signed-off-by: David Turner dtur...@twitter.com
---
Documentation/technical/api-builtin.txt | 13 +
1 file changed, 9
On Tue, Apr 29, 2014 at 11:49:30AM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
I don't think we have a str_utf8_cmp that ignores normalizations (or
maybe strcoll will do this?). But in theory we could use it everywhere
we use strcasecmp for ignore_case. And then we would
This triggers saved_namelen may be used uninitialized for me, even
though it looks clear that it is used under CE_STRIP_NAME and it is
assigned under that condition. Sigh to a stupid compiler...
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to
On 29 April 2014 23:31:29 GMT+10:00, Felipe Contreras
felipe.contre...@gmail.com wrote:
James Denholm wrote:
So that we can all have egg on our faces when it takes off and is
proven superior... Right?
I don't know what you mean by we, but it certainly doesn't include
you.
% git log
Ronnie Sahlberg sahlb...@google.com writes:
This patch series is based on mhagger/ref-transactions and expands on the
transaction API. It converts all external (outside of refs.c) callers to
use the transaction API for any writes.
This makes most of the ref updates to become atomic when there
Thanks and sorry for taking a bit longer than usual; will push this
series out, replacing the previous round, when I am done for today's
integration cycle.
--
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
Jeff King p...@peff.net writes:
On Sat, Apr 26, 2014 at 10:00:53PM +0200, Christian Couder wrote:
This patch series comes from what Peff sent in the following thread:
http://thread.gmane.org/gmane.comp.version-control.git/243361/focus=243528
Thanks. As I recall, these were in pretty good
Thanks.
I'll revert the merge of the previous round to 'next' and then queue
this series instead.
--
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
On Tue, Apr 29, 2014 at 12:17 PM, Felipe Contreras
felipe.contre...@gmail.com wrote:
That's all you could list for *four* years? None of that would even be noticed
by most of our users, maybe push.default (when it actually happens), but
that's
*one*.
*One* important change in *four* years.
From: Felipe Contreras felipe.contre...@gmail.com
Also 'branch.name.rebase' to 'branch.name.pullmode'.
Sorry I haven't commented earlier. Because the 0/6 explanation isn't a
commit, a few extra words would be useful to capture what the 0/6 cover
letter said to start the patch series
James Denholm wrote:
On 29 April 2014 23:31:29 GMT+10:00, Felipe Contreras
felipe.contre...@gmail.com wrote:
James Denholm wrote:
So that we can all have egg on our faces when it takes off and is
proven superior... Right?
I don't know what you mean by we, but it certainly doesn't
On Mon, 28 Apr 2014, David Kastrup wrote:
Jeremy Morton ad...@game-point.net writes:
On 28/04/2014 10:02, David Kastrup wrote:
Jeremy Mortonad...@game-point.net writes:
On 28/04/2014 09:32, Felipe Contreras wrote:
some people to is to always merge with --no-ff, that way you see the
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
config.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.c b/config.c
index a30cb5c..bd69ad7 100644
--- a/config.c
+++ b/config.c
@@ -616,7 +616,7 @@ static int git_config_maybe_bool_text(const char
Felipe Contreras (3):
config: avoid yoda conditions
add: avoid yoda condition
add: remove dead code
builtin/add.c | 6 +-
config.c | 4 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
--
1.9.2+fc1.3.gade8541
--
To unsubscribe from this list: send the line unsubscribe git
addremove is already 1 by default.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/add.c | 4
1 file changed, 4 deletions(-)
diff --git a/builtin/add.c b/builtin/add.c
index ac10bab..980e247 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -329,10 +329,6 @@ int
18 is younger than person's age.
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
builtin/add.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/add.c b/builtin/add.c
index 459208a..ac10bab 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -321,7 +321,7
On Mon, Apr 28, 2014 at 9:26 PM, Aaron Laws dartm...@gmail.com wrote:
The way I understand it, when `git svn dcommit` is run, new commits
are created (A' is created from A adding SVN information), then the
current branch is moved to point to A'. Why don't we move any other
refs that were
Ronnie Sahlberg sahlb...@google.com writes:
+ transaction = ref_transaction_begin();
+ if ((!transaction ||
+ ref_transaction_update(transaction, b-name, b-sha1, old_sha1,
+0, 1)) ||
+ (ref_transaction_commit(transaction, msg, err)
+
On Mon, 28 Apr 2014, Jeremy Morton wrote:
On 28/04/2014 10:09, Johan Herland wrote:
On Mon, Apr 28, 2014 at 11:01 AM, Jeremy Mortonad...@game-point.net
wrote:
On 28/04/2014 07:45, Christian Couder wrote:
Yes, it's possible. Yesterday, I sent the following patch:
[RFC/PATCH 2/2] trailer: add
Philip Oakley wrote:
From: Felipe Contreras felipe.contre...@gmail.com
Also 'branch.name.rebase' to 'branch.name.pullmode'.
Sorry I haven't commented earlier. Because the 0/6 explanation isn't a
commit, a few extra words would be useful to capture what the 0/6 cover
letter said to start
Allow ref_transaction_free to be called with NULL and in extension allow
ref_transaction_rollback to be called for a NULL transaction.
This allows us to write code that will
if ( (!transaction ||
ref_transaction_update(...)) ||
(ref_transaction_commit(...) !(transaction = NULL))
1 - 100 of 148 matches
Mail list logo