On 09/20/2017 11:32 PM, Jeff King wrote:
> Johannes, this is an adaptation of your 67e5ce7f63 (status: offer *not*
> to lock the index and update it, 2016-08-12). Folks working on GitHub
> Desktop complained to me that it's only available on Windows. :)
>
> I expanded the scope a bit to let us give
On Thu, Sep 21, 2017 at 05:48:38PM +0100, Ramsay Jones wrote:
> diff --git a/cache.h b/cache.h
> index a916bc79e..a0e3e362c 100644
> --- a/cache.h
> +++ b/cache.h
> @@ -1243,8 +1243,8 @@ static inline unsigned int hexval(unsigned char c)
> */
> static inline int hex2chr(const char *s)
> {
> -
On Thu, Sep 21, 2017 at 05:47:36PM +0100, Ramsay Jones wrote:
> diff --git a/commit-slab.h b/commit-slab.h
> index 333d81e37..dcaab8ca0 100644
> --- a/commit-slab.h
> +++ b/commit-slab.h
> @@ -78,7 +78,7 @@ static MAYBE_UNUSED void init_ ##slabname(struct slabname
> *s) \
>
When creating a new branch B by copying the branch A that happens to
be the current branch, it also updates HEAD to point at the new
branch. It probably was made this way because "git branch -c A B"
piggybacked its implementation on "git branch -m A B",
This does not match the usual expectation.
On 09/21/2017 11:38 PM, Junio C Hamano wrote:
> Daniel Santos writes:
>
>> So first I need to inquire if there is a current mechanism to say "git
>> status, but please fail if you're busy with a non-atomic operation".
> Reading this list sometimes makes me wonder if there is some higher
> intellig
Ian Campbell writes:
> This is the third version of my patches to add incremental support to
> git-filter-branch. Since the last time I have replaced `git mktag --
> allow-missing-tagger` with `git hash-object -t tag -w --stdin`.
>
> I've force pushed to [1] (Travis is still running) and have set
Daniel Santos writes:
> So first I need to inquire if there is a current mechanism to say "git
> status, but please fail if you're busy with a non-atomic operation".
Reading this list sometimes makes me wonder if there is some higher
intelligence telling independent souls to come up with the sam
On Thu, Sep 21, 2017 at 08:25:50PM +0200, Johannes Sixt wrote:
> > +`GIT_OPTIONAL_LOCKS`::
> > + If set to `0`, Git will avoid performing any operations which
> > + require taking a lock and which are not required to complete the
> > + requested operation. For example, this will prevent `git
Michael Haggerty writes:
> I wouldn't worry too much about this anomaly. `REF_ISPRUNING` is an ugly
> internal kludge, but allowing it in the mask doesn't make anything worse.
>
>> refs.c | 2 ++
>> refs.h | 8
>> 2 files changed, 10 insertions(+)
>>
>> diff --git a/refs.c b/refs.c
>>
On Thu, Sep 21, 2017 at 11:03:53PM -0500, Daniel Santos wrote:
> So first I need to inquire if there is a current mechanism to say "git
> status, but please fail if you're busy with a non-atomic operation". If
> there is not one, then it would seem that there should be and how do I
> go about req
Ramsay Jones writes:
> Signed-off-by: Ramsay Jones
> ---
> builtin/pack-objects.c | 4 ++--
> config.c | 2 +-
> diff.c | 2 +-
> line-log.c | 18 +-
> line-log.h | 2 +-
> revision.c | 2 +-
> tree-walk.c
https://bugs.kde.org/show_bug.cgi?id=379219
$ git push minor-rant-warning
KDevelop has a despicable habit of performing `git status --porcelain`
whenever it damn well pleases ... or rather when it sees an alteration.
This this breaks git rebase because it grabs the $*()&@#$ lock file,
often lead
Jeff King writes:
> However, each case arm of the switch falls through to the
> one below it. This is pointless (we know that a command
> starting with 'b' does not need to check any of the commands
> in the 'c' block), and it makes gcc's -Wimplicit-fallthrough
> complain.
Wow, this is an embara
Junio C Hamano writes:
> My understanding of the next step was for those who are interested
> in moving this topic forward to update these patches in that
> direction.
Well, I am one of those who are interested in moving this topic
forward, not because I'm likely to use it, but because the fewer
Lars Schneider writes:
> Oh, you're right!
>
>
>> Could you squash in the following?
>
> @Junio: Can you squash it when you apply the patch?
I do not mind and I already did.
The patches in the series this patch is fixing up were solely about
splitting these scripts out of the YAML file as-is, a
Stefan Beller writes:
> The commit-msg hook is invoked by both commit and merge now.
>
> Reported-by: Kaartic Sivaraam
> Signed-off-by: Stefan Beller
> ---
Thanks for tying the loose end. Very much appreciated.
> Documentation/githooks.txt | 9 -
> 1 file changed, 4 insertions(+), 5
Michael J Gruber writes:
> Also, I'm undecided about about your reflog argument above - if we leave
> "--fork-point" to be the current behaviour including Jeff's fix then the
> documentation would need an even bigger overhaul, because it's neither
> "reflog also" (as claimed in the doc) nor "refl
Junio C Hamano writes:
> Jonathan Tan writes:
>
>> Currently, get_remote_heads() parses the ref advertisement in one loop,
>> allowing refs and shallow lines to intersperse, despite this not being
>> allowed by the specification. Refactor get_remote_heads() to use two
>> loops instead, enforcing
Jonathan Tan writes:
> Currently, get_remote_heads() parses the ref advertisement in one loop,
> allowing refs and shallow lines to intersperse, despite this not being
> allowed by the specification. Refactor get_remote_heads() to use two
> loops instead, enforcing that refs come first, and then
Torsten Bögershausen writes:
> Junio, if you wouldn't mind to squash that in,
> another fix is needed as well(trailing '-' after '-E') :
>
> s/'-n', '-e' or '-E-'/'-n', '-e' or '-E'
Yup. Thanks all.
Ben Peart writes:
> Since the fsmonitor data can be trusted and is kept in sync with the
> working directory, the only remaining valid uses are those locations
> where we don't want to trigger an unneeded refresh_fsmonitor() call.
Now that is a lot more assuring ;-) And the exceptions below als
Sahil Dua writes:
>>
>> * sd/branch-copy (2017-06-18) 3 commits
>> - branch: add a --copy (-c) option to go with --move (-m)
>> - branch: add test for -m renaming multiple config sections
>> - config: create a function to format section headers
>>
>> "git branch" learned "-c/-C" to create and
Jeff King wrote:
> Commit dc944b65f1 (get_sha1_with_context: dynamically
> allocate oc->path, 2017-05-19) changed the rules that
> callers must follow for seeing if we parsed a path in the
> object name. The rules switched from "check if the oc.path
> buffer is empty" to "check if the oc.path poin
Currently, get_remote_heads() parses the ref advertisement in one loop,
allowing refs and shallow lines to intersperse, despite this not being
allowed by the specification. Refactor get_remote_heads() to use two
loops instead, enforcing that refs come first, and then shallows.
This also makes it e
On 09/21, Jonathan Tan wrote:
> Currently, get_remote_heads() parses the ref advertisement in one loop,
> allowing refs and shallow lines to intersperse, despite this not being
> allowed by the specification. Refactor get_remote_heads() to use two
> loops instead, enforcing that refs come first, an
Currently, get_remote_heads() parses the ref advertisement in one loop,
allowing refs and shallow lines to intersperse, despite this not being
allowed by the specification. Refactor get_remote_heads() to use two
loops instead, enforcing that refs come first, and then shallows.
This also makes it e
On Thu, 21 Sep 2017 14:00:40 -0400
Jeff Hostetler wrote:
> (part 3)
>
> Additional overall comments on:
> https://github.com/jonathantanmy/git/commits/partialclone2
>
> {} WRT the code in is_promised() [1]
>
> [1]
> https://github.com/jonathantanmy/git/commit/7a9c2d9b6e2fce293817b595dee29a7eed
On Thu, 21 Sep 2017 13:59:43 -0400
Jeff Hostetler wrote:
> (part 2)
>
> Additional overall comments on:
> https://github.com/jonathantanmy/git/commits/partialclone2
>
> {} I think it would help to split the blob-max-bytes filtering and the
> promisor/promised concepts and discuss them indep
On Thu, 21 Sep 2017 13:57:30 -0400
Jeff Hostetler wrote:
> There's a lot in this patch series. I'm still studying it, but here
> are some notes and questions. I'll start with direct responses to
> the RFC here and follow up in a second email with specific questions
> and comments to keep this f
> On 21 Sep 2017, at 23:28, Jonathan Nieder wrote:
>
> larsxschnei...@gmail.com wrote:
>
>> 09f5e97 ("travis-ci: skip a branch build if equal tag is present",
>> 2017-09-17) introduced the "skip_branch_tip_with_tag" function with
>> a broken string comparison. Fix it!
>>
>> Reported-by: SZEDER
On 09/20, Jonathan Tan wrote:
> On Wed, 20 Sep 2017 17:24:43 -0700
> Jonathan Tan wrote:
>
> > On Wed, 13 Sep 2017 14:54:43 -0700
> > Brandon Williams wrote:
> >
> > > A normal request to git-daemon is structured as
> > > "command path/to/repo\0host=..\0" and due to a bug in an old version of
>
larsxschnei...@gmail.com wrote:
> 09f5e97 ("travis-ci: skip a branch build if equal tag is present",
> 2017-09-17) introduced the "skip_branch_tip_with_tag" function with
> a broken string comparison. Fix it!
>
> Reported-by: SZEDER Gábor
> Signed-off-by: Lars Schneider
> ---
Thanks for the fix
>
> * sd/branch-copy (2017-06-18) 3 commits
> - branch: add a --copy (-c) option to go with --move (-m)
> - branch: add test for -m renaming multiple config sections
> - config: create a function to format section headers
>
> "git branch" learned "-c/-C" to create and switch to a new branch
>
From: Lars Schneider
09f5e97 ("travis-ci: skip a branch build if equal tag is present",
2017-09-17) introduced the "skip_branch_tip_with_tag" function with
a broken string comparison. Fix it!
Reported-by: SZEDER Gábor
Signed-off-by: Lars Schneider
---
Hi,
previous discussion:
https://public-
Currently, get_remote_heads() parses the ref advertisement in one loop,
allowing refs and shallow lines to intersperse, despite this not being
allowed by the specification. Refactor get_remote_heads() to use two
loops instead, enforcing that refs come first, and then shallows.
This also makes it e
The commit-msg hook is invoked by both commit and merge now.
Reported-by: Kaartic Sivaraam
Signed-off-by: Stefan Beller
---
Documentation/githooks.txt | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 623ed
On 21/09/17 19:49, Torsten Bögershausen wrote:
> On 2017-09-21 18:46, Ramsay Jones wrote:
>>
>> Signed-off-by: Ramsay Jones
>> ---
>> git-compat-util.h | 6 --
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/git-compat-util.h b/git-compat-util.h
>> index 9bc15b036..ced
On Thu, Sep 21, 2017 at 11:49 AM, Torsten Bögershausen wrote:
> On 2017-09-21 18:46, Ramsay Jones wrote:
>>
>> Signed-off-by: Ramsay Jones
>> ---
>> git-compat-util.h | 6 --
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/git-compat-util.h b/git-compat-util.h
>> index
On 2017-09-21 18:46, Ramsay Jones wrote:
>
> Signed-off-by: Ramsay Jones
> ---
> git-compat-util.h | 6 --
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/git-compat-util.h b/git-compat-util.h
> index 9bc15b036..cedad4d58 100644
> --- a/git-compat-util.h
> +++ b/git-compa
Am 21.09.2017 um 06:32 schrieb Jeff King:
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 6e3a6767e5..8dd3ae05ae 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -159,6 +159,10 @@ foo.bar= ...`) sets `foo.bar` to the empty string which `
git config
Add "
(part 3)
Additional overall comments on:
https://github.com/jonathantanmy/git/commits/partialclone2
{} WRT the code in is_promised() [1]
[1]
https://github.com/jonathantanmy/git/commit/7a9c2d9b6e2fce293817b595dee29a7eede0#diff-5d5d5dc185ef37dc30bb7d9a7ae0c4e8R1960
{} it looked like it
(part 2)
Additional overall comments on:
https://github.com/jonathantanmy/git/commits/partialclone2
{} I think it would help to split the blob-max-bytes filtering and the
promisor/promised concepts and discuss them independently.
{} Then we can talk about about the promisor/promised funct
When using the --verbose flag on git-commit with a commit-msg hook the
contents of the diff are passed to the commit-msg hook. I would have
expected the diff to have been removed since it's below the scissor
line. Since the scissor line is removed and not visible to commit-msg
there doesn't seem
There's a lot in this patch series. I'm still studying it, but here
are some notes and questions. I'll start with direct responses to
the RFC here and follow up in a second email with specific questions
and comments to keep this from being too long).
On 9/15/2017 4:43 PM, Jonathan Tan wrote:
On 09/21, Han-Wen Nienhuys wrote:
> Signed-off-by: Han-Wen Nienhuys
> ---
> string-list.h | 6 ++
> 1 file changed, 6 insertions(+)
>
> diff --git a/string-list.h b/string-list.h
> index 29bfb7ae4..08b534166 100644
> --- a/string-list.h
> +++ b/string-list.h
> @@ -8,6 +8,12 @@ struct string_
On Wed, Sep 20, 2017 at 9:59 PM, Jeff King wrote:
>> But this compare function is not to order by the natural encoding order,
>> but it's used to detect the '0' at the end of prefix, which orders
>> before *any* unsigned char.
>
> It's not just detecting the "0". We care about the ordering overal
Signed-off-by: Ramsay Jones
---
builtin/pack-objects.c | 4 ++--
config.c | 2 +-
diff.c | 2 +-
line-log.c | 18 +-
line-log.h | 2 +-
revision.c | 2 +-
tree-walk.c| 3 +--
7 files changed, 16 i
Signed-off-by: Ramsay Jones
---
cache.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cache.h b/cache.h
index a916bc79e..a0e3e362c 100644
--- a/cache.h
+++ b/cache.h
@@ -1243,8 +1243,8 @@ static inline unsigned int hexval(unsigned char c)
*/
static inline int hex2chr
Signed-off-by: Ramsay Jones
---
commit-slab.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/commit-slab.h b/commit-slab.h
index 333d81e37..dcaab8ca0 100644
--- a/commit-slab.h
+++ b/commit-slab.h
@@ -78,7 +78,7 @@ static MAYBE_UNUSED void init_ ##slabname(struct slabn
Signed-off-by: Ramsay Jones
---
git-compat-util.h | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/git-compat-util.h b/git-compat-util.h
index 9bc15b036..cedad4d58 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -898,9 +898,11 @@ static inline char *xstrdup_or_
This series removes 687 '-Wsign-compare' warnings when applied to the
current master branch (@ commit 59c0ea183). Using gcc v5.4.0 and adding
'-Wextra' to the compilation flags, we can summarize the warnings as
follows:
$ grep warning out1 | sed -e 's/.*\[/\[/' | sort | uniq -c | sort -rn
On Thu, Sep 21, 2017 at 02:43:38PM +0200, Han-Wen Nienhuys wrote:
> Signed-off-by: Han-Wen Nienhuys
> ---
> string-list.h | 6 ++
> 1 file changed, 6 insertions(+)
>
> diff --git a/string-list.h b/string-list.h
> index 29bfb7ae4..08b534166 100644
> --- a/string-list.h
> +++ b/string-list.h
+ const char *const git_submodule_helper_usage[] = {
+ N_("git submodule status [--quiet] [--cached] [--recursive]
[]"),
+ NULL
the manpage over here says
git submodule [--quiet] status [--cached] [--recursive] [--] [...]
ie. multiple path arguments. Should t
On Sep 21 2017, Junio C Hamano wrote:
> Now you make me curious. How would that variant be different from
> option C. in Jonathan's message?
Only in the parity of the condition.
Andreas.
--
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8
LGTM with nits
commit message:
"revision name, and later handles its formating and printing."
typo: formatting
+ if (!capture_command(&cp, &sb, 0) && sb.len) {
+ strbuf_strip_suffix(&sb, "\n");
+ return strbuf_detach(&sb, NULL);
+
LGTM with nits.
+static char *get_submodule_displaypath(const char *path, const char *prefix)
this could do with a comment
/* the result should be freed by the caller. */
+ } else if (super_prefix) {
+ int len = strlen(super_prefix);
+ const char *format = is
On 9/20/2017 10:24 PM, Ben Peart wrote:
On 9/20/2017 10:00 PM, Junio C Hamano wrote:
Ben Peart writes:
Pretty much the same places you would also use CE_MATCH_IGNORE_VALID
and CE_MATCH_IGNORE_SKIP_WORKTREE which serve the same role for those
features. That is generally when you are about
Signed-off-by: Han-Wen Nienhuys
---
submodule.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/submodule.h b/submodule.h
index 6b52133c8..f0da0277a 100644
--- a/submodule.h
+++ b/submodule.h
@@ -120,7 +120,7 @@ extern int submodule_move_head(const char *path,
/*
* Prepar
Signed-off-by: Han-Wen Nienhuys
---
string-list.h | 6 ++
1 file changed, 6 insertions(+)
diff --git a/string-list.h b/string-list.h
index 29bfb7ae4..08b534166 100644
--- a/string-list.h
+++ b/string-list.h
@@ -8,6 +8,12 @@ struct string_list_item {
typedef int (*compare_strings_fn)(const
Han-Wen Nienhuys (2):
Fix typo in submodule.h
Document the string_list structure
string-list.h | 6 ++
submodule.h | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
--
2.14.1.821.g8fa685d3b7-goog
Junio C Hamano venit, vidit, dixit 21.09.2017 08:27:
> Junio C Hamano writes:
>
>> ... I agree that there is a value in what your patch 2/3
>> wants to do when the current one that is more strict would say
>> "there is no known fork-point"---we would gain a way to say "... but
>> this is the bes
Thank you, Jonathan!
On Thu, Sep 21, 2017 at 1:55 AM, Jonathan Tan wrote:
> When run with the "-C" option, fast-export writes 'C' commands in its
> output whenever the internal diff mechanism detects a file copy,
> indicating that fast-import should copy the given existing file to the
> given new
On 09/13/2017 12:59 AM, Thomas Gummerer wrote:
> Callers are only allowed to pass certain flags into
> ref_transaction_update, other flags are internal to it. To prevent
> mistakes from the callers, strip the internal only flags out before
> continuing.
>
> This was noticed because of a compiler
On 09/20/2017 08:50 PM, Jeff King wrote:
> On Tue, Sep 19, 2017 at 08:22:22AM +0200, Michael Haggerty wrote:
>> If `packed-refs` was already sorted, then (if the system allows it) we
>> can use the mmapped file contents directly. But if the system doesn't
>> allow a file that is currently mmapped t
On 09/20/2017 08:40 PM, Jeff King wrote:
> [...]
> The overall strategy for this compile-time knob makes sense, but one
> thing confused me:
>
>> +ifdef MMAP_PREVENTS_DELETE
>> +BASIC_CFLAGS += -DMMAP_PREVENTS_DELETE
>> +else
>> +ifdef USE_WIN32_MMAP
>> +BASIC_CFLAGS += -DMMAP_
This is pure code motion to enable a subsequent patch to add code which needs
to happen with the reset $GIT_* but before the temporary directory has been
cleaned up.
Signed-off-by: Ian Campbell
---
git-filter-branch.sh | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
With "--state-branch=" option, the mapping from old object names
and filtered ones in ./map/ directory is stashed away in the object database,
and the one from the previous run is read to populate the ./map/ directory,
allowing for incremental updates of large trees.
Signed-off-by: Ian Campbell
-
This allows us to recreate even historical tags which would now be consider
invalid, such as v2.6.12-rc2..v2.6.13-rc3 in the Linux kernel source tree which
lack the `tagger` header.
$ git rev-parse v2.6.12-rc2
9e734775f7c22d2f89943ad6c745571f1930105f
$ git cat-file tag v2.6.12-rc2 | gi
These are modified by set_ident() but a subsequent patch would like to operate
on their original values.
Signed-off-by: Ian Campbell
---
git-filter-branch.sh | 33 +
1 file changed, 33 insertions(+)
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 3
This is the third version of my patches to add incremental support to
git-filter-branch. Since the last time I have replaced `git mktag --
allow-missing-tagger` with `git hash-object -t tag -w --stdin`.
I've force pushed to [1] (Travis is still running) and have set off the
process of re-rewriting
On 09/20/2017 10:25 PM, Stefan Beller wrote:
> On Mon, Sep 18, 2017 at 11:22 PM, Michael Haggerty
> wrote:
>> [...]
>> +/* Return -1, 0, 1 if refname is before, inside, or after the prefix. */
>> +static int compare_prefix(const char *refname, const char *prefix)
>> +{
>> + while (*prefix)
On 09/20/2017 08:27 PM, Jeff King wrote:
> On Tue, Sep 19, 2017 at 08:22:16AM +0200, Michael Haggerty wrote:
>
>> Instead of copying data from the `packed-refs` file one line at time
>> and then processing it, process the data in place as much as possible.
>>
>> Also, instead of processing one lin
72 matches
Mail list logo
