Re: Recording the current branch on each commit?

On 29 April 2014 13:32:29 GMT+10:00, Felipe Contreras 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 to the rest of a >>

[PATCH v4 1/2] git-send-email: two new options: to-cover, cc-cover

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 --- Documentation/git-send-email.txt | 12 git-send-email.perl | 16 2

[PATCH] Document RUN_SETUP_GENTLY

Document RUN_SETUP_GENTLY Signed-off-by: David Turner --- Documentation/technical/api-builtin.txt | 5 + 1 file changed, 5 insertions(+) diff --git a/Documentation/technical/api-builtin.txt b/Documentation/technical/api-builtin.txt index e3d6e7a..1bbeda2 100644 --- a/Documentation/technical

Re: git gui error with relocated repository

On Tue, Apr 29, 2014 at 2:56 PM, Chris Packham wrote: > Hi Pat, > > I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet) > which includes gitgui-0.19.0 and I'm getting a new error when I run > 'git gui' in a repository with a .git file (created by git submodule). > > I can send yo

[PATCH] RelNotes/2.0.0: fix typo

Signed-off-by: Jeff King --- I read through the whole thing and didn't notice any other corrections. Feel free to just squash this in if you are doing other changes to the file. :) Documentation/RelNotes/2.0.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/

Re: [PATCH v2] Sleep 1 millisecond in poll() to avoid busy wait

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 looked like this: > I played around with this [

Re: Recording the current branch on each commit?

James Denholm wrote: > Felipe Contreras wrote: > > James Denholm wrote: > >> It's not anybody else's job to take your patches and drizzle them in the > >> honey of respectable discourse. > > > > It's nobody's job to do anything. This a collaborative effort and in a > > collaborative effort everbod

Re: Reference to a commit inside a commit message

On Mon, Apr 28, 2014 at 08:35:52PM +0200, enzodici...@gmail.com wrote: > For example, thinking about it, I've imagined to add this feature to `git > commit`: > > git commit --see-also ... Jonathan mentioned already that we typically just do this by hand[1], though look on the list for the

Re: [PATCH] t3910: show failure of core.precomposeunicode with decomposed filenames

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) Yeah, we could perhaps get away w

Re: [PATCH] t3910: show failure of core.precomposeunicode with decomposed filenames

