On Wed, Nov 04, 2015 at 02:08:21PM -0600, Doug Kelly wrote:
> On Wed, Nov 4, 2015 at 2:02 PM, Jeff King wrote:
> > Definitely cleaning up the .bitmap is sane and not racy (it's in the
> > same boat as the .idx, I think).
> >
> > .keep files are more tricky. I'd have to go over the receive-pack co
On Tue, Dec 29, 2015 at 11:04:20AM -0800, Junio C Hamano wrote:
> [...]
> In the above, I suggested to "git reset" when there is no conflict.
> I think this line of thinking can be followed even further to
> selectively reset the paths that were cleanly merged (which is added
> by the call to merg
On Tue, Dec 29, 2015 at 09:20:38PM +, Alan Mackenzie wrote:
> > Yeah, I think I agree. But keep in mind that we have to mention the
> > conflicts _somewhere_, so we're going to touch the index regardless (and
> > the user is going to have to erase the conflicts in the index
> > eventually, eit
On Tue, Dec 29, 2015 at 01:24:42PM -0800, Junio C Hamano wrote:
> > The patches are:
> >
> > [1/3]: create_symref: modernize variable names
> > [2/3]: create_symref: use existing ref-lock code
> > [3/3]: create_symref: write reflog while holding lock
>
> This is queued as an early part of '
On Wed, Dec 30, 2015 at 01:53:43AM -0500, Jeff King wrote:
> On Tue, Dec 29, 2015 at 10:32:04AM -0800, Junio C Hamano wrote:
>
> > Jeff King writes:
> >
> > > A conservative choice would probably be to issue a deprecation warning
> > > when we see it defined, wait a few versions, and then apply
On Tue, Dec 29, 2015 at 10:32:04AM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > A conservative choice would probably be to issue a deprecation warning
> > when we see it defined, wait a few versions, and then apply the patch
> > below.
>
> I agree with the analysis below. And I agree
On Tue, Dec 29, 2015 at 04:09:21PM -0800, Junio C Hamano wrote:
> > diff --git a/diff.h b/diff.h
> > index f7208ad..893f446 100644
> > --- a/diff.h
> > +++ b/diff.h
> > @@ -91,7 +91,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct
> > diff_options *opt, void *data)
> > #define DIFF_OPT_DIR
Jeff King writes:
> diff --git a/diff.h b/diff.h
> index f7208ad..893f446 100644
> --- a/diff.h
> +++ b/diff.h
> @@ -91,7 +91,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct
> diff_options *opt, void *data)
> #define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
> #define DIFF_OPT_FUNCCONTEXT
Signed-off-by: Stephen P. Smith
---
Documentation/user-manual.txt | 23 ---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 1c790ac..ce347ff 100644
--- a/Documentation/user-manual.txt
+++ b/Docu
Junio C Hamano writes:
> Thanks for working on this. Perhaps the last paragraph can be like
> this?
>
> Merging inside a <> will work
> as long as a merge base is found in the resent history.
> Otherwise, it will be like merging unrelated histories and may
> have to result in hug
Signed-off-by: Stephen P. Smith
---
Documentation/user-manual.txt | 23 ---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 1c790ac..15e97d3 100644
--- a/Documentation/user-manual.txt
+++ b/Docu
Stephen & Linda Smith writes:
> On Tuesday, December 29, 2015 11:24:00 AM Junio C Hamano wrote:
>> "Stephen P. Smith" writes:
>>
>> > Rather than merely pointing readers at the 1.5 release notes to
>> > learn about shallow clones, document them formally.
>> >
>> > Signed-off-by: Stephen P. Smit
From: Jacob Keller
Create a new expansion function, expand_loose_notes_ref which will first
check whether the ref can be found using get_sha1. If it can't be found
then it will fallback to using expand_notes_ref. The content of the
strbuf will not be changed if the notes ref can be located using
Christian Couder writes:
> +core.untrackedCache::
> + Determines if untracked cache will be automatically enabled or
> + disabled. It can be `keep`, `true` or `false`. Before setting
> + it to `true`, you should check that mtime is working properly
> + on your system.
> + See
Christian Couder writes:
> -static int ident_in_untracked(const struct untracked_cache *uc)
> +static int ident_current_location_in_untracked(const struct untracked_cache
> *uc)
> {
> - const char *end = uc->ident.buf + uc->ident.len;
> - const char *p = uc->ident.buf;
> + struct
Christian Couder writes:
> It is nice to just be able to test if untracked cache is
> supported without enabling it.
>
> Signed-off-by: Christian Couder
> ---
> Documentation/git-update-index.txt | 12 +++-
> builtin/update-index.c | 5 +
> 2 files changed, 16 insertion
Christian Couder writes:
> Signed-off-by: Christian Couder
> ---
> builtin/update-index.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/builtin/update-index.c b/builtin/update-index.c
> index 7431938..a6fff87 100644
> --- a/builtin/update-index.c
> +++ b/builtin/update-index.c
> @@ -
On Tuesday, December 29, 2015 11:24:00 AM Junio C Hamano wrote:
> "Stephen P. Smith" writes:
>
> > Rather than merely pointing readers at the 1.5 release notes to
> > learn about shallow clones, document them formally.
> >
> > Signed-off-by: Stephen P. Smith
> > ---
>
> Thanks. I do not think
Jeff King writes:
> The outer git wrapper doesn't start the pager, so its stderr still gets
> seen by the user. But the _inner_ git-log does start the pager, and then
> dies of SIGPIPE.
>
> So yeah, I think we want something like this on top of
> nd/clear-gitenv-upon-use-of-alias.
That makes sen
Jeff King writes:
> On Sun, Dec 20, 2015 at 02:26:37AM -0500, Jeff King wrote:
>
>> I noticed that an interrupt "git symbolic-ref" will not clean up
>> "HEAD.lock". So I started this series as an attempt to convert
>> create_symref() to "struct lock_file" to get the usual tempfile cleanup.
>
> He
Hello, Jeff.
On Tue, Dec 29, 2015 at 02:53:30AM -0500, Jeff King wrote:
> On Thu, Dec 24, 2015 at 09:20:38AM +, Alan Mackenzie wrote:
> > > It seems to be a side effect of merge-recursive to stage the results,
> > > and in the no-conflict path we explicitly reset the index. For the
> > > conf
Le 26.12.2015 11:26, Luke Diamand a écrit :
On 21 December 2015 at 13:09, Romain Picard
wrote:
After changing the type of a file in the git repository, it is not
possible to
"git p4 publish" the commit to perforce. This is due to the fact that
the git
"T" status is not handled in git-p4.py. Th
"Stephen P. Smith" writes:
> Rather than merely pointing readers at the 1.5 release notes to
> learn about shallow clones, document them formally.
>
> Signed-off-by: Stephen P. Smith
> ---
Thanks. I do not think the reference to RelNotes were meant for the
end-user readers, though. That was a
Nguyễn Thái Ngọc Duy writes:
> This series brings three new options to shallow clone/fetch. --since
> lets you specify cut point by time. --not cuts by excluding specified
> refs. And --deepen= extends shallow boundary in a more predictable
> way. Some of these were requested in the past.
Hmm,
Jeff King writes:
> Yeah, I think I agree. But keep in mind that we have to mention the
> conflicts _somewhere_, so we're going to touch the index regardless (and
> the user is going to have to erase the conflicts in the index
> eventually, either with `git add` or `git reset`).
I do not think t
Rather than merely pointing readers at the 1.5 release notes to
learn about shallow clones, document them formally.
Signed-off-by: Stephen P. Smith
---
Notes:
Added a paragraph about the fundamental limitation with merging
histories that do not have a merge base in the shallow repository
There are several places in the documentation that
the term shallow clone is used. Defining the term
enables its use elsewhere with a known definition.
Signed-off-by: Stephen P. Smith
---
Notes:
The review comments for the user guide update[1] suggested a change
in the definition of a sh
Michael Haggerty writes:
> On 12/29/2015 06:55 AM, Jeff King wrote:
>
>> The patches are:
>>
>> [1/3]: create_symref: modernize variable names
>> [2/3]: create_symref: use existing ref-lock code
>> [3/3]: create_symref: write reflog while holding lock
>
> Thanks, Peff. The whole series is
Jeff King writes:
> A conservative choice would probably be to issue a deprecation warning
> when we see it defined, wait a few versions, and then apply the patch
> below.
I agree with the analysis below. And I agree that in the ideal
world, it would have been better not to add "prefer symlink
Junio C Hamano writes:
> OK, will try to queue again (but I am cutting an -rc today so it may
> have to wait a bit). Those who have been involved in the notes topics
> need to review it before the patch can make progress, though.
Just FYI, with this the tip of 'pu' seems to fail a few tests in
Mostyn Bramley-Moore writes:
>> I do not think it is wrong per-se to add an option to use regular
>> expressions instead of globs, but if we are to do so, the endgame we
>> aim for MUST be that we do so consistently to all the other commands
>> that iterate over refs and limit their output to the
Translate 68 new messages came from git.pot update in
f4f2c8f (l10n: git.pot: v2.7.0 round 1 (66 new, 29 removed)) and
2c0ca05 (l10n: git.pot: v2.7.0 round 2 (2 new, 2 removed)).
Signed-off-by: Ralf Thielow
Acked-by: Matthias Rüster
---
po/de.po | 190 ---
2015-12-28 20:32 GMT+01:00 Matthias Rüster :
> Hi Ralf,
>
>> #: builtin/submodule--helper.c:273
>> msgid "fatal: submodule--helper subcommand must be called with a
>> subcommand"
>> -msgstr ""
>> +msgstr "fatal: submodule-helper muss mit einem Unterkommando aufgerufen
>> werden"
>>
>> #: buil
Duy Nguyen writes:
> Not enough energy to go through this. Will do later and post new
> proposed commit message.
I do not have as much issue with the log message as what the patch
does, actually; this change does not look like a good one, which is
a more serious problem.
--
To unsubscribe from
On 09/28/2015 06:12 PM, Johannes Schindelin wrote:
> Git has a config variable to indicate that it is operating on a file
> system that is case-insensitive: core.ignoreCase. But the
> `dir_inside_of()` function did not respect that. As a result, if Git's
> idea of the current working directory disa
On Tue, Dec 29, 2015 at 7:10 PM, Nguyễn Thái Ngọc Duy wrote:
> This could be convenient when tests are independent from the rest in the
> same file. Normally we would do this
> ...
Before anybody comments about this patch. I missed Junio and Jeff's
comments when the patch was posted separately a
On Mon, Dec 28, 2015 at 10:01 AM, Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
>
>> Suppose that you came up with some contents to register at path F in
>> your working tree, told Git about your intention with "add -N F", and
>> then tried to apply a patch that wants to _create_ F:
>>
>>
On Mon, Dec 28, 2015 at 1:22 PM, Eric Sunshine wrote:
> On Sun, Dec 27, 2015 at 10:43:16AM +0700, Nguyễn Thái Ngọc Duy wrote:
>> The current update_linked_gitdir() has a bug that can create "gitdir"
>> file in non-multi-worktree setup. Instead of fixing this, we step back a
>> bit. The original de
This should allow the user to say "create a shallow clone of this branch
after version ".
deepen-not cannot be used with deepen the same way deepen-since cannot
be used with deepen. But deepen-not can be mixed with deepen-since. The
result is exactly how you do the command "git rev-list --since=..
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/fetch-options.txt | 4
builtin/fetch.c | 12 ++--
fetch-pack.c| 12 +++-
fetch-pack.h| 1 +
transport.c | 4
transport.h
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/fetch-options.txt | 5 +
builtin/fetch.c | 17 -
fetch-pack.c| 15 ++-
fetch-pack.h| 1 +
transport.c | 4
transport.h
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/git-clone.txt | 5 +
builtin/clone.c | 18 +-
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 28993c6..3589e57 100644
--- a/Documen
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t/t5500-fetch-pack.sh | 18 ++
1 file changed, 18 insertions(+)
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 338b46e..2259631 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -655,4 +655,22 @@ test_expec
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/git-clone.txt | 3 +++
builtin/clone.c | 16 +---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 6bf000d..28993c6 100644
--- a/Documentat
In git-fetch, --depth argument is always relative with the latest
remote refs. This makes it a bit difficult to cover this use case,
where the user wants to make the shallow history, say 3 levels
deeper. It would work if remote refs have not moved yet, but nobody
can guarantee that, especially when
Signed-off-by: Nguyễn Thái Ngọc Duy
---
t/t5500-fetch-pack.sh | 18 ++
1 file changed, 18 insertions(+)
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 3a9b775..338b46e 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -637,4 +637,22 @@ test_expec
This could be convenient when tests are independent from the rest in the
same file. Normally we would do this
test_expect_success '...' '
git init foo &&
(
cd foo &&
This reduces the number of "if (verbose)" which makes it a bit easier
to read imo. It also makes it easier to redirect all these printouts,
to a file for example.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
fetch-pack.c | 88 +---
1 file change
The shallow repo could be deepened or shortened when then user gives
--depth. But in future that won't be the only way to deepen/shorten a
repo. Stop relying on args->depth in this mode. Future deepening
methods can simply set this flag on instead of updating all these if
expressions.
The new name
Signed-off-by: Nguyễn Thái Ngọc Duy
---
upload-pack.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index e9594d1..573ffa2 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -648,9 +648,9 @@ static void receive_needs(void)
This should allow the user to say "create a shallow clone containing the
work from last year" (once the client side is fixed up, of course).
In theory deepen-since and deepen (aka --depth) can be used together to
draw the shallow boundary (whether it's intersection or union is up to
discussion, bu
The remaining thing to do is protocol extensions and translate the
requests to rev-list options.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
upload-pack.c | 12
1 file changed, 12 insertions(+)
diff --git a/upload-pack.c b/upload-pack.c
index 4bb104c..9ae09a0 100644
--- a/upload-pack.c
Signed-off-by: Nguyễn Thái Ngọc Duy
---
upload-pack.c | 33 -
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index 4774f78..4bb104c 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -552,21 +552,10 @@ static void send_
Signed-off-by: Nguyễn Thái Ngọc Duy
---
upload-pack.c | 25 +++--
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index 97ed620..0eb9a0b 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -538,6 +538,20 @@ error:
}
}
+sta
Signed-off-by: Nguyễn Thái Ngọc Duy
---
upload-pack.c | 26 +++---
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index 9ae09a0..e9594d1 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -276,7 +276,7 @@ static void create_pack_fi
Instead of a custom commit walker like get_shallow_commits(), this new
function uses rev-list to mark NOT_SHALLOW to all reachable commits,
except borders. The definition of reachable is to be defined by the
protocol later. This makes it more flexible to define shallow boundary.
Note: if a commit
After the last patch, "result" and "backup" are the same. "result" used
to move, but the movement is now contained in send_shallow(). Delete
this redundant variable.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
upload-pack.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/up
This is a prep step for further refactoring. Besides reindentation and
s/shallows\./shallows->/g, no other changes are expected.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
upload-pack.c | 99 +++
1 file changed, 52 insertions(+), 47 deletions(
This series brings three new options to shallow clone/fetch. --since
lets you specify cut point by time. --not cuts by excluding specified
refs. And --deepen= extends shallow boundary in a more predictable
way. Some of these were requested in the past.
An important point of this series is it start
On 12/29/2015 06:55 AM, Jeff King wrote:
> On Sun, Dec 20, 2015 at 02:26:37AM -0500, Jeff King wrote:
>
>> I noticed that an interrupt "git symbolic-ref" will not clean up
>> "HEAD.lock". So I started this series as an attempt to convert
>> create_symref() to "struct lock_file" to get the usual te
On Thu, Dec 24, 2015 at 04:35:33PM +0700, Duy Nguyen wrote:
> On Thu, Dec 24, 2015 at 4:31 AM, Jeff King wrote:
> > 2. I doubt anybody is actually seeing this in practice anymore. But
> > maybe I am misunderstanding something in Duy's series that changes
> > this.
>
> There are two p
61 matches
Mail list logo
