The git-scm.com site currently links to https://github.com/git/git for
the (non-tarball) source code. Somebody raised the question[1] of
whether it should point to kernel.org instead. Do people find one
interface more or less pleasing than the other? Do we want to prefer
kernel.org as more "officia
Hi Junio,
On Mon, 7 May 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> If tbdiff were "Thomas's branch diff", I would call this jbdiff ;-)
> >> but I think the 't' in there stands for "topic", not "Thomas's".
> >>
> >> How about "git topic-diff"?
> >
> > Or `git topic-branch-
Hi Junio,
On Mon, 7 May 2018, Junio C Hamano wrote:
> Jeff King writes:
>
> > So really, I guess all I am arguing for is having GIT_COLOR_INV (or
> > REVERSE) as a constant, and then teaching the code to combine it with
> > the existing "new" color. It's perfectly OK to have:
> >
> > \x1b[7m\
Elijah Newren writes:
> Hi Junio,
>
> On Sun, Apr 29, 2018 at 8:25 PM, Junio C Hamano wrote:
>> * en/rename-directory-detection-reboot (2018-04-25) 36 commits
>
>>
>> Reboot of an attempt to detect wholesale directory renames and use
>> it while merging.
>>
>> Will merge to 'next'.
>
> Usual
On 6 May 2018 at 22:42, brian m. carlson wrote:
> When creating a literal block from an indented block without any sort of
> delimiters, Asciidoctor strips off all leading whitespace, resulting in
> a misrendered chart. Use an explicit literal block to indicate to
> Asciidoctor that we want to ke
Ævar Arnfjörð Bjarmason writes:
> Right, and I'm with you so far, this makes sense to me for all existing
> uses of the peel syntax, otherwise v2.17.0^{tree} wouldn't be the same
> as rev-parse v2.17.0^{tree}^{tree}...
More importantly, you could spell v2.17.0 part of the above with a
short hexa
"brian m. carlson" writes:
> The order of addresses in the mailmap file was reversed, leading to git
> preferring the crustytoothpaste.ath.cx address, which is obsolete, over
> the crustytoothpaste.net address, which is current. Switch the order of
> the addresses so that git log displays the co
"brian m. carlson" writes:
> Asciidoctor expands tabs at the beginning of a line. However, it does
> not expand them into 8 spaces by default. Since we use 8-space tabs,
> tell Asciidoctor that we want 8 spaces by setting the tabsize attribute.
> This ensures that our ASCII art renders properly
On Sun, May 06, 2018 at 09:49:45PM -0400, Eric Sunshine wrote:
> On Sun, May 6, 2018 at 7:17 PM, brian m. carlson
> wrote:
> > This series introduces an SHA1 prerequisite which checks if the hash in
> > use is SHA-1, and can be used to skip the test if it is not.
> > Additionally, because NewHash
On Sun, May 06, 2018 at 08:07:46PM -0400, Eric Sunshine wrote:
> On Sun, May 6, 2018 at 7:17 PM, brian m. carlson
> wrote:
> > Adjust the test so that it computes variables for blobs instead of using
> > hard-coded hashes.
> >
> > Signed-off-by: brian m. carlson
> > ---
> > diff --git a/t/t4008-d
On Sun, May 06, 2018 at 08:03:27PM -0400, Eric Sunshine wrote:
> On Sun, May 6, 2018 at 7:17 PM, brian m. carlson
> wrote:
> > Adjust the test so that it computes variables for blobs instead of using
> > hard-coded hashes.
> >
> > Signed-off-by: brian m. carlson
> > ---
> > diff --git a/t/t3905-s
On Sun, May 06, 2018 at 07:53:42PM -0400, Eric Sunshine wrote:
> On Sun, May 6, 2018 at 7:17 PM, brian m. carlson
> wrote:
> > Currently we have a variable, $_x40, which contains a regex that matches
> > a full 40-character hex constant. However, with NewHash, we'll have
> > object IDs that are l
Hi Brian,
On Sun, 6 May 2018, brian m. carlson wrote:
> On Fri, May 04, 2018 at 05:34:27PM +0200, Johannes Schindelin wrote:
> > The incredibly useful `git-tbdiff` tool to compare patch series (say,
> > to see what changed between two iterations sent to the Git mailing
> > list) is slightly less
Hi Eric,
On Sun, 6 May 2018, Eric Sunshine wrote:
> On Sun, May 6, 2018 at 8:21 AM, Johannes Schindelin
> wrote:
> > On Sun, 6 May 2018, Junio C Hamano wrote:
> >> Johannes Schindelin writes:
> >> > On Sat, 5 May 2018, Jeff King wrote:
> >> >> One minor point about the name: will it become anno
Hi Martin,
On Sun, 6 May 2018, Martin Ågren wrote:
> On 4 May 2018 at 17:34, Johannes Schindelin
> wrote:
> > @@ -353,6 +358,7 @@ static void output(struct string_list *a, struct
> > string_list *b,
> > int cmd_branch_diff(int argc, const char **argv, const char *prefix)
> > {
> > st
Hi Todd,
On Sat, 5 May 2018, Todd Zullinger wrote:
> > @@ -430,6 +451,8 @@ int cmd_branch_diff(int argc, const char **argv, const
> > char *prefix)
> > struct string_list branch1 = STRING_LIST_INIT_DUP;
> > struct string_list branch2 = STRING_LIST_INIT_DUP;
> >
> > + git_diff_basic_c
On Sun, May 6, 2018 at 7:17 PM, brian m. carlson
wrote:
> This series introduces an SHA1 prerequisite which checks if the hash in
> use is SHA-1, and can be used to skip the test if it is not.
> Additionally, because NewHash will be 256-bit, I introduced aliases for
> the test constants $_x40 and
Johannes Schindelin writes:
>> If tbdiff were "Thomas's branch diff", I would call this jbdiff ;-)
>> but I think the 't' in there stands for "topic", not "Thomas's".
>>
>> How about "git topic-diff"?
>
> Or `git topic-branch-diff`?
Yeah something along that line, which is about comparing each
Hi Buga,
On Sun, 6 May 2018, Igor Djordjevic wrote:
> On 06/05/2018 14:10, Johannes Schindelin wrote:
>
> > I think Todd's idea to shift it from a full-blown builtin to a cmdmode
> > of `branch` makes tons of sense.
>
> I don`t know, I still find it a bit strange that in order to "diff
> someth
Jeff King writes:
> On Sun, May 06, 2018 at 02:35:44AM -0400, Jeff King wrote:
>
>> You'd have to introduce GIT_COLOR_REVERSE. I don't think we have a
>> constant for it yet, but it's \x[7m.
>
> Heh, of course you knew that already, as I just noticed your patch is
> using the reverse attribute in
Hi Duy,
On Sun, 6 May 2018, Duy Nguyen wrote:
> On Fri, May 04, 2018 at 05:35:11PM +0200, Johannes Schindelin wrote:
> > Tab completion of `branch-diff` is very convenient, especially given
> > that the revision arguments that need to be passed to `git branch-diff`
> > are typically more complex
Hi Peff,
On Sun, 6 May 2018, Jeff King wrote:
> On Sun, May 06, 2018 at 02:35:44AM -0400, Jeff King wrote:
>
> > You'd have to introduce GIT_COLOR_REVERSE. I don't think we have a
> > constant for it yet, but it's \x[7m.
>
> Heh, of course you knew that already, as I just noticed your patch is
On Sun, May 6, 2018 at 7:17 PM, brian m. carlson
wrote:
> Adjust the test so that it computes variables for blobs instead of using
> hard-coded hashes.
>
> Signed-off-by: brian m. carlson
> ---
> diff --git a/t/t4008-diff-break-rewrite.sh b/t/t4008-diff-break-rewrite.sh
> @@ -27,29 +27,32 @@ Furt
On Sun, May 6, 2018 at 7:17 PM, brian m. carlson
wrote:
> Adjust the test so that it computes variables for blobs instead of using
> hard-coded hashes.
>
> Signed-off-by: brian m. carlson
> ---
> diff --git a/t/t3905-stash-include-untracked.sh
> b/t/t3905-stash-include-untracked.sh
> @@ -34,25 +
Hello,
In previous email I wrote:
JN> As this post is getting long, I'll post other ideas, about commit
JN> labeling for faster reachability queries in a separate email.
This is this email.
Here is second part of series dedicated to discussing what other data,
like various reachability indexes
On Sun, May 6, 2018 at 7:17 PM, brian m. carlson
wrote:
> Currently we have a variable, $_x40, which contains a regex that matches
> a full 40-character hex constant. However, with NewHash, we'll have
> object IDs that are longer than 40 characters. In such a case, $_x40
> will be a confusing na
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 30894c1cc7..22c5e8e5c9 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> +static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs,
> + struct tree *tree)
> +{
> +
> On Sun, 6 May 2018 22:03:10 +0200
> Martin Ågren wrote:
> > On 6 May 2018 at 21:03, Shulhan wrote:
> > > [alias]
> > > tree = --no-pager log --graph \
> > > -n 20 \
> > > [user]
> > > name = Shulhan
> > >
> > > (2) Run `git config -f git.config -l`
> > >
> > > T
The order of addresses in the mailmap file was reversed, leading to git
preferring the crustytoothpaste.ath.cx address, which is obsolete, over
the crustytoothpaste.net address, which is current. Switch the order of
the addresses so that git log displays the correct address.
Signed-off-by: brian
Adjust the test so that it computes variables for blobs instead of using
hard-coded hashes.
Signed-off-by: brian m. carlson
---
t/t4022-diff-rewrite.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh
index cb51d9f9d4..0f1
This test enumerates log entries and then sorts them. For SHA-1, this
produces results that happen to sort in the order specified in the test,
but for other hash algorithms they sort differently. Ensure we sort the
log entries in a hash-independent way by sorting on the ref name instead
of the ob
Adjust the test so that it computes variables for object IDs instead of
using hard-coded hashes.
Signed-off-by: brian m. carlson
---
t/t4208-log-magic-pathspec.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
i
Adjust the test so that it computes variables for blobs instead of using
hard-coded hashes.
Signed-off-by: brian m. carlson
---
t/t4042-diff-textconv-caching.sh | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/t/t4042-diff-textconv-caching.sh b/t/t4042-diff-t
Adjust the test so that it computes variables for blobs instead of using
hard-coded hashes.
Signed-off-by: brian m. carlson
---
t/t4030-diff-textconv.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh
index aad6c7f78d..
Strip out the index lines in the diff before comparing them, as these
will differ between hash algorithms. This leads to a smaller, simpler
change than editing the index line.
Signed-off-by: brian m. carlson
---
t/t3702-add-edit.sh | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
d
Adjust the test so that it computes variables for blobs and uses the
ZERO_OID variable instead of using hard-coded hashes.
Signed-off-by: brian m. carlson
---
t/t4007-rename-3.sh | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/t/t4007-rename-3.sh b/t/t4007-r
This test relies on objects with colliding short names which are
necessarily dependent on the hash used. Skip the test if we're not
using SHA-1.
Signed-off-by: brian m. carlson
---
t/t1512-rev-parse-disambiguation.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t1512-rev-parse-di
Adjust the test so that it computes variables for object IDs instead of
using hard-coded hashes.
Signed-off-by: brian m. carlson
---
t/t5300-pack-object.sh | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 65ff60f2ee
Adjust the test code so that it computes variables for blobs instead of
using hard-coded hashes. This makes t4033 and t4050 (the patience and
histogram tests) pass.
Signed-off-by: brian m. carlson
---
t/lib-diff-alternative.sh | 12
1 file changed, 8 insertions(+), 4 deletions(-)
We typically indent our tests with a single tab, partially so that we
can take advantage of indented heredocs. Make this change and move the
quote marks to be in the typical position for our tests.
Signed-off-by: brian m. carlson
---
t/t4029-diff-trailing-space.sh | 33 -
Adjust the test so that it computes variables for blobs instead of using
hard-coded hashes.
Signed-off-by: brian m. carlson
---
t/t4029-diff-trailing-space.sh | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/t/t4029-diff-trailing-space.sh b/t/t4029-diff-trailing-space.sh
i
Adjust the test so that it computes variables for blobs instead of using
hard-coded hashes.
Signed-off-by: brian m. carlson
---
t/t4045-diff-relative.sh | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh
index 6471a68701.
Adjust the test so that it computes values for blobs instead of using
hard-coded hashes.
Signed-off-by: brian m. carlson
---
t/t4014-format-patch.sh | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 163d64fc32..eb34
Adjust the test so that it computes variables for blobs instead of using
hard-coded hashes.
Signed-off-by: brian m. carlson
---
t/t4020-diff-external.sh | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh
index 49d3f54b2
Adjust the test so that it computes variables for blobs instead of using
hard-coded hashes.
Signed-off-by: brian m. carlson
---
t/t4008-diff-break-rewrite.sh | 59 +++
1 file changed, 32 insertions(+), 27 deletions(-)
diff --git a/t/t4008-diff-break-rewrite.sh b/
Adjust the test so that it computes variables for blobs instead of using
hard-coded hashes.
Signed-off-by: brian m. carlson
---
t/t2203-add-intent.sh | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index 1797f946b9..04d840
Adjust the test so that it computes variables for blobs instead of using
hard-coded hashes.
Signed-off-by: brian m. carlson
---
t/t3905-stash-include-untracked.sh | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/t/t3905-stash-include-untracked.sh
b/t/t3905-stash-
These tests rely on creating packs with specially named objects which
are necessarily dependent on the hash used. Skip these tests if we're
not using SHA-1.
Signed-off-by: brian m. carlson
---
t/t5308-pack-detect-duplicates.sh | 6 ++
t/t5309-pack-delta-cycles.sh | 6 ++
2 files ch
Since this is a core test that tests basic functionality, annotate the
assertions that have dependencies on SHA-1 with the appropriate
prerequisite.
Signed-off-by: brian m. carlson
---
t/t1007-hash-object.sh | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t
Currently we have a variable, $_x40, which contains a regex that matches
a full 40-character hex constant. However, with NewHash, we'll have
object IDs that are longer than 40 characters. In such a case, $_x40
will be a confusing name. Create a $FULL_HEX variable which will always
reflect a rege
This test relies on objects with colliding short names which are
necessarily dependent on the hash used. Skip the test if we're not
using SHA-1.
Signed-off-by: brian m. carlson
---
t/t4044-diff-index-unique-abbrev.sh | 6 ++
1 file changed, 6 insertions(+)
diff --git a/t/t4044-diff-index-u
Currently we have a variable, $_z40, which contains the all-zero object
ID. However, with NewHash, we'll have an all-zero object ID which is
longer than 40 hex characters. In such a case, $_z40 will be a
confusing name. Create a $ZERO_OID variable which will always reflect
the all-zeros object I
Adjust the test so that it uses variables and command substitution for
trees instead of hard-coded hashes. This also has the benefit of making
it more obvious how the test works.
Signed-off-by: brian m. carlson
---
t/t3103-ls-tree-misc.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Since this is a core test that tests basic functionality, annotate the
assertions that have dependencies on SHA-1 with the appropriate
prerequisite.
Signed-off-by: brian m. carlson
---
t/t-basic.sh | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a
This is part 2 in the series to make tests hash independent.
This series introduces an SHA1 prerequisite which checks if the hash in
use is SHA-1, and can be used to skip the test if it is not.
Additionally, because NewHash will be 256-bit, I introduced aliases for
the test constants $_x40 and $_z
There are some basic tests in our codebase that test that we get fixed
SHA-1 values. These are valuable because they make sure that our SHA-1
implementation is free of bugs, but obviously these tests will fail with
a different hash.
There are also tests which intentionally produce objects that ha
Switch all uses of $_z40 to $ZERO_OID so that they work correctly with
larger hashes. This commit was created by using the following sed
command to modify all files in the t directory except t/test-lib.sh:
sed -i 's/\$_z40/$ZERO_OID/g'
Signed-off-by: brian m. carlson
---
t/t1006-cat-file.sh
Switch all uses of $_x40 to $FULL_HEX so that they work correctly with
larger hashes. This commit was created by using the following sed
command to modify all files in the t directory except t/test-lib.sh:
sed -i 's/\$_x40/$FULL_HEX/g'
Signed-off-by: brian m. carlson
---
t/diff-lib.sh
On Sun, 6 May 2018 22:03:10 +0200
Martin Ågren wrote:
> Hi Shulhan
>
> Thank you for your report. I'm abbreviating a bit:
>
> On 6 May 2018 at 21:03, Shulhan wrote:
> > [alias]
> > tree = --no-pager log --graph \
> > -n 20 \
> > [user]
> > name = Shulhan
> >
> >
On Fri, May 04, 2018 at 05:34:27PM +0200, Johannes Schindelin wrote:
> The incredibly useful `git-tbdiff` tool to compare patch series (say, to see
> what changed between two iterations sent to the Git mailing list) is slightly
> less useful for this developer due to the fact that it requires the
On Sun, May 06, 2018 at 10:03:10PM +0200, Martin Ågren wrote:
> This behavior looks correct to me, though. It seems very hard to me to
> second-guess what the user meant. For example, what if that third line
> contained a "="? Like:
>
> [alias]
> huh = !dd \
> bs=1024 ...
>
On Sun, May 6, 2018 at 8:21 AM, Johannes Schindelin
wrote:
> On Sun, 6 May 2018, Junio C Hamano wrote:
>> Johannes Schindelin writes:
>> > On Sat, 5 May 2018, Jeff King wrote:
>> >> One minor point about the name: will it become annoying as a tab
>> >> completion conflict with git-branch?
>>
>> I
Asciidoctor expands tabs at the beginning of a line. However, it does
not expand them into 8 spaces by default. Since we use 8-space tabs,
tell Asciidoctor that we want 8 spaces by setting the tabsize attribute.
This ensures that our ASCII art renders properly.
Signed-off-by: brian m. carlson
-
When creating a literal block from an indented block without any sort of
delimiters, Asciidoctor strips off all leading whitespace, resulting in
a misrendered chart. Use an explicit literal block to indicate to
Asciidoctor that we want to keep the leading whitespace.
Signed-off-by: brian m. carls
Hi Shulhan
Thank you for your report. I'm abbreviating a bit:
On 6 May 2018 at 21:03, Shulhan wrote:
> [alias]
> tree = --no-pager log --graph \
> -n 20 \
> [user]
> name = Shulhan
>
> (2) Run `git config -f git.config -l`
>
> The command print the following outpu
On 6 May 2018 at 19:42, Duy Nguyen wrote:
> On Sun, May 6, 2018 at 7:26 PM, Duy Nguyen wrote:
>> On Sun, May 6, 2018 at 4:10 PM, Martin Ågren wrote:
>>> These `struct lock_file`s are local to their respective functions and we
>>> can drop their staticness.
>>> - static struct lock_file lo
## Environment
OS: Arch Linux
Git version: git@next d54016d9e
## Reproduction Steps
(1) Create the following `git.config`,
```
[alias]
tree = --no-pager log --graph \
--date=format:'%Y-%m-%d' \
--pretty=format:'%C(auto,dim)%ad %<(7,trunc) %an %Creset%m %h
I recently faced the consequence of the weak option parsing done by in
`git submodule`. Initially tried to add a new submodule using the `git
submodule add` sub-command in the following way,
$ git submodule add ./foo/bar
This cloned the submodule into a new directory named 'bar' in the
presen
On Sun, May 06 2018, Martin Ågren wrote:
> On 5 May 2018 at 04:43, Taylor Blau wrote:
>> Take advantage of 'git-grep(1)''s new option, '--column' in order to
>> teach Peff's 'git-jump' script how to jump to the correct column for any
>> given match.
>>
>> 'git-grep(1)''s output is in the correct
On Sat, May 05 2018, Taylor Blau wrote:
> + test_expect_success "grep -w $L (with --{line,column}-number)" '
It's now --column in v4 but this still refers to v3 --column-number.
Hi Johannes, sorry it's taken me a while to look at this. I think it
mostly makes sense to me, the code is well documented. I've got one
comment below
On 27/04/18 21:48, Johannes Schindelin wrote:
>
> During a series of fixup/squash commands, the interactive rebase builds
> up a commit message wi
Hi Taylor
On 05/05/18 03:43, Taylor Blau wrote:
>
> Teach 'git-grep(1)' a new option, '--column', to show the column
> number of the first match on a non-context line.
>
> For example:
>
> $ git grep -n --column foo | head -n3
> .clang-format:51:14:# myFunction(foo, bar, baz);
> .clang-fo
On Sun, May 6, 2018 at 7:26 PM, Duy Nguyen wrote:
> On Sun, May 6, 2018 at 4:10 PM, Martin Ågren wrote:
>> These `struct lock_file`s are local to their respective functions and we
>> can drop their staticness.
>>
>> Signed-off-by: Martin Ågren
>> ---
>> apply.c| 2 +-
>> builtin
On Sun, May 6, 2018 at 4:10 PM, Martin Ågren wrote:
> These `struct lock_file`s are local to their respective functions and we
> can drop their staticness.
>
> Signed-off-by: Martin Ågren
> ---
> apply.c| 2 +-
> builtin/describe.c | 2 +-
> builtin/difftool.c | 2 +-
> b
On 6 May 2018 at 17:48, David Turner wrote:
> On Sun, 2018-05-06 at 16:10 +0200, Martin Ågren wrote:
>> While at it, make the lock non-static.
> Re making the lock static, I wonder about the following case:
>
> if (read_ref(pseudoref, &actual_old_oid))
>
> die("could not read ref '%s'", pse
Same concern here about staticness.
On Sun, 2018-05-06 at 16:10 +0200, Martin Ågren wrote:
> After taking the lock we check whether we got it and die otherwise.
> But
> since we take the lock using `LOCK_DIE_ON_ERROR`, we would already
> have
> died.
>
> Unlike in the previous patch, this functio
Re making the lock static, I wonder about the following case:
if (read_ref(pseudoref, &actual_old_oid))
die("could not read ref '%s'", pseudoref);
I think this calls exit(), and then atexit tries to clean up the lock
files. But since lock is no longer sta
LGTM.
(This is the current best address to reach me, but do not expect fast
responses over the next few days as I'm out of town)
On Sun, 2018-05-06 at 15:35 +0200, Martin Ågren wrote:
> According to the documentation on `git update-ref`, it is possible to
> "specify 40 '0' or an empty string
On 5 May 2018 at 04:43, Taylor Blau wrote:
> Take advantage of 'git-grep(1)''s new option, '--column' in order to
> teach Peff's 'git-jump' script how to jump to the correct column for any
> given match.
>
> 'git-grep(1)''s output is in the correct format for Vim's jump list, so
> no additional cl
On 4 May 2018 at 17:34, Johannes Schindelin wrote:
> @@ -353,6 +358,7 @@ static void output(struct string_list *a, struct
> string_list *b,
> int cmd_branch_diff(int argc, const char **argv, const char *prefix)
> {
> struct diff_options diffopt = { NULL };
> + struct strbuf four_s
Each of these `struct lock_file`s is used from within a single function.
Move them into the respective functions to make the scope clearer. While
doing so, we can drop the staticness.
After this commit, the remaing occurences of "static struct lock_file"
are locks that are used from within differe
Die in case writing the index fails, so that the caller can notice
(instead of, say, being impressed by how performant the writing is).
While at it, note that after opening a lock with `LOCK_DIE_ON_ERROR`, we
do not need to worry about whether we succeeded. Also, we can move the
`struct lock_file`
After taking the lock we check whether we got it and die otherwise. But
since we take the lock using `LOCK_DIE_ON_ERROR`, we would already have
died.
Unlike in the previous patch, this function is not prepared for
indicating errors via a `strbuf err`, so let's just drop the dead code.
Any improved
If we could not take the lock, we add an error to the `strbuf err` and
return. However, this code is dead. The reason is that we take the lock
using `LOCK_DIE_ON_ERROR`. Drop the flag to allow our more gentle
error-handling to actually kick in.
We could instead just drop the dead code and die here
These `struct lock_file`s are local to their respective functions and we
can drop their staticness.
Signed-off-by: Martin Ågren
---
apply.c| 2 +-
builtin/describe.c | 2 +-
builtin/difftool.c | 2 +-
builtin/gc.c | 2 +-
builtin/merge.c| 4 ++--
builtin
This series addresses two classes of "static struct lock_file", removing
the staticness: Those locks that already live inside a function, and
those that can simply be moved into the function they are used from.
The first three patches are some cleanups I noticed along the way, where
we first take
Hi Dscho,
On 06/05/2018 14:10, Johannes Schindelin wrote:
>
> > > > > This builtin does not do a whole lot so far, apart from showing a
> > > > > usage that is oddly similar to that of `git tbdiff`. And for a
> > > > > good reason: the next commits will turn `branch-diff` into a
> > > > > full-bl
According to the documentation on `git update-ref`, it is possible to
"specify 40 '0' or an empty string as to make sure that the
ref you are creating does not exist." But in the code for pseudorefs, we
do not implement this. If we fail to read the old ref, we immediately
die. A failure to read wo
Hi Sebi,
On Friday 04 May 2018 03:18 AM, Paul-Sebastian Ungureanu wrote:
> Hello everybody,
>
> The community bonding period started. It is well known that for a
> greater rate of success, it is recommended to send weekly reports
> regarding project status. But, what would be a good form for such
Hi Junio,
On Sun, 6 May 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > Johannes Schindelin (17):
> > Add a function to solve least-cost assignment problems
> > Add a new builtin: branch-diff
>
> Perhaps retitling these to
>
> hungarian: a function to solve least-cost
Hi Junio,
On Sun, 6 May 2018, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Sat, 5 May 2018, Jeff King wrote:
> >
> >> On Fri, May 04, 2018 at 05:34:32PM +0200, Johannes Schindelin wrote:
> >>
> >> > This builtin does not do a whole lot so far, apart from showing a usage
> >> >
Hi Buga,
On Sun, 6 May 2018, Igor Djordjevic wrote:
> On 04/05/2018 17:34, Johannes Schindelin wrote:
> > Just like tbdiff, we now show the diff between matching patches. This is
> > a "diff of two diffs", so it can be a bit daunting to read for the
> > beginner.
> >
> > And just like tbdiff, we
Hi Buga,
On Sun, 6 May 2018, Igor Djordjevic wrote:
> On 05/05/2018 23:57, Johannes Schindelin wrote:
> >
> > > > This builtin does not do a whole lot so far, apart from showing a
> > > > usage that is oddly similar to that of `git tbdiff`. And for a
> > > > good reason: the next commits will tu
Hi Duy,
On Sun, 6 May 2018, Duy Nguyen wrote:
> On Sun, May 6, 2018 at 6:53 AM, Jacob Keller wrote:
> > On Sat, May 5, 2018 at 6:05 PM, Igor Djordjevic
> > wrote:
> >>
> >> On 05/05/2018 23:57, Johannes Schindelin wrote:
> >>>
> >>> > > This builtin does not do a whole lot so far, apart from sh
Hi Todd,
On Sat, 5 May 2018, Todd Zullinger wrote:
> I wrote:
> > Would it be possible and reasonable to teach 'git branch' to
> > call this as a subcommand, i.e. as 'git branch diff'? Then
> > the completion wouldn't offer git branch-diff.
>
> Of course right after I sent this, it occurred to
On Sun, May 6, 2018 at 6:53 AM, Jacob Keller wrote:
> On Sat, May 5, 2018 at 6:05 PM, Igor Djordjevic
> wrote:
>> Hi Dscho,
>>
>> On 05/05/2018 23:57, Johannes Schindelin wrote:
>>>
>>> > > This builtin does not do a whole lot so far, apart from showing a
>>> > > usage that is oddly similar to th
On Fri, May 04, 2018 at 05:35:11PM +0200, Johannes Schindelin wrote:
> Tab completion of `branch-diff` is very convenient, especially given
> that the revision arguments that need to be passed to `git branch-diff`
> are typically more complex than, say, your grandfather's `git log`
> arguments.
>
97 matches
Mail list logo