Re: [PATCH/RFC 4/6] transport: add refspec list parameters to functions

On Tue, 2016-04-19 at 21:17 -0400, Jeff King wrote: > On Tue, Apr 19, 2016 at 07:43:11PM -0400, David Turner wrote: > > > On Tue, 2016-04-19 at 19:22 -0400, Jeff King wrote: > > > You can find previous discussion on the list, but I think the > > > options > > > basically are: > > > > > > 1.

Re: [PATCH 0/5] fix deadlock in git-push

Jeff King writes: > The first patch below fixes the deadlock. Unfortunately, it turns it > into a likely SIGPIPE death. Which is an improvement, but not ideal. > > Patches 2 and 3 address that by fixing the way we handle SIGPIPE in > async threads. > > Patches 4 and 5 are cleanups

Re: git rebase -i without altering the committer date

On April 20, 2016 at 13:37:01, Junio C Hamano (gits...@pobox.com(mailto:gits...@pobox.com)) wrote: > Shaun Jackman writes: > > > I'd like to insert a commit between two commits without changing > > the committer date or author date of that commit or the subsequent > > commits. I'd planned on

Re: [PATCH v5 03/15] index-helper: new daemon for caching index and related stuff

On Wed, 2016-04-20 at 14:17 +0200, Johannes Schindelin wrote: > Hi Dave, > > (apologies in advance if I may bring up anything that has been > discussed > in earlier iterations; I simply was too busy with the rebase--helper > project to even look.) > > On Tue, 19 Apr 2016, David Turner wrote: >

Re: [PATCH v5 02/15] read-cache: allow to keep mmap'd memory after reading

On Wed, 2016-04-20 at 16:26 +0700, Duy Nguyen wrote: > On Wed, Apr 20, 2016 at 6:27 AM, David Turner < > dtur...@twopensource.com> wrote: > > From: Nguyễn Thái Ngọc Duy > > > > Later, we will introduce git index-helper to share this memory with > > other git processes. > > >

Re: Is there a "git reset --keep || git reset --hard " alternative?

On Wed, Apr 20, 2016 at 9:03 PM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> $ ls -l INSTALL ; chmod 600 INSTALL ; git reset --hard @{u} ; ls -l >> INSTALL >> -rw-r--r-- 1 avar avar 9147 Apr 20 17:11 INSTALL >> HEAD is now at

Re: [PATCHv3 0/3] Implements the GIT_TRACE_CURL environment variable

On Wed, Apr 20, 2016 at 08:49:55PM +0100, Ramsay Jones wrote: > > Strictly speaking 1 should come at the end for the same reason, as > > setting GIT_TRACE_CURL after seeing that commit would not give users > > anything new. > > Yep, I was just about to send an email saying that the patches

Re: [PATCH/RFC 4/6] transport: add refspec list parameters to functions

On Wed, Apr 20, 2016 at 04:46:55PM -0400, David Turner wrote: > As you note, it appears that git-daemon does sort-of have support for > extra args -- see parse_host_arg. So it wouldn't be hard to add > something here. Unfortunately, current versions of git die on unknown > args. So this change

Re: [PATCHv3 3/3] http.c: implements the GIT_TRACE_CURL environment variable

On 20/04/16 19:53, Junio C Hamano wrote: > Elia Pinto writes: > >> Implements the GIT_TRACE_CURL environment variable to allow a > > s/Implements/Implement/; speak as if you are giving an order to the > codebase to "be like so". > >> greater degree of detail of

git rebase -i without altering the committer date

I'd like to insert a commit between two commits without changing the committer date or author date of that commit or the subsequent commits. I'd planned on using `git rebase -i` to insert the commit. I believe it retains the author date, but changes the committer date to the current time. I've

Re: [PATCH] git-rebase--merge: don't include absent parent as a base

Ben Woosley writes: > From: Ben Woosley > > Absent this fix, attempts to rebase an orphan branch with --strategy recursive > will fail with: > > $ git rebase ORPHAN_TARGET_BASE -s recursive > First, rewinding head to replay your work on top

Re: problems serving non-bare repos with submodules over http

Stefan Beller writes: >> I may be missing the subtleties, but if you are serving others from >> a non-bare repository with submodules, I do not think you would want >> to expose the in-tree version of the submodule in the first place. > > Well I would imagine that is the

Re: [PATCH] Update git-p4 to be compatible with git-lfs 1.2

