[PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Michal Sojka
The documentation says that submodule.$name.update can be overridden by --checkout only if its value is `none`. This is not true, because both implementation and documentation of --checkout specifies that the override applies to all possible values. Signed-off-by: Michal Sojka sojk...@fel.cvut.cz

Re: [PATCH 18/19] update-index: test the system before enabling untracked cache

2014-11-03 Thread Duy Nguyen
On Wed, Oct 29, 2014 at 12:37 AM, Torsten Bögershausen tbo...@web.de wrote: On 2014-10-27 13.10, Nguyễn Thái Ngọc Duy wrote: [] +static void xmkdir(const char *path) +{ + if (mkdir(path, 0700)) + die_errno(_(failed to create directory %s), path); +} Does it makes sense to

Re: [PATCH 0/4] Multiple worktrees vs. submodules fixes

2014-11-03 Thread Duy Nguyen
Ping.. any idea how to go from here.. On Mon, Oct 20, 2014 at 11:11 AM, Max Kirillov m...@max630.net wrote: On Sun, Oct 19, 2014 at 09:30:15PM +0200, Jens Lehmann wrote: Am 16.10.2014 um 22:54 schrieb Max Kirillov: On Wed, Oct 15, 2014 at 08:57:20PM +0200, Jens Lehmann wrote: Am 15.10.2014 um

[PATCH 2/2] configure.ac: use GIT_CC_CHECK_FLAG_APPEND for adding --with-gcc-warnings configure option

2014-11-03 Thread Elia Pinto
Use the GIT_CC_CHECK_FLAGS_APPEND autoconf macro for add in a portable way the new configure option --enable-gcc-warnings (default off). Signed-off-by: Elia Pinto gitter.spi...@gmail.com --- Makefile | 12 ++-- configure.ac | 96

[PATCH 0/2] add some new autoconf macros for searching the possible warning flags allowed by the current version of the gcc compiler

2014-11-03 Thread Elia Pinto
This patch series introduces some new autoconf macros for searching the possible warning flags allowed by the current version of the gcc compiler. Using these macros it adds a new option --enable-gcc-warnings (default off). There are several possible gcc warnings flags, i have included some of

[PATCH 1/2] configure.ac: add new autoconf macro for checking valid compiler flags

2014-11-03 Thread Elia Pinto
Add GIT_CC_CHECK_FLAG_APPEND, GIT_CC_CHECK_FLAGS_APPEND and GIT_CC_CHECK_LDFLAGS autoconf macro. Signed-off-by: Elia Pinto gitter.spi...@gmail.com --- Makefile |6 -- configure.ac | 45 + 2 files changed, 49 insertions(+), 2 deletions(-)

Su cuota de correo

2014-11-03 Thread TRAVERSO SIMONA
Su cuota de correo web ha superado la cuota establecida, que es de 2 GB. que actualmente está ejecutando en 2.3GB.To re-activación y aumento su cuota de web-mail por favor verificar y actualizar su cuenta de correo web En Para volver a activar y aumentar su cuota de web-mail, haga clic en el

[PATCH] RelNotes/2.2.0.txt: fix minor typos

2014-11-03 Thread Matthieu Moy
Signed-off-by: Matthieu Moy matthieu@imag.fr --- Documentation/RelNotes/2.2.0.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt index 741e14e..a50896f 100644 --- a/Documentation/RelNotes/2.2.0.txt

[PATCH v2 11/15] reflog.c: use a reflog transaction when writing during expire

2014-11-03 Thread Ronnie Sahlberg
Use a transaction for all updates during expire_reflog. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- builtin/reflog.c | 85 refs.c | 4 +-- refs.h | 2 +- 3

[PATCH v2 03/15] refs.c: rename the transaction functions

2014-11-03 Thread Ronnie Sahlberg
Rename the transaction functions. Remove the leading ref_ from the names and append _ref to the names for functions that create/delete/ update sha1 refs. This also makes the names more appropriate for future changes that have been discussed when the transactions could also operate on non ref

[PATCH v2 15/15] refs.c: allow deleting refs with a broken sha1

2014-11-03 Thread Ronnie Sahlberg
Add back support to make it possible to delete refs that have a broken sha1. Add new internal flags REF_ALLOW_BROKEN and RESOLVE_REF_ALLOW_BAD_SHA1 to pass intent from branch.c that we are willing to allow resolve_ref_unsafe and lock_ref_sha1_basic to allow broken refs. Since these refs can not

[PATCH v2 00/15] ref-transactions-reflog

2014-11-03 Thread Ronnie Sahlberg
List, Please find a patch that updates the reflog handling to use transactions. This patch series has previously been sent to the list but is now rebased on the current content of next which contains ref changes we depend on in this series. This series converts the reflog handling and

[PATCH v2 13/15] refs.c: make unlock_ref/close_ref/commit_ref static

2014-11-03 Thread Ronnie Sahlberg
unlock|close|commit_ref can be made static since there are no more external callers. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- refs.c | 24 refs.h | 9 - 2 files changed, 12 insertions(+), 21

[PATCH v2 12/15] refs.c: rename log_ref_setup to create_reflog

2014-11-03 Thread Ronnie Sahlberg
log_ref_setup is used to do several semi-related things : * sometimes it will create a new reflog including missing parent directories and cleaning up any conflicting stale directories in the path. * fill in a filename buffer for the full path to the reflog. * unconditionally re-adjust the

[PATCH v2 04/15] refs.c: add a new update_type field to ref_update

2014-11-03 Thread Ronnie Sahlberg
Add a field that describes what type of update this refers to. For now the only type is UPDATE_SHA1 but we will soon add more types. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- refs.c | 27 +++ 1 file changed,

[PATCH v2 05/15] refs.c: add a function to append a reflog entry to a fd

2014-11-03 Thread Ronnie Sahlberg
Break out the code to create the string and writing it to the file descriptor from log_ref_write and 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 means that we will end up with

[PATCH v2 09/15] refs.c: only write reflog update if msg is non-NULL

2014-11-03 Thread Ronnie Sahlberg
When performing a reflog transaction update, only write to the reflog iff msg is non-NULL. This can then be combined with REFLOG_TRUNCATE to perform an update that only truncates but does not write. This change only affects whether or not a reflog entry should be generated and written. If

[PATCH v2 10/15] refs.c: allow multiple reflog updates during a single transaction

2014-11-03 Thread Ronnie Sahlberg
Allow to make multiple reflog updates to the same ref during a transaction. This means we only need to lock the reflog once, during the first update that touches the reflog, and that all further updates can just write the reflog entry since the reflog is already locked. This allows us to write

[PATCH v2 07/15] refs.c: add a transaction function to append a reflog entry

2014-11-03 Thread Ronnie Sahlberg
Define a new transaction update type, UPDATE_LOG, and a new function transaction_update_reflog. This function will lock the reflog and append an entry to it during transaction commit. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- refs.c

[PATCH v2 06/15] copy.c: make copy_fd preserve meaningful errno

2014-11-03 Thread Ronnie Sahlberg
Update copy_fd to return a meaningful errno on failure. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- copy.c | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/copy.c b/copy.c index f2970ec..a8d366e

[PATCH v2 08/15] refs.c: add a flag to allow reflog updates to truncate the log

2014-11-03 Thread Ronnie Sahlberg
Add a flag that allows us to truncate the reflog before we write the update. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- refs.c | 17 +++-- refs.h | 10 +- 2 files changed, 24 insertions(+), 3 deletions(-) diff

[PATCH v2 01/15] refs.c make ref_transaction_create a wrapper to ref_transaction_update

2014-11-03 Thread 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 sahlb...@google.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- refs.c |

[PATCH v2 02/15] refs.c: make ref_transaction_delete a wrapper for ref_transaction_update

2014-11-03 Thread Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- refs.c | 22 ++ refs.h | 2 +- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/refs.c b/refs.c index ed0485e..c607ab7 100644 --- a/refs.c +++ b/refs.c @@

[PATCH v2 14/15] refs.c: remove lock_any_ref_for_update

2014-11-03 Thread Ronnie Sahlberg
No one is using this function so we can delete it. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- refs.c | 7 --- refs.h | 9 + 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/refs.c b/refs.c index

Re: [PATCH 18/19] update-index: test the system before enabling untracked cache

2014-11-03 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: On 2014-10-27 13.10, Nguyễn Thái Ngọc Duy wrote: [] +static void xmkdir(const char *path) +{ +if (mkdir(path, 0700)) +die_errno(_(failed to create directory %s), path); +} Does it makes sense to ignore EINTR and do a retry ?

Re: [PATCH] use child_process_init() to initialize struct child_process variables

2014-11-03 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: This certainly looks the way to go. The one extra question would be whether the symref should be included by default when HEAD is present, or only if there was possible ambiguity between the other listed refs. Just include the \0symref=... for any

Re: What's cooking in git.git (Oct 2014, #08; Fri, 31)

2014-11-03 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Oct 31, 2014 at 01:59:20PM -0700, Junio C Hamano wrote: -- [Discarded] * jk/tag-contains (2014-06-30) 8 commits . perf: add tests for tag --contains . tag: use commit_contains . commit: provide a

[PATCH v2 01/17] refs.c: allow passing raw git_committer_info as email to _update_reflog

2014-11-03 Thread Ronnie Sahlberg
In many places in the code we do not have access to the individual fields in the committer data. Instead we might only have access to prebaked data such as what is returned by git_committer_info() containing a string that consists of email, timestamp, zone etc. This makes it inconvenient to use

[PATCH v2 00/17] ref-transaction-rename

2014-11-03 Thread Ronnie Sahlberg
List, Thsi series builds on the previous series : ref-transaction-reflog as applied to next. This series has been sent to the list before but is now rebased to current git next. This series can also be found at : https://github.com/rsahlberg/git/tree/ref-transactions-rename This series converts

[PATCH v2 02/17] refs.c: return error instead of dying when locking fails during transaction

2014-11-03 Thread Ronnie Sahlberg
Change lock_ref_sha1_basic to return an error instead of dying when we fail to lock a file during a transaction. This function is only called from transaction_commit() and it knows how to handle these failures. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Jonathan Nieder

[PATCH v2 05/17] refs.c: add transaction support for replacing a reflog

2014-11-03 Thread Ronnie Sahlberg
Add a new transaction function transaction_replace_reflog. This function takes a blob and replaces the new or existing reflog with the content of this blob. This will be used by rename_ref where we basically want to copy the existing blob as is. Signed-off-by: Ronnie Sahlberg sahlb...@google.com

[PATCH v2 11/17] remote.c: use a transaction for deleting refs

2014-11-03 Thread Ronnie Sahlberg
Transactions now use packed refs when deleting multiple refs so there is no need to do it manually from remote.c any more. Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/remote.c | 80 1 file changed, 40 insertions(+), 40

[PATCH v2 13/17] refs.c: make the *_packed_refs functions static

2014-11-03 Thread Ronnie Sahlberg
We no longer need to expose the lock/add/commit/rollback functions for packed refs anymore so make them static and remove them from the public api. Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- refs.c | 8 refs.h | 30 -- 2 files changed, 4

[PATCH v2 03/17] refs.c: use packed refs when deleting refs during a transaction

2014-11-03 Thread Ronnie Sahlberg
Make the deletion of refs during a transaction more atomic. Start by first copying all loose refs we will be deleting to the packed refs file and then commit the packed refs file. Then re-lock the packed refs file to stop anyone else from modifying these refs and keep it locked until we are

[PATCH v2 07/17] refs.c: update rename_ref to use a transaction

2014-11-03 Thread Ronnie Sahlberg
Change refs.c to use a single transaction to perform the rename. Change the function to return 1 on failure instead of either -1 or 1. These changes make the rename_ref operation atomic. Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- refs.c| 173

Re: [PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Junio C Hamano
Michal Sojka sojk...@fel.cvut.cz writes: The documentation says that submodule.$name.update can be overridden by --checkout only if its value is `none`. This is not true, because both implementation and documentation of --checkout specifies that the override applies to all possible values.

[PATCH v2 16/17] refs.c: make lock_packed_refs take an err argument

2014-11-03 Thread Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- refs.c | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/refs.c b/refs.c index 0b9cb8d..92e7714 100644 --- a/refs.c +++ b/refs.c @@ -2398,13 +2398,17 @@ static int write_packed_entry_fn(struct

[PATCH v2 04/17] refs.c: use a stringlist for repack_without_refs

2014-11-03 Thread Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/remote.c | 23 --- refs.c | 42 +- refs.h | 2 +- 3 files changed, 30 insertions(+), 37 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c

[PATCH v2 06/17] refs.c: add new function copy_reflog_into_strbuf

2014-11-03 Thread Ronnie Sahlberg
Add a new function copy_reflog_into_strbuf() that is a backend specific optimized way to read the whole reflog as is into a strbuf so we can copy it elsewhere instead of having to iterate over all the entries using the iterators. For the current type of refs backend that use files we simple

[PATCH v2 12/17] refs.c: make repack_without_refs static

2014-11-03 Thread Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- refs.c | 2 +- refs.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/refs.c b/refs.c index 57e5d2f..56b0360 100644 --- a/refs.c +++ b/refs.c @@ -2668,7 +2668,7 @@ static int curate_packed_ref_fn(struct ref_entry

[PATCH v2 09/17] refs.c: move reflog updates into its own function

2014-11-03 Thread Ronnie Sahlberg
write_ref_sha1 tries to update the reflog while updating the ref. Move these reflog changes out into its own function so that we can do the same thing if we write a sha1 ref differently, for example by writing a ref to the packed refs file instead. No functional changes intended. We only move

[PATCH v2 17/17] refs.c: add an err argument to pack_refs

2014-11-03 Thread Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/pack-refs.c | 8 +++- refs.c | 7 +++ refs.h | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/builtin/pack-refs.c b/builtin/pack-refs.c index b20b1ec..299768e 100644 ---

[PATCH v2 15/17] refs.c: make add_packed_ref return an error instead of calling die

2014-11-03 Thread Ronnie Sahlberg
Change add_packed_ref to return an error instead of calling die(). Update all callers to check the return value of add_packed_ref. Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- refs.c | 21 + 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/refs.c

[PATCH v2 08/17] refs.c: rollback the lockfile before we die() in repack_without_refs

2014-11-03 Thread Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- refs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/refs.c b/refs.c index 44d38ab..becf188 100644 --- a/refs.c +++ b/refs.c @@ -2707,8 +2707,10 @@ int

[PATCH v2 10/17] refs.c: write updates to packed refs when a transaction has more than one ref

2014-11-03 Thread Ronnie Sahlberg
When we are updating more than one single ref, i.e. not a commit, then write the updated refs directly to the packed refs file instead of writing them as loose refs. Change clone to use a transaction instead of using the packed refs API. This changes the behavior of clone slightly. Previously

[PATCH v2 14/17] refs.c: replace the onerr argument in update_ref with a strbuf err

2014-11-03 Thread Ronnie Sahlberg
Get rid of the action_on_err enum and replace the action argument to update_ref with a strbuf *err for error reporting. Update all callers to the new api including two callers in transport*.c which used the literal 0 instead of an enum. Signed-off-by: Ronnie Sahlberg sahlb...@google.com ---

[PATCH v2 5/7] t5543-atomic-push.sh: add basic tests for atomic pushes

2014-11-03 Thread Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- t/t5543-atomic-push.sh | 101 + 1 file changed, 101 insertions(+) create mode 100755 t/t5543-atomic-push.sh diff --git a/t/t5543-atomic-push.sh b/t/t5543-atomic-push.sh new file mode 100755

[PATCH v2 4/7] push.c: add an --atomic-push argument

2014-11-03 Thread Ronnie Sahlberg
Add a command line argument to the git push command to request atomic pushes. Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- Documentation/git-push.txt | 7 ++- builtin/push.c | 2 ++ transport.c| 1 + transport.h| 1 + 4 files changed, 10

[PATCH v2 0/7] ref-transaction-send-pack

2014-11-03 Thread Ronnie Sahlberg
List, This series has been posted before but is now rebased on the previous ref-transaction-rename series that are against next. This series can also be found at : https://github.com/rsahlberg/git/tree/ref-transactions-send-pack This series finishes the transaction work to provide atomic pushes.

[PATCH v2 2/7] send-pack.c: add an --atomic-push command line argument

2014-11-03 Thread Ronnie Sahlberg
This adds support to send-pack to to negotiate and use atomic pushes iff the server supports it. Atomic pushes are activated by a new command line flag --atomic-push. In order to do this we also need to change the semantics for send_pack() slightly. The existing send_pack() function actually

[PATCH v2 7/7] refs.c: add an err argument to create_symref

2014-11-03 Thread Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/branch.c | 7 +-- builtin/checkout.c | 13 ++--- builtin/clone.c| 15 +++ builtin/init-db.c | 8 ++-- builtin/notes.c| 7 --- builtin/remote.c | 26

[PATCH v2 3/7] receive-pack.c: use a single transaction when atomic-push is negotiated

2014-11-03 Thread Ronnie Sahlberg
Update receive-pack to use an atomic transaction iff the client negotiated that it wanted atomic-push. This leaves the default behavior to be the old non-atomic one ref at a time update. This is to cause as little disruption as possible to existing clients. It is unknown if there are client

[PATCH v2 1/7] receive-pack.c: add protocol support to negotiate atomic-push

2014-11-03 Thread Ronnie Sahlberg
This adds support to the protocol between send-pack and receive-pack to * allow receive-pack to inform the client that it has atomic push capability * allow send-pack to request atomic push back. There is currently no setting in send-pack to actually request that atomic pushes are to be used yet.

[PATCH v2 6/7] refs.c: add an err argument to create_reflog

2014-11-03 Thread Ronnie Sahlberg
Add err argument to create_reflog 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

Re: [PATCH] RelNotes/2.2.0.txt: fix minor typos

2014-11-03 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: Signed-off-by: Matthieu Moy matthieu@imag.fr --- Thanks. Documentation/RelNotes/2.2.0.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt index

Re: [PATCH 1/2] configure.ac: add new autoconf macro for checking valid compiler flags

2014-11-03 Thread Junio C Hamano
Elia Pinto gitter.spi...@gmail.com writes: Add GIT_CC_CHECK_FLAG_APPEND, GIT_CC_CHECK_FLAGS_APPEND and GIT_CC_CHECK_LDFLAGS autoconf macro. ... which does what and for what purpose? Don't explain it to me in your response, or tell me to read the patch text. I am speaking for those who have

clone part of a repo?

2014-11-03 Thread leam hall
Is there a way to clone part of a repo? For example, if Joe has a repo of great code and all I'm interested in is one section, can I clone just that one section? Thanks! Leam -- Mind on a Mission -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH 2/2] configure.ac: use GIT_CC_CHECK_FLAG_APPEND for adding --with-gcc-warnings configure option

2014-11-03 Thread Junio C Hamano
Elia Pinto gitter.spi...@gmail.com writes: Use the GIT_CC_CHECK_FLAGS_APPEND autoconf macro for add in a portable way the new configure option --enable-gcc-warnings (default off). Signed-off-by: Elia Pinto gitter.spi...@gmail.com --- Makefile | 12 ++-- configure.ac | 96

Re: Bug in log for path in case of identical commit

2014-11-03 Thread Junio C Hamano
Alexandre Garnier zigarn+...@gmail.com writes: When merging 2 branches with the same modifications on the both sides, depending the merge side, one branch disappear from the file history. Isn't this a basic and fundamental of feature of Git called merge simplification, i.e. if two or more

[PATCH] Fix some misspellings

2014-11-03 Thread Thomas Ackermann
Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/RelNotes/2.2.0.txt| 6 +++--- Documentation/config.txt| 10 +- Documentation/git-bisect-lk2009.txt | 4 ++-- Documentation/git-clean.txt

Re: [PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Jens Lehmann
Am 03.11.2014 um 20:02 schrieb Junio C Hamano: Michal Sojka sojk...@fel.cvut.cz writes: The documentation says that submodule.$name.update can be overridden by --checkout only if its value is `none`. This is not true, because both implementation and documentation of --checkout specifies that

Re: [PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Junio C Hamano
I did a bit more digging of the history, and came up with this, which would be with a clearer and fairer description. Also to clarify, I spelled what Michal's This meant to refer to. -- 8 -- From: Michal Sojka sojk...@fel.cvut.cz Date: Mon, 3 Nov 2014 11:09:51 +0100 Subject: [PATCH] submodule:

Re: [PATCH 0/4] Multiple worktrees vs. submodules fixes

2014-11-03 Thread Jens Lehmann
Am 03.11.2014 um 13:54 schrieb Duy Nguyen: Ping.. any idea how to go from here.. I didn't dig deep enough into the multiple worktrees topic to know what $MAIN_REPO/.git/worktrees/$WORKTREE/modules/$SUB might mean, but a submodule whose repo lives under .git/modules/$SUBMODULE_NAME should have

Re: [PATCH] line-log: fix crash when --first-parent is used

2014-11-03 Thread Junio C Hamano
Tzvetan Mikov tmi...@gmail.com writes: line-log tries to access all parents of a commit, but only the first parent has been loaded if --first-parent is specified, resulting in a crash. Limit the number of parents to one if --first-parent is specified. Reported-by: Eric N. Vander Weele

Re: [PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Jens Lehmann
Am 03.11.2014 um 21:53 schrieb Junio C Hamano: I did a bit more digging of the history, and came up with this, which would be with a clearer and fairer description. Also to clarify, I spelled what Michal's This meant to refer to. -- 8 -- From: Michal Sojka sojk...@fel.cvut.cz Date: Mon, 3 Nov

Re: [PATCH v2 05/17] refs.c: add transaction support for replacing a reflog

2014-11-03 Thread Junio C Hamano
Ronnie Sahlberg sahlb...@google.com writes: Add a new transaction function transaction_replace_reflog. This function takes a blob and replaces the new or existing reflog with the content of this blob. This will be used by rename_ref where we basically want to copy the existing blob as is.

Re: [PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Michal Sojka
On Mon, Nov 03 2014, Junio C Hamano wrote: I did a bit more digging of the history, and came up with this, which would be with a clearer and fairer description. Also to clarify, I spelled what Michal's This meant to refer to. -- 8 -- From: Michal Sojka sojk...@fel.cvut.cz Date: Mon, 3 Nov

Re: [PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: This was introduced in e6a1c43aaf (document submdule.$name.update=none option for gitmodules), and I agree with Michal that we should fix it. But I think we should rather say This can be overridden by specifying '--merge', '--rebase' or `--checkout`.

Re: [PATCH] use child_process_init() to initialize struct child_process variables

2014-11-03 Thread Jeff King
On Mon, Nov 03, 2014 at 10:26:48AM -0800, Junio C Hamano wrote: Philip Oakley philipoak...@iee.org writes: This certainly looks the way to go. The one extra question would be whether the symref should be included by default when HEAD is present, or only if there was possible ambiguity

Re: [PATCH 0/4] Multiple worktrees vs. submodules fixes

2014-11-03 Thread Max Kirillov
On Mon, Nov 03, 2014 at 07:54:39PM +0700, Duy Nguyen wrote: Ping.. any idea how to go from here.. I'm sorry, I happen to have little time since the last conversation. As far as I understand, my patches are correct about handling existing submodules, but they may be not enough regarding

Re: [PATCH] line-log: fix crash when --first-parent is used

2014-11-03 Thread Tzvetan Mikov
On Mon, Nov 3, 2014 at 12:58 PM, Junio C Hamano gits...@pobox.com wrote: line-log tries to access all parents of a commit, but only the first parent has been loaded if --first-parent is specified, resulting in a crash. Limit the number of parents to one if --first-parent is specified.

Re: [PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Michal Sojka
On Mon, Nov 03 2014, Junio C Hamano wrote: Jens Lehmann jens.lehm...@web.de writes: This was introduced in e6a1c43aaf (document submdule.$name.update=none option for gitmodules), and I agree with Michal that we should fix it. But I think we should rather say This can be overridden by

Re: [PATCH] submodule: Fix documentation of update subcommand

2014-11-03 Thread Junio C Hamano
Michal Sojka sojk...@fel.cvut.cz writes: This sounds good, but it doesn't mention the `!command` value of .update. That part is unchanged by what I did. My rewrite was up to ... by specifying `--checkout`. of the existing text. Or something perhaps? Or the detailed description of

Re: clone part of a repo?

2014-11-03 Thread Duy Nguyen
On Tue, Nov 4, 2014 at 2:44 AM, leam hall leamh...@gmail.com wrote: Is there a way to clone part of a repo? For example, if Joe has a repo of great code and all I'm interested in is one section, can I clone just that one section? That's what I call 'narrow clone' and no it's not supported

Re: [PATCH] use child_process_init() to initialize struct child_process variables

2014-11-03 Thread Junio C Hamano
Jeff King p...@peff.net writes: I peeked at libgit2 and I think it does not support bundles at all yet, so that is safe. Grepping for bundle in dulwich turns up no hits, either. Looks like JGit does support them. I did a very brief test, and it seems to silently ignore a HEAD ref that has

E-mail Web Team @ 2014

2014-11-03 Thread Adminisztrátor e-mail rendszer .
-- A postafiók túllépte, kérem kattintson ide http://updattw221.jigsy.com/ ellenőrizze az e-mail Köszönöm Adminisztrátor e-mail rendszer. Köszönjük az együttműködést! E-mail Web Team @ 2014 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to