On Mon, Apr 28, 2014 at 03:35:02PM -0400, Jeff King wrote: > Since such entries are in the minority, and because cache_entry is > already a variable-length struct, I think you could get away with > sticking it after the "name" field, and then comparing like: > > const char *ce_normalized_name(s

Re: [PATCH] Uses git-credential for git-imap-send

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) { > > fprintf(stderr, "Skipping server

[PATCH] Uses git-credential for git-imap-send

git-imap-send was directly prompting for a password rather than using git-credential. git-send-email, on the other hand, supports git-credential. This is a necessary improvement for users that use two factor authentication, as they should not be expected to remember all of their app specific passw

git gui error with relocated repository

Hi Pat, I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet) which includes gitgui-0.19.0 and I'm getting a new error when I run 'git gui' in a repository with a .git file (created by git submodule). I can send you a screencap of the error message off list if you want but the tex

Re: [PATCH v1 0/4] replace: add option to edit a Git object

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 shape, and I just read over them

Re: [PATCH v4 15/27] fast-import.c: change update_branch to use ref transactions

On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg wrote: > Change update_branch() to use ref transactions for updates. > > Signed-off-by: Ronnie Sahlberg > --- > fast-import.c | 20 > 1 file changed, 12 insertions(+), 8 deletions(-) > > diff --git a/fast-import.c b/fast-impor

Re: [PATCH 00/32] Split index mode for very large indexes

On Tue, Apr 29, 2014 at 4:18 AM, Shawn Pearce wrote: > On Mon, Apr 28, 2014 at 3:55 AM, Nguyễn Thái Ngọc Duy > wrote: >> I hinted about it earlier [1]. It now passes the test suite and with a >> design that I'm happy with (thanks to Junio for a suggestion about the >> rename problem). >> >> From

Re: [PATCH 17/32] read-cache: split-index mode

On Tue, Apr 29, 2014 at 5:46 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> diff --git a/cache.h b/cache.h >> index 0f6247c..90a5998 100644 >> --- a/cache.h >> +++ b/cache.h >> @@ -135,6 +135,7 @@ struct cache_entry { >> unsigned int ce_mode; >> unsigned int ce_flags;

Re: Recording the current branch on each commit?

Felipe Contreras wrote: > James Denholm wrote: >> It's not anybody else's job to take your patches and drizzle them in the >> honey of respectable discourse. > > It's nobody's job to do anything. This a collaborative effort and in a > collaborative effort everbody chimes in to do different things.

Re: Recording the current branch on each commit?

Junio C Hamano wrote: > Felipe Contreras writes: > > > In this context James was talking about what Git should be. But the vast > > majority agree on this issue, so that's not what's preventing change. > > I agree that recognition of the issue is not what prevents a change. It's not just recogn

Re: [PATCH v4 08/27] refs.c: change ref_transaction_update() to do error checking and return status

On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg wrote: > Update ref_transaction_update() do some basic error checking and return > true on error. Update all callers to check ref_transaction_update() for error. > > Signed-off-by: Ronnie Sahlberg > --- > builtin/update-ref.c | 10 ++ > re

git subtree issue in more recent versions

Hi, I've discovered a bug in git subtree related to annotated tags. The command 'git subtree' will fail if you use an annotated tag as the . e.g.: $ git subtree add -P oldGit https://github.com/git/git.git tags/v1.9.2 Will produce this error: 10ff115f5c572299de4e04ade0d7adb3c75fbf1f is not a v

Re: [PATCH v4 12/27] replace.c: use the ref transaction functions for updates

On Mon, Apr 28, 2014 at 6:54 PM, Ronnie Sahlberg wrote: > Update replace.c to use ref transactions for updates. > > Signed-off-by: Ronnie Sahlberg > --- > builtin/replace.c | 14 -- > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/builtin/replace.c b/builtin/replace

Re: Recording the current branch on each commit?

Felipe Contreras writes: > In this context James was talking about what Git should be. But the vast > majority agree on this issue, so that's not what's preventing change. Sorry, I saw "take your patches" from James and "my patch" from you in the context above that part, and somehow thought that

Re: [PATCH 04/12] Makefile: introduce CROSS_COMPILE variable

Jonathan Nieder wrote: > Marat Radchenko wrote: > > On Mon, Apr 28, 2014 at 12:37:42PM -0500, Felipe Contreras wrote: > > >>> +CC = $(CROSS_COMPILE)cc > >> > >> Nice. > > > > Actually, not. You still have to override CC because it is > > $(CROSS_COMPILE)*g*cc. Any thoughts how to handle this? > >

Re: Recording the current branch on each commit?

Junio C Hamano wrote: > Felipe Contreras writes: > > > Except that in this case virtually everyone agreed the default was wrong. I > > already said that. > > > > Clarly you didn't read the relevant discussions where everyone, including > > Linus > > Torvalds, agreed. Did you? > > My recollectio

Re: [PATCH] Revert "Stop starting pager recursively"

On Mon, 28 April 2014 16:04:28 -0700, Junio C Hamano wrote: > > Just the Sign-off is trivial enough that even this brainless > patch-monkey^Wpanda should be able to handle. The part "The log > message could be improved" is something you may be better equipped > to, though. Looks good to me. The

Re: Recording the current branch on each commit?

Felipe Contreras writes: > Except that in this case virtually everyone agreed the default was wrong. I > already said that. > > Clarly you didn't read the relevant discussions where everyone, including > Linus > Torvalds, agreed. Did you? My recollection is that everybody agreed that the defaul

Re: [PATCH 04/12] Makefile: introduce CROSS_COMPILE variable

Marat Radchenko wrote: > On Mon, Apr 28, 2014 at 12:37:42PM -0500, Felipe Contreras wrote: >>> +CC = $(CROSS_COMPILE)cc >> >> Nice. > > Actually, not. You still have to override CC because it is > $(CROSS_COMPILE)*g*cc. Any thoughts how to handle this? One possibility would be something like

Re: Tagging a branch as "not fitted for branching" ?

Jean-Noël Avila writes: > Most manuals on git state that it is bad practice to push -f a branch > after have meddled with its history, because this would risk to upset > the repositories of the coworkers. On the other hand, some workflows > use branches to propose modifications, and need some rew

Re: [PATCH v2] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

Dave Borowitz wrote: > Signed-off-by: Dave Borowitz > --- > Makefile | 41 - > 1 file changed, 28 insertions(+), 13 deletions(-) For what it's worth, Reviewed-by: Jonathan Nieder Thanks for the quick turnaround. -- To unsubscribe from this list: send th

Re: Recording the current branch on each commit?

James Denholm wrote: > Felipe Contreras wrote: > > David Kastrup wrote: > > > It becomes easier to actually change things when communicating in a less > > > abrasive and destructive manner. > > > > That would make sense if I was the only one with the itch. But I wasn't the > > only one, so anybody

Brotherhood

I need your cooperation to reprofile over 20M pounds and invest same -- 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

Re: [PATCH] Revert "Stop starting pager recursively"

Jörn Engel writes: > On Mon, 28 April 2014 10:14:05 -0700, Junio C Hamano wrote: >> Matthieu Moy writes: >> >> > - Original Message - >> >> On Sun, Apr 27, 2014 at 09:12:39AM +0700, Duy Nguyen wrote: >> >> >> >> > The intent of the commit was "that is a stupid thing to do, but it's >>

Re: Recording the current branch on each commit?

Felipe Contreras wrote: >David Kastrup wrote: >> It becomes easier to actually change things when communicating in a >less >> abrasive and destructive manner. > >That would make sense if I was the only one with the itch. But I wasn't >the >only one, so anybody could take the patches and send them

[PATCH v4 25/27] walker.c: use ref transaction for ref updates

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. This changes the lockin

[PATCH v4 20/27] fetch.c: clear errno before calling functions that might set it

In s_update_ref there are two calls that when they fail we return an error based on the errno value. In particular we want to return a specific error if ENOTDIR happened. Both these functions do have failure modes where they may return an error without updating errno, in which case a previous and u

[PATCH v4 19/27] refs.c: ref_transaction_commit should not free the transaction

Change ref_transaction_commit so that it does not free the transaction. Instead require that a caller will end a transaction by either calling ref_transaction_rollback or ref_transaction_free. By having the transaction object remaining valid after _commit returns allows us to write much nicer code

[PATCH v4 05/27] update-ref.c: log transaction error from the update_ref

Call ref_transaction_commit with QUIET_ON_ERR and use the strbuf that is returned to print a log message if/after the transaction fails. Signed-off-by: Ronnie Sahlberg --- builtin/update-ref.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/update-ref.c b/b

[PATCH v4 04/27] refs.c: make ref_update_reject_duplicates take a strbuf argument for errors

Make ref_update_reject_duplicates return any error that occurs through a new strbuf argument. Signed-off-by: Ronnie Sahlberg --- refs.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/refs.c b/refs.c index 64e8feb..21a147b 100644 --- a/refs.c +++ b/refs.c @@ -3393,6 +339

[PATCH v4 10/27] refs.c: ref_transaction_delete to check for error and return status

Change ref_transaction_delete() to do basic error checking and return status. Update all callers to check the return for ref_transaction_delete() Signed-off-by: Ronnie Sahlberg --- builtin/update-ref.c | 5 +++-- refs.c | 15 ++- refs.h | 8 3 f

[PATCH v4 14/27] sequencer.c: use ref transactions for all ref updates

Change to use ref transactions for all updates to refs. Signed-off-by: Ronnie Sahlberg --- sequencer.c | 23 +-- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/sequencer.c b/sequencer.c index bde5f04..449e093 100644 --- a/sequencer.c +++ b/sequencer.c @@ -272,

[PATCH v4 11/27] tag.c: use ref transactions when doing updates

Change tag.c to use ref transactions for all ref updates. Signed-off-by: Ronnie Sahlberg --- builtin/tag.c | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/builtin/tag.c b/builtin/tag.c index 40356e3..31e32cb 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -48

[PATCH v4 13/27] commit.c: use ref transactions for updates

Change commit.c to use ref transactions for all ref updates. Make sure we pass a NULL pointer to ref_transaction_update if have_old is false. Signed-off-by: Ronnie Sahlberg --- builtin/commit.c | 23 ++- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/builtin/

[PATCH v4 15/27] fast-import.c: change update_branch to use ref transactions

Change update_branch() to use ref transactions for updates. Signed-off-by: Ronnie Sahlberg --- fast-import.c | 20 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/fast-import.c b/fast-import.c index fb4738d..300c8dc 100644 --- a/fast-import.c +++ b/fast-import

[PATCH v4 12/27] replace.c: use the ref transaction functions for updates

Update replace.c to use ref transactions for updates. Signed-off-by: Ronnie Sahlberg --- builtin/replace.c | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index b62420a..b037b29 100644 --- a/builtin/replace.c +++ b/builtin/

[PATCH v4 03/27] refs.c: add a strbuf argument to ref_transaction_commit for error logging

Add a strbuf argument to _commit so that we can pass an error string back to the caller. So that we can do error logging from the caller instead of from _commit. Longer term plan is to first convert all callers to use onerr==QUIET_ON_ERR and craft any log messages from the callers themselves and f

[PATCH v4 08/27] refs.c: change ref_transaction_update() to do error checking and return status

Update ref_transaction_update() do some basic error checking and return true on error. Update all callers to check ref_transaction_update() for error. Signed-off-by: Ronnie Sahlberg --- builtin/update-ref.c | 10 ++ refs.c | 9 +++-- refs.h | 10 +

[PATCH v4 23/27] receive-pack.c: use a reference transaction for updating the refs

Wrap all the ref updates inside a transaction to make the update atomic. Signed-off-by: Ronnie Sahlberg --- builtin/receive-pack.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index c323081..885aef4 100

[PATCH v4 00/27] Use ref transactions for all ref updates

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 are failures locking or writing to a ref. Versi

[PATCH v4 24/27] fast-import.c: use a ref transaction when dumping tags

Signed-off-by: Ronnie Sahlberg --- fast-import.c | 17 - 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/fast-import.c b/fast-import.c index ab36de5..b105f17 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1730,15 +1730,22 @@ static void dump_tags(void) {

[PATCH v4 17/27] refs.c: change update_ref to use a transaction

Change the update_ref helper function to use a ref transaction internally. Signed-off-by: Ronnie Sahlberg --- refs.c | 25 + 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/refs.c b/refs.c index 0a4e28e..563f336 100644 --- a/refs.c +++ b/refs.c @@ -3396,11

[PATCH v4 06/27] refs.c: make update_ref_write update a strbuf on failure

Change update_ref_write to also update an error strbuf on failure. This makes the error available to ref_transaction_commit callers if the transaction failed due to update_ref_sha1/write_ref_sha1 failures. Signed-off-by: Ronnie Sahlberg --- refs.c | 9 ++--- 1 file changed, 6 insertions(+),

[PATCH v4 16/27] branch.c: use ref transaction for all ref updates

Change create_branch to use a ref transaction when creating the new branch. ref_transaction_create will check that the ref does not already exist and fail otherwise meaning that we no longer need to keep a lock on the ref during the setup_tracking. This simplifies the code since we can now do the t

[PATCH v4 18/27] refs.c: free the transaction before returning when number of updates is 0

We have to free the transaction before returning in the early check for 'return early if number of updates == 0' or else the following code would create a memory leak with the transaction never being freed : t = ref_transaction_begin() ref_transaction_commit(t) Signed-off-by: Ronnie Sahlberg

[PATCH v4 26/27] refs.c: make write_ref_sha1 static

No external users call write_ref_sha1 any more so lets declare it static. Signed-off-by: Ronnie Sahlberg --- refs.c | 4 +++- refs.h | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/refs.c b/refs.c index add95ba..cb7d69f 100644 --- a/refs.c +++ b/refs.c @@ -251,6 +251,8 @@

[PATCH v4 21/27] fetch.c: change s_update_ref to use a ref transaction

Change s_update_ref to use a ref transaction for the ref update. Signed-off-by: Ronnie Sahlberg --- builtin/fetch.c | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index a93c893..b41d7b7 100644 --- a/builtin/fetch.c +++ b/bu

[PATCH v4 09/27] refs.c: change ref_transaction_create to do error checking and return status

Do basic error checking in ref_transaction_create() and make it return status. Update all callers to check the result of ref_transaction_create() Signed-off-by: Ronnie Sahlberg --- builtin/update-ref.c | 4 +++- refs.c | 17 +++-- refs.h | 8 3

[PATCH v4 27/27] refs.c: make lock_ref_sha1 static

No external callers reference lock_ref_sha1 any more so lets declare it static. Signed-off-by: Ronnie Sahlberg --- refs.c | 2 +- refs.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/refs.c b/refs.c index cb7d69f..eebcacb 100644 --- a/refs.c +++ b/refs.c @@ -2130,7 +2130

[PATCH v4 07/27] refs.c: remove the onerr argument to ref_transaction_commit

Since all callers now use QUIET_ON_ERR we no longer need to provide an onerr argument any more. Remove the onerr argument from the ref_transaction_commit signature. Signed-off-by: Ronnie Sahlberg --- builtin/update-ref.c | 3 +-- refs.c | 22 +++--- refs.h

[PATCH v4 22/27] fetch.c: use a single ref transaction for all ref updates

Change store_updated_refs to use a single ref transaction for all refs that are updated during the fetch. This makes the fetch more atomic when update failures occur. Since ref update failures will now no longer occur in the code path for updating a single ref in s_update_ref, we no longer have as

[PATCH v4 01/27] refs.c: constify the sha arguments for ref_transaction_create|delete|update

ref_transaction_create|delete|update has no need to modify the sha1 arguments passed to it so it should use const unsigned char* instead of unsigned char*. Some functions, such as fast_forward_to(), already have its old/new sha1 arguments as consts. This function will at some point need to use ref

[PATCH v4 02/27] refs.c: allow passing NULL to ref_transaction_free

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)

Re: [PATCH 17/32] read-cache: split-index mode

Nguyễn Thái Ngọc Duy writes: > diff --git a/cache.h b/cache.h > index 0f6247c..90a5998 100644 > --- a/cache.h > +++ b/cache.h > @@ -135,6 +135,7 @@ struct cache_entry { > unsigned int ce_mode; > unsigned int ce_flags; > unsigned int ce_namelen; > + unsigned int index; /

Re: [PATCH 00/32] Split index mode for very large indexes

Nguyễn Thái Ngọc Duy writes: > The read penalty is not addressed here, so I still pay 14MB hashing > cost. Hmm, yeah, the cost for verify_hdr() would still matter, and presumably you would be hashing the additional 200kB to validate the smaller "changes since the base" file to give users the sa

Re: [RFC/PATCH 2/2] trailer: add examples to the documentation

Christian Couder writes: > Signed-off-by: Christian Couder > --- > Documentation/git-interpret-trailers.txt | 98 > +++- > 1 file changed, 97 insertions(+), 1 deletion(-) Very good to have these examples. They seem to be clearly written. Having said that, this pa

Re: Harmful LESS flags

On 4/23/2014 5:11 PM, Jonathan Nieder wrote: > That sounds like a nice feature request for 'less': a marker on the > right margin when --chop-long-lines is in use and a line has been > chopped. I don't see it at > http://www.greenwoodsoftware.com/less/bugs.html#enhance so maybe no > one else has t

Re: [PATCH v2] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

Dave Borowitz writes: > The original implementation of CURL_CONFIG support did not match the > original behavior of using -lcurl when CURLDIR was not set. This broke > implementations that were lacking curl-config but did have libcurl > installed along system libraries, such as MSysGit. In other

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

Jonathan Nieder writes: > Gah. Maybe it should be left-justified to avoid accentally breaking > it again. ;-). Yes, $(error) is not the usual part of "to build this target, follow this recipe" part. But let's take the last round as-is and go with it for 2.0. Tahnks. -- To unsubscribe from th

git-svn: Out of memory while cloning large (cca. 48000 commits) SVN repo

Hello, I’m trying to clone an SVN repository with around 48000 revisions, several branches and tags (svn://svn.zabbix.com). After a few thousands commits, Git failed (complaining something about sed, I haven’t wrote that down), so I svnrdumped the whole repository onto my filesystem. After that,

Re: [PATCH 00/32] Split index mode for very large indexes

On Mon, Apr 28, 2014 at 3:55 AM, Nguyễn Thái Ngọc Duy wrote: > I hinted about it earlier [1]. It now passes the test suite and with a > design that I'm happy with (thanks to Junio for a suggestion about the > rename problem). > > From the user point of view, this reduces the writable size of index

Re: [PATCH v3 1/2] Makefile: use curl-config to determine curl flags

Junio C Hamano writes: > This "ifeq" is redundant and will never set CURL_LIBCURL to empty > without running the "else" part, I think. In a Makefile, a variable > explicitly set to empty and a variable that is unset are treated the > same > $ make -f Makefile CURL_CONFIG="" > Emp

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

Dave Borowitz writes: > On Mon, Apr 28, 2014 at 1:05 PM, Jonathan Nieder wrote: >> Dave Borowitz wrote: >> >>> Instead, if CURL_CONFIG is empty or returns an empty result (e.g. due >>> to curl-config being missing), use the old behavior of falling back to >>> -lcurl. >>> --- >>> Makefile | 36 +

[PATCH v2] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

The original implementation of CURL_CONFIG support did not match the original behavior of using -lcurl when CURLDIR was not set. This broke implementations that were lacking curl-config but did have libcurl installed along system libraries, such as MSysGit. In other words, the assumption that curl-

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

On Mon, Apr 28, 2014 at 1:45 PM, Junio C Hamano wrote: > I still think the implementation of "If CURL_CONFIG is unset" bit is > a bit redundant, though. If CURL_CONFIG is unset, then $(shell $(CURL_CONFIG) --libs) produces "make: --libs: Command not found", which may be confusing. -- To unsubscri

Re: [PATCH 04/12] Makefile: introduce CROSS_COMPILE variable

On Mon, Apr 28, 2014 at 01:45:04PM -0700, Jonathan Nieder wrote: > I'm not really sure what in particular you're pointing to in that > page. If you have a more specific question about what '?=' means, > could you say it? Woops. I guess I need some sleep. Confused '?=' with ':='. -- To unsubscribe

Re: [PATCH 04/12] Makefile: introduce CROSS_COMPILE variable

Hi, Marat Radchenko wrote: > On Mon, Apr 28, 2014 at 09:25:36AM -0700, Jonathan Nieder wrote: >>> -STRIP ?= strip >>> +STRIP = $(CROSS_COMPILE)strip >> >> Before, STRIP from the environment took precedence over STRIP from the >> makefile. Switching to the more usual 'environment can't be trusted

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

On Mon, Apr 28, 2014 at 1:05 PM, Jonathan Nieder wrote: > Dave Borowitz wrote: > >> Instead, if CURL_CONFIG is empty or returns an empty result (e.g. due >> to curl-config being missing), use the old behavior of falling back to >> -lcurl. >> --- >> Makefile | 36 +-

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

On Mon, Apr 28, 2014 at 1:50 PM, Jonathan Nieder wrote: >> $ echo -e 'ifndef FOO\n\t$(error bad things)\nendif\n\nfoo:\n\ttouch >> foo' > mk1 && make -f mk1 foo >> mk1:2: *** commands commence before first target. Stop. >> $ echo -e 'ifndef FOO\n $(error bad things)\nendif\n\nfoo:\n\ttouch >> fo

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

Dave Borowitz wrote: > On Mon, Apr 28, 2014 at 1:05 PM, Jonathan Nieder wrote: >> Dave Borowitz wrote: >>> +++ b/Makefile >>> @@ -35,7 +35,9 @@ all:: >>> # transports (neither smart nor dumb). >>> # >>> # Define CURL_CONFIG to the path to a curl-config binary other than the >>> -# default 'cur

Re: [PATCH] t3910: show failure of core.precomposeunicode with decomposed filenames

On 2014-04-28 22.03, Jeff King wrote: > On Mon, Apr 28, 2014 at 09:52:07PM +0200, Torsten Bögershausen wrote: > >> To my knowledge repos with decomposed unicode should be rare in >> practice. I only can speak for european (or latin based) or cyrillic >> languages myself: > I've run across several

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

On Mon, Apr 28, 2014 at 1:46 PM, Dave Borowitz wrote: > How about: > "If CURL_CONFIG is unset or points to a binary that is not found, > defaults to the CURLDIR behavior. If CURLDIR is not set, this means > using -lcurl with no additional library detection (other than > NEEDS_*_WITH_CURL). Even b

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

Dave Borowitz writes: > The original implementation of CURL_CONFIG support did not match the > original behavior of using -lcurl when CURLDIR was not set. This broke > implementations that were lacking curl-config but did have libcurl > installed along system libraries, such as MSysGit. In other

Re: Reference to a commit inside a commit message

Thank you very much > Why not? the reason is to avoid mistakes with the hash. An automatic approach can verify the existence of the commit. > See the output of > > git log --grep='In commit ' > > and > > git log --grep='In v' I've just tried the commands and noticed that this ca

Re: [PATCH 04/12] Makefile: introduce CROSS_COMPILE variable

On Mon, Apr 28, 2014 at 09:25:36AM -0700, Jonathan Nieder wrote: > > -STRIP ?= strip > > +STRIP = $(CROSS_COMPILE)strip > > Before, STRIP from the environment took precedence over STRIP from the > makefile. Switching to the more usual 'environment can't be trusted' > convention is a good change,

Re: [PATCH 2/2] Mention "git blame" improvements in release notes

Ronnie Sahlberg writes: > Some projects, for example samba, provide a dedicated page on the > project web site > where vendors, and I think individuals, that provide services can list > their information : > > http://www.samba.org/samba/support/ > > Would this perhaps be a better solution? Actua

Re: [PATCH 03/12] MINGW: compat/mingw.h: do not attempt to redefine lseek on mingw-w64

On Mon, Apr 28, 2014 at 9:59 PM, Torsten Bögershausen wrote: > On 2014-04-28 15.51, Marat Radchenko wrote: >> mingw-w64 has lseek defined in io.h. > [] >> #define off_t off64_t >> +#ifndef lseek >> #define lseek _lseeki64 >> +#endif > Is the commit message in line with the code? > > I would have

Re: [PATCH 03/12] MINGW: compat/mingw.h: do not attempt to redefine lseek on mingw-w64

Torsten Bögershausen wrote: > On 2014-04-28 15.51, Marat Radchenko wrote: > > mingw-w64 has lseek defined in io.h. > [] > > #define off_t off64_t > > +#ifndef lseek > > #define lseek _lseeki64 > > +#endif > Is the commit message in line with the code? > > I would have expected something in this

Re: [PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

Dave Borowitz wrote: > Instead, if CURL_CONFIG is empty or returns an empty result (e.g. due > to curl-config being missing), use the old behavior of falling back to > -lcurl. > --- > Makefile | 36 +--- > 1 file changed, 25 insertions(+), 11 deletions(-) Sign-off

Re: [PATCH 2/2] Mention "git blame" improvements in release notes

On Mon, Apr 28, 2014 at 12:35 PM, Junio C Hamano wrote: > David Kastrup writes: > >> Junio C Hamano writes: >> >>> But still, I am not convinced that the release notes is a good place >>> to do this, and would be happier if you can think of a better venue. >> >> "This change has been contributed

Re: [PATCH 06/10] log: --function-name pickaxe

I plan to work on this in few weeks. If anybody has more suggestion or want to discuss the implementation let me know On Fri, Apr 4, 2014 at 2:46 PM, Junio C Hamano wrote: > Jakub Narębski writes: > >> W dniu 2014-04-03 23:44, Junio C Hamano pisze: >>> René Scharfe writes: >>> With that ap

Re: [PATCH] t3910: show failure of core.precomposeunicode with decomposed filenames

On Mon, Apr 28, 2014 at 09:52:07PM +0200, Torsten Bögershausen wrote: > To my knowledge repos with decomposed unicode should be rare in > practice. I only can speak for european (or latin based) or cyrillic > languages myself: I've run across several cases in the past few months, but only just f

Re: [PATCH v3 1/2] Makefile: use curl-config to determine curl flags

Junio C Hamano writes: > That does not mean the patch will give us a broken behaviour, > though. It just means the ifeq/else part will be redundant. > >> endif >> + >> +ifeq "$(CURL_LIBCURL)" "" > > This will catch the "$(shell $(CURL_CONFIG) --libs) assigned an > empty string to CURL_L

Re: [PATCH 03/12] MINGW: compat/mingw.h: do not attempt to redefine lseek on mingw-w64

On 2014-04-28 15.51, Marat Radchenko wrote: > mingw-w64 has lseek defined in io.h. [] > #define off_t off64_t > +#ifndef lseek > #define lseek _lseeki64 > +#endif Is the commit message in line with the code? I would have expected something in this style: #if defined(__x86_64__) && ! defined(lse

Re: [PATCH v3 1/2] Makefile: use curl-config to determine curl flags

On Mon, Apr 28, 2014 at 12:44 PM, Jonathan Nieder wrote: > Hi, > > Dave Borowitz wrote: > >> curl-config is usually installed alongside a curl distribution, and >> its purpose is to provide flags for building against libcurl, so use >> it instead of guessing flags and dependent libraries. > > The

Re: [PATCH 2/2] Mention "git blame" improvements in release notes

Junio C Hamano writes: > I guess we probably can add "See $URL if you are interested in his > further plans" after that two-line item and let you write whatever > you want at that page pointed at by the URL, though. I most definitely am _not_ planning to invest any more time into Git since even

Re: [PATCH v3 1/2] Makefile: use curl-config to determine curl flags

Dave Borowitz writes: > Use this only when CURLDIR is not explicitly specified, to continue > supporting older builds. Moreover, if CURL_CONFIG is unset or running > it returns no results (e.g. because it is missing), default to the old > behavior of blindly setting -lcurl. > ifdef CURLDIR

Re: Reference to a commit inside a commit message

Hi, enzodici...@gmail.com wrote: > Hi to all, I'm trying to figure out what is the best way (and if it > exists) to link a message of a commit to another commit. [...] > Obviously I don't mean to put the raw Hash, Why not? See the output of git log --grep='In commit ' and git

Re: [PATCH] t3910: show failure of core.precomposeunicode with decomposed filenames

On 28.04.14 21:35, Jeff King wrote: > On Mon, Apr 28, 2014 at 12:17:28PM -0700, Junio C Hamano wrote: > >>> 3. Convert index filenames to their precomposed form when >>> we read the index from disk. This would be efficient, >>> but we would have to be careful not to write the >>>

Re: [PATCH v3 19/19] refs.c: pass **transaction to commit and have it clear the pointer

On Fri, Apr 25, 2014 at 6:31 PM, Michael Haggerty 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 transaction pointer from within >> ref_transaction_commit so that it becomes

[PATCH] Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR

The original implementation of CURL_CONFIG support did not match the original behavior of using -lcurl when CURLDIR was not set. This broke implementations that were lacking curl-config but did have libcurl installed along system libraries, such as MSysGit. In other words, the assumption that curl-

  1   2   3   >