Thanks! Some thoughts: * One option on the Travis front would be to just test one combination of the 1.1 build - e.g. linux + clang + 1.1, so you'll stay within the 5 parallel builds while also having some coverage on lfs 1.1. * It might be risky to match on contentFile when looking for the

Re: Is there a "git reset --keep || git reset --hard " alternative?

Ævar Arnfjörð Bjarmason writes: > $ ls -l INSTALL ; chmod 600 INSTALL ; git reset --hard @{u} ; ls -l > INSTALL > -rw-r--r-- 1 avar avar 9147 Apr 20 17:11 INSTALL > HEAD is now at e6ac6e1 Fifth batch for post 2.8 cycle > -rw-r--r-- 1 avar avar 9147 Apr 20 17:12

Re: [PATCH] Update git-p4 to be compatible with git-lfs 1.2

> On Wed, Apr 20, 2016 at 12:00 PM, Luke Diamand wrote: >> On 20 April 2016 at 19:28, Ben Woosley wrote: >>> From: Ben Woosley >>> >>> The git lfs pointer output was changed in: >>> https://github.com/github/git-lfs/pull/1105 >>>

Re: problems serving non-bare repos with submodules over http

On Wed, 20 Apr 2016, Stefan Beller wrote: > > I do realize that the situation is quite uncommon, partially I guess due > > to git submodules mechanism flexibility and power on one hand and > > under-use (imho) on the other, which leads to discovery of regressions > > [e.g. 1] and corner cases as

Re: [PATCH v5 10/15] update-index: enable/disable watchman support

On Wed, 2016-04-20 at 06:45 +0700, Duy Nguyen wrote: > On Wed, Apr 20, 2016 at 6:28 AM, David Turner < > dtur...@twopensource.com> wrote: > > + if (use_watchman > 0) { > > + the_index.last_update= xstrdup(""); > > + the_index.cache_changed |= WATCHMAN_CHANGED;

Re: [PATCH v2 2/2] git-p4: fix Git LFS pointer parsing

On 20 Apr 2016, at 20:30, Junio C Hamano wrote: > Sebastian Schuberth writes: > >> Why do we need to remove the preamble at all, if present? Because I need the content of a valid Git LFS pointer file a few lines below:

Re: [PATCH v2 2/2] git-p4: fix Git LFS pointer parsing

larsxschnei...@gmail.com writes: > -pointerContents = [i+'\n' for i in pointerFile.split('\n')[2:][:-1]] > -oid = pointerContents[1].split(' ')[1].split(':')[1][:-1] > + > +# Git LFS removed the preamble in the output of the 'pointer' command > +# starting from

Re: [PATCH] Update git-p4 to be compatible with git-lfs 1.2

On 20 April 2016 at 19:28, Ben Woosley wrote: > From: Ben Woosley > > The git lfs pointer output was changed in: > https://github.com/github/git-lfs/pull/1105 > > This was causing Mac Travis runs to fail, as homebrew had updated to 1.2 > while Linux

Re: problems serving non-bare repos with submodules over http

Stefan Beller writes: >> 1. After cloning >> >> git clone http://localhost:8080/.git >> >>I cannot 'submodule update' the sub1 in the clone since its url after >>'submodule init' would be http://localhost:8080/.git/sub1 . If I >> manually fix >>it up -- it

Re: [PATCH] Extend runtime prefix computation

Hi, On Fri, Apr 15, 2016 at 09:43:29AM -0700, Junio C Hamano wrote: > We tend to avoid system specific includes in individual *.c files. > Perhaps implement platform specific bits in compat/? E.g. each > platform specific file in compat/ may implement and export the same >

Re: [PATCH v5 02/15] read-cache: allow to keep mmap'd memory after reading

On Wed, 2016-04-20 at 11:01 +0200, Johannes Schindelin wrote: > Hi Dave, > > On Tue, 19 Apr 2016, David Turner wrote: > > > unmap: > > + istate->mmap = NULL; > > munmap(mmap, mmap_size); > > die("index file corrupt"); > > } > > [...] > > @@ -1698,6 +1705,10 @@ int

Re: problems serving non-bare repos with submodules over http

On Wed, Apr 20, 2016 at 12:51 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> 1. After cloning >>> >>> git clone http://localhost:8080/.git >>> >>>I cannot 'submodule update' the sub1 in the clone since its url after >>>'submodule init'

