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
buil
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 for the submitGit cover le
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 review with a cover letter (i.e. [PATCH 0/N]). I
>>> do not know i
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 to detect invalid LFS point
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 +22,8 @@ addons:
env:
global:
- DEVELOPER=1
-
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]
https://github.com/github/git-lfs/commit/da2935d9a739592bc775c98d8ef4df9c72ea3b43
Sign
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 might be acceptable.
>
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 install the
> extension?')
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 = NUL
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
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
> the kernel may of course choose to page it ou
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 < 0)
>> >
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 <
>> dtur...@twopensource.com> 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). To sum up the effort of making git scale better:
- read cache line
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.
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
> director
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 various quirks on OS X). It
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). To
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 doesn't even
>> accept direct upd
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
>> not. An unoptimized git-s
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, Jeff King wrote:
> >>>
> >>> > I guess
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(-)
diff --git a/branch.c
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.
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 f
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, 16 insertions(+), 9 d
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 func
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,
wt_status_ge
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 | 1 +
2 files cha
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 "refs.h"
#include "strbu
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 a/wt-status.c b/wt-st
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
f
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 pr
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 *find_shared_symref(const char
*symref,
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 +
builtin/branch.
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 t
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
> ^
> Err ... w
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 th
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, so that is what I am doing he
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
>
> Looks good to me. Thanks.
Yup, I think the n
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.
Sounds like the subcommand t
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, it is very unusual for an exte
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 tag verification code to tag.
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 git-p4 is implemented
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] http://thread.gmane.org/gmane.co
>> 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 i
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 I didn't
think it
"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 option whose name is a
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 discovery of regressions
> [
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: sen
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 "reorder the chun
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
Helped-by: Jeff King
Signed-off-by: Elia Pinto
---
imap-send.c | 6
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
Signed-off-by: Elia Pinto
---
Documentation/git.txt | 8
1 file changed, 8 insertions(+)
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 to
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: Tors
> 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 directio
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
>> > think we d
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 --git a/worktree.h b/
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 on
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 the above
>>> > ever work, I guess.
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 used to detect if a
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 rebase or bisect.
>T
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 = get_pathname();
>
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 'ORPHAN_ROOT_SHA^'
Unknown exit co
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 on linux. Mac can't do
Sebastian Schuberth writes:
> Why do we need to remove the preamble at all, if present? If all we
> want is the oid, we should simply only look at the line that starts
> with that keyword, which would skip any preamble. Which is what you
> already do here. However, I'd probably use .splitlines()
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 environment variable
I think 2 & 3 need to be swapped; otherwise 2 would refer to
yet
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_CURL_VERBOSE, in particular
> the complete transport header and all the data payload
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
> git_extract_argv_path
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 was pinned at 1.1 via GIT_LFS_VERSION.
>
> The
Æ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 INSTALL
A quick q
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 i
> 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
>>>
>>> This was causing Mac Travis runs to fail, as homebrew had u
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:
>
>
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 discard_index(struct
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.
> >
> > Since the memory w
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 m
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 environment variable
>
> I think 2
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 seems to proceed norm
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;
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_CURL_VERBOSE, in particular
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:
https://github.com/larsxschneider/git/blob/5ee7601c49b6eaa9da5eb47db5cf12
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 (and remove the declaration from
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 s
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 e6ac6e1 Fifth batch for post 2.8 cycle
>>
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 changes the
> committer d
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 should
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. Som
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 w
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 vers
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' would be http://localhost:8080/.git/sub
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
prefix
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 of it...
> fatal: Could not parse object 'O
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 to earlier topi
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 u
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 br
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 exact point.
> If I was n
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 changes the committer
On Wed, Apr 20, 2016 at 02:17:16PM -0700, Junio C Hamano wrote:
> 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
tbo...@web.de writes:
> if (ca.drv && (ca.drv->smudge || ca.drv->clean))
> - return filter;
> + return NULL;
>
> if (ca.ident)
> filter = ident_filter(sha1);
We allocated an ident-filter here...
> - crlf_action = ca.crlf_action;
> -
> -
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
read/underst
1 - 100 of 107 matches
Mail list logo