Re: [PATCH] git-rebase--merge: don't include absent parent as a base

It's helpful in the case where a bit of code has been detached from its history by way of copying the files and starting a new repo, where development continues. If you want to reunite the new history with the prior history, while preferring the new history, you need to `rebase -Xtheirs` the new

Re: [PATCHv3 0/3] Implements the GIT_TRACE_CURL environment variable

On 20/04/16 19:41, Junio C Hamano wrote: > Elia Pinto writes: > >> Elia Pinto (3): >> git.txt: document the new GIT_TRACE_CURL environment variable >> imap-send.c: introduce the GIT_TRACE_CURL enviroment variable >> http.c: implements the GIT_TRACE_CURL

Re: [PATCH] Update git-p4 to be compatible with git-lfs 1.2

Yep it's addressing the same problem - I developed this independently after having only viewed the github repo: https://github.com/git/git/pull/231 Things I like about my patch: 1) it maintains ongoing support for git-lfs 1.1 by retaining it in the travis CI 2) it's a fairly minimal intervention

Re: [PATCHv3 3/3] http.c: implements the GIT_TRACE_CURL environment variable

On Wed, Apr 20, 2016 at 12:56 PM, Ramsay Jones wrote: >>> +void curl_dump(const char *text, unsigned char *ptr, size_t size, char >>> nohex) >>> +{ >>> +size_t i; >>> +size_t w; > > As I said in a previous email, curl_dump() should be marked > static here

Re: git rebase -i without altering the committer date

Shaun Jackman writes: > I'd like to insert a commit between two commits without changing > the committer date or author date of that commit or the subsequent > commits. I'd planned on using `git rebase -i` to insert the > commit. I believe it retains the author date, but

Re: [PATCH] replace --edit: respect core.editor

Hi Junio, On Tue, 19 Apr 2016, Junio C Hamano wrote: > "git blame -L475,6 builtin/replace.c" points at b892bb45 (replace: add > --edit option, 2014-04-26) and the commit log message names two people > who can review this change, so that is what I am doing here. D'oh. Sorry. Dscho -- To

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

Jeff King writes: > I mean that if you save any old patch-ids from "git patch-id", they > won't match up when compared with new versions of git. We can probably > ignore it, though. This isn't the first time that patch-ids might have > changed, and I think the advice is already

Re: [PATCH] replace --edit: respect core.editor

Hi Christian & Peff, On Wed, 20 Apr 2016, Christian Couder wrote: > On Wed, Apr 20, 2016 at 5:53 AM, Jeff King wrote: > > On Tue, Apr 19, 2016 at 09:22:37AM -0700, Junio C Hamano wrote: > > > >> I can understand "we only know edit mode needs config, and we know it > >> will never

[PATCH v2] replace --edit: respect core.editor

We simply need to read the config, is all. This fixes https://github.com/git-for-windows/git/issues/733 Signed-off-by: Johannes Schindelin --- builtin/replace.c | 1 + 1 file changed, 1 insertion(+) Interdiff vs v1: diff --git a/builtin/replace.c

Re: [PATCH v2 2/2] git-p4: fix Git LFS pointer parsing

On Wed, Apr 20, 2016 at 10:10 AM, wrote: > --- a/git-p4.py > +++ b/git-p4.py > @@ -1064,8 +1064,17 @@ class GitLFS(LargeFileSystem): > if pointerProcess.wait(): > os.remove(contentFile) > die('git-lfs pointer command failed. Did you

Re: [PATCH v5 02/15] read-cache: allow to keep mmap'd memory after reading

Hi Dave, On Tue, 19 Apr 2016, David Turner wrote: > unmap: > + istate->mmap = NULL; > munmap(mmap, mmap_size); > die("index file corrupt"); > } > [...] > @@ -1698,6 +1705,10 @@ int discard_index(struct index_state *istate) > free(istate->cache); > istate->cache =

Re: [PATCH v5 02/15] read-cache: allow to keep mmap'd memory after reading

On Wed, Apr 20, 2016 at 6:27 AM, David Turner wrote: > From: Nguyễn Thái Ngọc Duy > > Later, we will introduce git index-helper to share this memory with > other git processes. > > Since the memory will be shared, it will never be unmapped (although >

Re: [PATCH v5 06/15] index-helper: add --detach

On Wed, Apr 20, 2016 at 8:04 AM, David Turner wrote: > On Wed, 2016-04-20 at 06:50 +0700, Duy Nguyen wrote: >> On Wed, Apr 20, 2016 at 6:28 AM, David Turner < >> dtur...@twopensource.com> wrote: >> > @@ -317,6 +320,8 @@ int main(int argc, char **argv) >> > if (fd

[PATCH 16/15] Add tracing to measure where most of the time is spent

All the known heavy code blocks are measured (except object database access). This should help identify if an optimization is effective or not. An unoptimized git-status would give something like below (92% of time is accounted). To sum up the effort of making git scale better: - read cache line

Re: [PATCH v5 09/15] index-helper: use watchman to avoid refreshing index with lstat()

On Wed, Apr 20, 2016 at 8:01 AM, David Turner wrote: > On Wed, 2016-04-20 at 07:15 +0700, Duy Nguyen wrote: >> Continuing my comment from the --use-watchman patch about watchman >> not >> being supported... >> >> On Wed, Apr 20, 2016 at 6:28 AM, David Turner < >>

RFT: rebase--helper

Hi all, some of you are already aware that I was working on speeding up the interactive rebase by slowly moving the performance-critical parts into a builtin helper (unfortunately, we missed the boat long time ago when it would still have been feasible to convert the entire rebase family into

[PATCH v2 1/2] travis-ci: update Git-LFS and P4 to the latest version

From: Lars Schneider Signed-off-by: Lars Schneider --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78e433b..4acf617 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8

[PATCH v2 2/2] git-p4: fix Git LFS pointer parsing

From: Lars Schneider Git LFS 1.2.0 removed a preamble from the output of the 'git lfs pointer' command [1] which broke the parsing of this output. Adjust the parser to support the old and the new format. [1]

Re: [PATCH v2] git-p4: add P4 jobs to git commit message

On 19 April 2016 at 22:44, Jan Durovec wrote: >> By the way, you may or may not have noticed that I've been >> reordering the lines of your message quoted in my responses; around >> here, top-posting is frowned upon. > > I haven't noticed. Thanks for pointing out. > > As

Re: [PATCH v1 2/2] git-p4: fix Git LFS pointer parsing

On Tue, Apr 19, 2016 at 11:04 PM, Junio C Hamano wrote: >> I dropped the support for the older version to keep the code as >> simple as possible (plus it would be cumbersome to test with an >> outdated Git LFS version). Since it is probably a niche feature I >> thought that

Silent failure to add Windows-style paths in Cygwin Git

If I attempt to `git add` an extant file specified using a Windows-style path on Cygwin Git, this doesn't add the file, and produces no error message: $ pwd # As seen by Cygwin /cygdrive/c/tmp $ cygpath -aw . # As seen by Windows C:\tmp $ git init Initialized empty Git

Re: [PATCH v2] replace --edit: respect core.editor

On Wed, Apr 20, 2016 at 08:38:03AM +0200, Johannes Schindelin wrote: > We simply need to read the config, is all. > > This fixes https://github.com/git-for-windows/git/issues/733 > > Signed-off-by: Johannes Schindelin Looks good to me. Thanks. -Peff -- To

Re: [PATCH v2] git-p4: add P4 jobs to git commit message

On 19 April 2016 at 22:39, Junio C Hamano wrote: > Jan Durovec writes: > >> On Tue, Apr 19, 2016 at 11:09 PM, Junio C Hamano wrote: >> >>> For a series this small it does not matter, but anything longer it >>> would be easier to

[PATCH v2 0/2] git-p4: fix Git LFS pointer parsing

From: Lars Schneider v1: http://thread.gmane.org/gmane.comp.version-control.git/291917/ diff to v1: * make git-p4 LFS compatible with Git LFS versions prior to 1.2.0 Thanks Junio for the little push ... I guess I was a bit lazy here :) * improve the git-p4 LFS tests

[PATCH] gitweb: apply fallback encoding before highlight

Some multi-byte character encodings (such as Shift_JIS and GBK) have characters whose final bytes is an ASCII '\' (0x5c), and they will be displayed as funny-characters even if $fallback_encoding is correct. This is because `highlight` command always expects UTF-8 encoded strings from STDIN.

Re: [PATCH 16/15] Add tracing to measure where most of the time is spent

On Wed, Apr 20, 2016 at 7:28 PM, Johannes Schindelin wrote: > Hi Duy, > > On Wed, 20 Apr 2016, Nguyễn Thái Ngọc Duy wrote: > >> All the known heavy code blocks are measured (except object database >> access). This should help identify if an optimization is effective or

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

On Tue, Apr 19, 2016 at 04:07:35PM -0700, Junio C Hamano wrote: > Jacob Keller writes: > > > On Tue, Apr 19, 2016 at 10:06 AM, Jeff King wrote: > >> On Tue, Apr 19, 2016 at 08:17:38AM -0700, Stefan Beller wrote: > >> > >>> On Mon, Apr 18, 2016 at 10:03 PM,

[PATCH v2 02/12] worktree.c: store "id" instead of "git_dir"

We can reconstruct git_dir from id quite easily. It's a bit hackier to do the reverse. Signed-off-by: Nguyễn Thái Ngọc Duy --- branch.c | 3 ++- worktree.c | 31 ++- worktree.h | 8 +++- 3 files changed, 27 insertions(+), 15 deletions(-)

Re: [PATCH 16/15] Add tracing to measure where most of the time is spent

Hi Duy, On Wed, 20 Apr 2016, Nguyễn Thái Ngọc Duy wrote: > All the known heavy code blocks are measured (except object database > access). This should help identify if an optimization is effective or > not. An unoptimized git-status would give something like below (92% of > time is accounted).

[PATCH v2 11/12] worktree.c: test if branch being bisected in another worktree

Similar to the rebase case, we want to detect if "HEAD" in some worktree is being bisected because 1) we do not want to checkout this branch in another worktree, after bisect is done it will want to go back to this branch 2) we do not want to delete the branch is either or git bisect will

[PATCH v2 12/12] branch: do not rename a branch under bisect or rebase

The branch name in that case could be saved in rebase's head_name or bisect's BISECT_START files. Ideally we should try to update them as well. But it's trickier (*). Let's play safe and see if the user complains about inconveniences before doing that. (*) If we do it, bisect and rebase need to

[PATCH v2 09/12] worktree.c: test if branch being rebased in another worktree

This function find_shared_symref() is used in a couple places: 1) in builtin/branch.c: it's used to detect if a branch is checked out elsewhere and refuse to delete the branch. 2) in builtin/notes.c: it's used to detect if a note is being merged in another worktree 3) in branch.c, the

[PATCH v2 05/12] path.c: refactor and add worktree_git_path()

do_git_path(), which is the common code for all git_path* functions, is modified to take a worktree struct and can produce paths for any worktree. worktree_git_path() is the first function that makes use of this. It can be used to write code that can examine any worktree. For example,

[PATCH v2 06/12] wt-status.c: split rebase detection out of wt_status_get_state()

worktree.c:find_shared_symref() later needs to know if a branch is being rebased, and only rebased only. Split this code so it can be used independently from other in-progress tests. Signed-off-by: Nguyễn Thái Ngọc Duy --- wt-status.c | 23 +-- wt-status.h

[PATCH v2 04/12] worktree.c: mark current worktree

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 18 +- worktree.h | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/worktree.c b/worktree.c index 360ba41..452f64a 100644 --- a/worktree.c +++ b/worktree.c @@ -2,6 +2,7 @@ #include

[PATCH v2 07/12] wt-status.c: make wt_status_check_rebase() work on any worktree

This is a preparation step for find_shared_symref() to detect if any worktree is being rebased. Signed-off-by: Nguyễn Thái Ngọc Duy --- wt-status.c | 33 - wt-status.h | 5 - 2 files changed, 24 insertions(+), 14 deletions(-) diff --git

[PATCH v2 00/12] fix checking out a being-rebased branch

Much happier with this version. This makes - git checkout refuse if a branch is under rebase or bisect elsewhere - git worktree add refuse if a branch is under rebase or bisect - git branch -D refuse if a branch is under rebase or bisect. This applies for single worktree case as well.

[PATCH v2 01/12] path.c: add git_common_path() and strbuf_git_common_path()

These are mostly convenient functions to reduce code duplication. Most of the time, we should be able to get by with git_path() which handles $GIT_COMMON_DIR internally. However there are a few cases where we need to construct paths manually, for example some paths from a specific worktree. These

[PATCH v2 10/12] wt-status.c: split bisect detection out of wt_status_get_state()

And make it work with any given worktree, in preparation for (again) find_shared_symref(). read_and_strip_branch() is deleted because it's no longer used. Signed-off-by: Nguyễn Thái Ngọc Duy --- wt-status.c | 23 ++- wt-status.h | 2 ++ 2 files changed,

Re: [PATCH v5 03/15] index-helper: new daemon for caching index and related stuff

Hi Dave, (apologies in advance if I may bring up anything that has been discussed in earlier iterations; I simply was too busy with the rebase--helper project to even look.) On Tue, 19 Apr 2016, David Turner wrote: > Shared memory is done by storing files in a per-repository temporary >

[PATCH] tag.c: remove extern keyword from function definition

Signed-off-by: Ramsay Jones --- Hi Santiago, If you need to re-roll your 'st/verify-tag' branch, could you please squash this into the relevant patch (commit c5213b40, "verify-tag: move tag verification code to tag.c", 19-04-2016). Although not actually an error,

Re: [PATCH] tag.c: remove extern keyword from function definition

On Wed, Apr 20, 2016 at 04:34:25PM +0100, Ramsay Jones wrote: > > Signed-off-by: Ramsay Jones > --- > > Hi Santiago, > > If you need to re-roll your 'st/verify-tag' branch, could you > please squash this into the relevant patch (commit c5213b40, > "verify-tag: move

Re: [PATCH v5 03/15] index-helper: new daemon for caching index and related stuff

Hi Duy, On Wed, 20 Apr 2016, Duy Nguyen wrote: > On Wed, Apr 20, 2016 at 6:27 AM, David Turner > wrote: > > Shared memory is done by storing files in a per-repository temporary > > directory. This is more portable than shm (which requires > > posix-realtime and has

Re: [PATCH v5 03/15] index-helper: new daemon for caching index and related stuff

On Wed, Apr 20, 2016 at 7:17 PM, Johannes Schindelin wrote: >> We keep this daemon's logic as thin as possible. The "brain" stays in >> git. So the daemon can read and validate stuff, but that's all it's >> allowed to do. It does not add/create new information. It

Re: [PATCH] replace --edit: respect core.editor

Johannes Schindelin writes: > Hi Junio, > > On Tue, 19 Apr 2016, Junio C Hamano wrote: > >> "git blame -L475,6 builtin/replace.c" points at b892bb45 (replace: add >> --edit option, 2014-04-26) and the commit log message names two people >> who can review this change,

Re: [PATCH v2] replace --edit: respect core.editor

Jeff King writes: > On Wed, Apr 20, 2016 at 08:38:03AM +0200, Johannes Schindelin wrote: > >> We simply need to read the config, is all. >> >> This fixes https://github.com/git-for-windows/git/issues/733 >> >> Signed-off-by: Johannes Schindelin > >

Re: [PATCH v1 2/2] git-p4: fix Git LFS pointer parsing

Sebastian Schuberth writes: > If clients rely on output targeted at human consumption it's not > surprising that these clients need to be adjusted from time to time. > What's troubling is not the change to git-lfs, but the very un-generic > way git-p4 is implemented.

Re: [PATCH v1 2/2] git-p4: fix Git LFS pointer parsing

On Wed, Apr 20, 2016 at 5:30 PM, Junio C Hamano wrote: >> If clients rely on output targeted at human consumption it's not >> surprising that these clients need to be adjusted from time to time. >> What's troubling is not the change to git-lfs, but the very un-generic >> way

[ANNOUNCE] Git Rev News edition 14

Hi everyone, I'm happy announce that the 14th edition of Git Rev News is now published: http://git.github.io/rev_news/2016/04/20/edition-14/ Thanks a lot to all the contributors and helpers, especially Johannes Sixt! Enjoy, Christian, Thomas and Nicola. -- To unsubscribe from this list: send

Re: [PATCH v2 06/12] wt-status.c: split rebase detection out of wt_status_get_state()

On 20/04/16 14:24, Nguyễn Thái Ngọc Duy wrote: > worktree.c:find_shared_symref() later needs to know if a branch is being > rebased, and only rebased only. Split this code so it can be used ^ Err ... what? ATB, Ramsay Jones -- To unsubscribe from this list: send

[PATCH v2 03/12] worktree.c: make find_shared_symref() return struct worktree *

This gives the caller more information and they can answer things like, "is it the main worktree" or "is it the current worktree". The latter question is needed for the "checkout a rebase branch" case later. Signed-off-by: Nguyễn Thái Ngọc Duy --- branch.c | 9

[PATCH v2 08/12] worktree.c: avoid referencing to worktrees[i] multiple times

Signed-off-by: Nguyễn Thái Ngọc Duy --- worktree.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/worktree.c b/worktree.c index 452f64a..b5ca78f 100644 --- a/worktree.c +++ b/worktree.c @@ -221,10 +221,12 @@ const struct worktree

Re: [PATCH v2 06/12] wt-status.c: split rebase detection out of wt_status_get_state()

On Wed, Apr 20, 2016 at 8:48 PM, Ramsay Jones wrote: > > > On 20/04/16 14:24, Nguyễn Thái Ngọc Duy wrote: >> worktree.c:find_shared_symref() later needs to know if a branch is being >> rebased, and only rebased only. Split this code so it can be used >

problems serving non-bare repos with submodules over http

Dear Git Folks, I do realize that the situation is quite uncommon, partially I guess due to git submodules mechanism flexibility and power on one hand and under-use (imho) on the other, which leads to discovery of regressions [e.g. 1] and corner cases as mine. [1]

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

"Michael S. Tsirkin" writes: > FWIW IIRC what that commit is about is ability to reorder the chunks in > a patch without changing patch-id. Not about keeping id stable across > git revisions. OK, but "reorder the chunks" is not meant to stay to be the _ONLY_ purpose for an

Git gui - Commit message lost when changing from New Commit to Amend Last Commit

Hi, When changing from New Commit to Amend Last Commit, the commit message it discarded. It could be appended to the previous commit message with a place holder or something similar. git-gui version 0.20.0.1 git version 2.8.0.rc3 Cheers, -- Marcus Nascimento -- To unsubscribe from this list:

Re: problems serving non-bare repos with submodules over http

On Wed, Apr 20, 2016 at 8:22 AM, Yaroslav Halchenko wrote: > Dear Git Folks, > > I do realize that the situation is quite uncommon, partially I guess due > to git submodules mechanism flexibility and power on one hand and > under-use (imho) on the other, which leads to

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

On Wed, Apr 20, 2016 at 09:09:53AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" writes: > > > FWIW IIRC what that commit is about is ability to reorder the chunks in > > a patch without changing patch-id. Not about keeping id stable across > > git revisions. > > OK, but

Re: [PATCH v2] git-p4: add P4 jobs to git commit message

> One thing I wondered about is whether this should be enabled by > default or not. Long-time users of git-p4 might be a bit surprised to > find their git commits suddenly gaining an extra Job: field. I thought about that too when but then I realized that there's no switch for the reverse

Re: [PATCH v5 3/4] t0027: test cases for combined attributes

>> Currently "* text=auto eol=lf" does the same as "* text eol=lf", >> as the eol attribute overrides "text=auto", this will change in >> future. > Will change in future in what way? In patch 5/4? > > Yes, kind of. I'm fighting to get the test passed under Windows, and if this 4/4 could make it

Re: [PATCH v2] git-p4: add P4 jobs to git commit message

Luke Diamand writes: > One thing I wondered about is whether this should be enabled by > default or not. Long-time users of git-p4 might be a bit surprised to > find their git commits suddenly gaining an extra Job: field. Ahh, I didn't even wonder about but that is not because

[PATCHv3 1/3] git.txt: document the new GIT_TRACE_CURL environment variable

Describe the purpose of the GIT_TRACE_CURL environment variable. Helped-by: Torsten Bögershausen Helped-by: Ramsay Jones Helped-by: Junio C Hamano Helped-by: Eric Sunshine Helped-by: Jeff King

[PATCHv3 0/3] Implements the GIT_TRACE_CURL environment variable

This is the third version but in reality is the complete rewriting of the patches discussed here (here called V1) $gmane/290520 $gmane/290521 *Changes from V2 ($gmane/291868) - fix garbage comment in http.c (i am very sorry for that) - add final '.' to the commit message for imap-send.c and

[PATCHv3 2/3] imap-send.c: introduce the GIT_TRACE_CURL enviroment variable

Permit the use of the GIT_TRACE_CURL environment variable calling the curl_trace and curl_dump http.c helper routine. Helped-by: Torsten Bögershausen Helped-by: Ramsay Jones Helped-by: Junio C Hamano Helped-by: Eric Sunshine

[PATCHv3 3/3] http.c: implements the GIT_TRACE_CURL environment variable

Implements the GIT_TRACE_CURL environment variable to allow a greater degree of detail of GIT_CURL_VERBOSE, in particular the complete transport header and all the data payload exchanged. It might be useful if a particular situation could require a more thorough debugging analysis. Helped-by:

Re: bug: git submodule add fails when .git is a symlink

On Wed, Mar 2, 2016 at 12:49 AM, Jeff King wrote: > On Tue, Mar 01, 2016 at 07:17:20PM -0400, Joey Hess wrote: > >> Junio C Hamano wrote: >> > A more pertinent question may be which version of Git did the above >> > ever work, I guess. We fairly liberally chdir around and I do not

Is there a "git reset --keep || git reset --hard " alternative?

If you check out a git repository and chmod a checked-in file there there away from git defaults then "git reset --hard" will re-chmod it. The use-case for not having this happen is if you e.g. have some inotify thing or a stat() loop monitoring changes to the files, and you'd like them to fire

Re: bug: git submodule add fails when .git is a symlink

On Wed, Apr 20, 2016 at 9:41 AM, Stefan Beller wrote: > On Wed, Mar 2, 2016 at 12:49 AM, Jeff King wrote: >> On Tue, Mar 01, 2016 at 07:17:20PM -0400, Joey Hess wrote: >> >>> Junio C Hamano wrote: >>> > A more pertinent question may be which version of Git did

Re: [PATCH v2 03/12] worktree.c: make find_shared_symref() return struct worktree *

Nguyễn Thái Ngọc Duy writes: > This gives the caller more information and they can answer things like, > "is it the main worktree" or "is it the current worktree". The latter > question is needed for the "checkout a rebase branch" case later. That makes good sense. > diff

[PATCH] git-rebase--merge: don't include absent parent as a base

From: Ben Woosley Absent this fix, attempts to rebase an orphan branch with --strategy recursive will fail with: $ git rebase ORPHAN_TARGET_BASE -s recursive First, rewinding head to replay your work on top of it... fatal: Could not parse object

Re: [PATCH v2 09/12] worktree.c: test if branch being rebased in another worktree

Nguyễn Thái Ngọc Duy writes: > Subject: Re: [PATCH v2 09/12] worktree.c: test if branch being rebased in > another worktree Lacks the verb? Perhaps s/being/is/ is sufficient. > This function find_shared_symref() is used in a couple places: > > 1) in builtin/branch.c: it's

Re: [PATCH v2 00/12] fix checking out a being-rebased branch

Nguyễn Thái Ngọc Duy writes: > Much happier with this version. This makes > > - git checkout refuse if a branch is under rebase or bisect >elsewhere > > - git worktree add refuse if a branch is under rebase or bisect > > - git branch -D refuse if a branch is under

Re: [PATCH v2 01/12] path.c: add git_common_path() and strbuf_git_common_path()

On Wed, Apr 20, 2016 at 9:24 AM, Nguyễn Thái Ngọc Duy wrote: > diff --git a/path.c b/path.c > @@ -503,6 +503,35 @@ void strbuf_git_path_submodule(struct strbuf *buf, const > char *path, > +const char *git_common_path(const char *fmt, ...) > +{ > + struct strbuf *pathname

[PATCH] Update git-p4 to be compatible with git-lfs 1.2

From: Ben Woosley The git lfs pointer output was changed in: https://github.com/github/git-lfs/pull/1105 This was causing Mac Travis runs to fail, as homebrew had updated to 1.2 while Linux was pinned at 1.1 via GIT_LFS_VERSION. The travis builds against 1.1 and 1.2 both

Tcl/Tk now has a little 'c' style language..

The CodeProject news today mentioned the release of the 'L' (little) language which integrates with Tcl/Tk and compiles to Tcl/Tk byte code. This should be of interest to those looking at the Git Gui and Gitk code, in particular the examples showing code simplification (easire to

Re: [PATCH v2 09/12] worktree.c: test if branch being rebased in another worktree

On Thu, Apr 21, 2016 at 1:04 AM, Junio C Hamano wrote: >> diff --git a/builtin/checkout.c b/builtin/checkout.c >> index efcbd8f..6041718 100644 >> --- a/builtin/checkout.c >> +++ b/builtin/checkout.c >> @@ -,7 +,7 @@ static int checkout_branch(struct checkout_opts

  1   2   >