On Fri, Nov 9, 2018 at 5:18 AM Ævar Arnfjörð Bjarmason wrote:
> Make the behavior when diff options (e.g. "--stat") are passed
> consistent with how "diff" behaves.
> [...]
> Signed-off-by: Ævar Arnfjörð Bjarmason
> ---
> diff --git a/range-diff.c b/range-diff.c
> @@ -453,7 +453,8 @@ int show_ran
On Mon, Nov 12, 2018 at 3:41 AM Carlo Marcelo Arenas Belón
wrote:
> b968372279 ("read-cache: unlink old sharedindex files", 2017-03-06)
> introduced get_shared_index_expire_date using unsigned long to track
> the modification times of a shared index.
>
> dddbad728c ("timestamp_t: a new data type f
On Thu, Nov 15, 2018 at 11:07 PM Junio C Hamano wrote:
> yanke131...@gmail.com writes:
> > * add macOS gettext explanation to get the i18n locale translation take
> > effect in macOS, as the most polular way of gettext
> > install in macOS, the gettext is not linked by default, this commit give
On Sun, Nov 18, 2018 at 6:45 AM Anders Waldenborg wrote:
> With the new "key=" option to %(trailers) it often makes little sense to
> show the key, as it by definition already is know which trailer is
s/know/known/
> printed there. This new "valueonly" option makes it omit the key when
> printin
On Sun, Nov 18, 2018 at 6:45 AM Anders Waldenborg wrote:
> By default trailer lines are terminated by linebreaks ('\n'). By
> specifying the new 'separator' option they will instead be separated by
> user provided string and have separator semantics rather than terminator
> semantics. The separato
On Thu, Nov 22, 2018 at 8:28 AM Ævar Arnfjörð Bjarmason
wrote:
> Range-diff:
> By the way, is there any way to
> Pass the equivalent of "git range-diff origin/master topic-2 topic-3"
> to git-format-patch?
git-range-diff documentations says that the three-argument form:
git range-diff
On Tue, Nov 27, 2018 at 5:06 AM Carlo Marcelo Arenas Belón
wrote:
> [...]
> -Wpedantic is only enabled for clang 10 or higher (only available in macOS
> with latest Xcode) but this restriction should be relaxed further as more
> environments are tested
We know from [1] that the clang version numb
On Tue, Nov 27, 2018 at 10:48 AM Carlo Arenas wrote:
> On Tue, Nov 27, 2018 at 2:53 AM Eric Sunshine wrote:
> > On Tue, Nov 27, 2018 at 5:06 AM Carlo Marcelo Arenas Belón
> > > +ifneq ($(filter clang10,$(COMPILER_FEATURES)),)
> > > +CFLAGS += -Wpedantic
> > >
On Tue, Nov 27, 2018 at 11:43 AM Ævar Arnfjörð Bjarmason
wrote:
> Avoid a bug in dash that's been fixed ever since its
> ec2c84d ("[PARSER] Fix clobbering of checkkwd", 2011-03-15)[1] first
> released with dash v0.5.7 in July 2011.
Perhaps enhance the commit message to explain the nature of the b
On Wed, Nov 28, 2018 at 4:43 PM Jean-Noël Avila wrote:
> Translating the new strings introduced for v2.20 showed some typos.
Hard to spot by eyeball when looking at the diff, but both fixes make
sense. Thanks.
> Signed-off-by: Jean-Noël Avila
On Wed, Nov 28, 2018 at 2:29 PM Stefan Beller wrote:
> On Wed, Nov 28, 2018 at 6:13 AM Kenn Sebesta wrote:
> > v2.19.2, installed from brew on macOS Mojave 14.2.1.
> >
> > `git-gui` is my much beloved go-to tool for everything git.
> > Unfortunately, on my new Macbook Air it seems to have a bug.
On Thu, Nov 29, 2018 at 11:27 PM Junio C Hamano wrote:
> Junio C Hamano writes:
> > In any case, I tend to agree with the conclusion in the downthread
> > by Dscho that we should just clearly mark that invocations of the
> > "format-patch --range-diff" command with additional diff options is
> >
On Thu, Nov 29, 2018 at 11:03 AM Ævar Arnfjörð Bjarmason
wrote:
> I mean not just nasty in terms of implementation, yeah we could do it,
> but also a nasty UX for things like --word-diff-regex. I.e. instead of:
>
> --range-diff-word-diff-regex='[0-9"]'
>
> You need:
>
> --range-diff-opts="
On Sat, Dec 1, 2018 at 3:02 PM Jeff King wrote:
> On Thu, Nov 29, 2018 at 09:32:48AM +0100, Johannes Schindelin wrote:
> > In reality, I think that it would even make sense to change the default to
> > reschedule failed `exec` commands. Which is why I suggested to also add a
> > config option.
>
>
lace.
Don't revert `show_range_diff()`, i.e., let it keep accepting NULL.
Rather than removing what is dead code and figuring out it isn't
actually dead and we've broken 2.20, just leave it for now.
[es: retain diff coloring when going to stdout]
Signed-off-by: Martin Ågren
Sign
On Tue, Dec 4, 2018 at 11:28 AM Duy Nguyen wrote:
> Haven't really worked on killing the term "detached HEAD" yet. But I
> noticed the other day that git-branch reports
>
> * (HEAD detached from 703266f6e4)
>
> and I didn't know how to rephrase that. I guess "unnamed branch from
> 703266f6e4" is p
On Fri, Dec 7, 2018 at 7:36 AM Victor Toni wrote:
> I'm wondering if there is any way to show which rules (ideally with
> the .gitignore file they are coming from) are causing a specific file
> to get ignored so I could easily fix the .gitignore file?
Perhaps the "git check-ignore" command would
On Fri, Aug 31, 2018 at 7:54 AM Ævar Arnfjörð Bjarmason
wrote:
> On Fri, Aug 31, 2018 at 11:52 AM Eric Sunshine
> wrote:
> > OLD_ICONV has long been needed by FreeBSD so config.mak.uname defines
> > it unconditionally. However, recent versions do not need it, and its
>
On Fri, Aug 31, 2018 at 2:21 PM Torsten Bögershausen wrote:
> > diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
> > @@ -14,11 +14,13 @@ compare_files () {
> > compare_ws_file () {
> > + tmp=$2.tmp
> > act=$pfx.actual.$3
> > - tr '\015\000abcdef0123456789' QN
On Fri, Aug 31, 2018 at 1:00 PM Jonathan Nieder wrote:
> > From: Jonathan Nieder
> > OLD_ICONV has long been needed by FreeBSD so config.mak.uname defines
> > it unconditionally. However, recent versions do not need it, and its
> > presence results in compilation warnings. Resolve this issue by d
On Fri, Aug 31, 2018 at 4:01 PM Jeff King wrote:
> On Fri, Aug 31, 2018 at 02:33:17AM -0400, Eric Sunshine wrote:
> > OPTIONS_SPEC="\
> > doc-diff [options] [-- ]
> > +doc-diff (-c|--clean)
> > --
> > j=n parallel argument to pass to make
> >
On Fri, Aug 31, 2018 at 4:07 PM Jeff King wrote:
> On Fri, Aug 31, 2018 at 02:33:18AM -0400, Eric Sunshine wrote:
> > diff --git a/Documentation/Makefile b/Documentation/Makefile
> > @@ -332,6 +332,7 @@ clean:
> > $(RM) manpage-base-url.xsl
> > + '$(SH
On Sat, Sep 1, 2018 at 7:53 PM Stephen P. Smith wrote:
> Add test for commit --dry-run --short.
The first line of a commit message typically mentions the area or
module being touched. It's also customary not to capitalize the first
word and to omit the final period. So, for instance:
t7501:
On Sat, Sep 1, 2018 at 10:18 PM Eric Sunshine wrote:
> On Sat, Sep 1, 2018 at 7:53 PM Stephen P. Smith wrote:
> > The test demonstrates that the setting of the commitable flag is
> > broken.
>
> s/commitable/committable/
Looking at patch 3/3, I see that this misspelli
On Mon, Sep 3, 2018 at 2:44 PM Johannes Schindelin
wrote:
> where `strbuf_join_argv()` would be implemented like this (and I would put
> it into strbuf.c and strbuf.h:
>
> const char *strbuf_join_argv(struct strbuf *buf,
> int argc, const char **argv, c
On Mon, Sep 3, 2018 at 5:10 PM Johannes Schindelin via GitGitGadget
wrote:
> The upcoming patches will allow building git.git via VSTS CI, where
> variable names and URLs look a bit different than in Travis CI.
>
> Signed-off-by: Johannes Schindelin
> ---
> diff --git a/ci/install-dependencies.sh
On Mon, Sep 3, 2018 at 7:25 PM brian m. carlson
wrote:
> Add several test functions to make working with various hash-related
> values easier.
> [...]
> diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
> @@ -1155,3 +1155,70 @@ depacketize () {
> +# Detect the hash algorithm in use.
>
On Mon, Sep 3, 2018 at 5:10 PM Johannes Schindelin via GitGitGadget
wrote:
> This will come in handy when publishing the results of Git's test suite
> during an automated VSTS CI run.
>
> Signed-off-by: Johannes Schindelin
> ---
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> @@ -431,11 +434,24 @@
On Mon, Sep 3, 2018 at 5:10 PM Johannes Schindelin via GitGitGadget
wrote:
> So let's do something different in VSTS: let's run all the tests with
> `--quiet` first, and only if a failure is encountered, try to trace the
> commands as they are executed. [...]
>
> Signed-off-by: Johannes Schindelin
On Tue, Sep 4, 2018 at 4:27 PM Ævar Arnfjörð Bjarmason wrote:
> With --stdin-packs we don't show any estimation of how much is left to
> do. This is because we might be processing more than one pack. We
> could be less lazy here and show progress, either detect by detecting
s/detect//
> that we'
On Wed, Sep 5, 2018 at 4:29 AM Ævar Arnfjörð Bjarmason wrote:
> I recently gained access to a Solaris 10 SPARC (5.10) box and discovered
> that the chainlint.sed implementation in 2.19.0 has more sed portability
> issues.
>
> First, whoever implemented the /bin/sed on Solaris apparently read the
>
On Tue, Sep 4, 2018 at 6:36 PM Junio C Hamano wrote:
> * es/worktree-forced-ops-fix (2018-08-30) 9 commits
> - worktree: delete .git/worktrees if empty after 'remove'
> - worktree: teach 'remove' to override lock when --force given twice
> - worktree: teach 'move' to override lock when --force
On Tue, Sep 4, 2018 at 6:36 PM Junio C Hamano wrote:
> * es/worktree-forced-ops-fix (2018-08-30) 9 commits
> - worktree: delete .git/worktrees if empty after 'remove'
> - worktree: teach 'remove' to override lock when --force given twice
> - worktree: teach 'move' to override lock when --force
On Wed, Sep 5, 2018 at 8:39 AM Johannes Schindelin
wrote:
> So let's hear some ideas how to improve the situation, m'kay?
> Just as a reminder, this is the problem I want to solve: I want to run the
> tests in a light-weight manner, with minimal output, and only in case of
> an error do I want to
On Wed, Sep 5, 2018 at 5:14 AM Eric Sunshine wrote:
> On Tue, Sep 4, 2018 at 6:36 PM Junio C Hamano wrote:
> > * es/worktree-forced-ops-fix (2018-08-30) 9 commits
> This description mischaracterizes what these changes are about. [...]
>
> So, perhaps rewrite this des
On Wed, Sep 5, 2018 at 10:46 AM Derrick Stolee via GitGitGadget
wrote:
> The multi-pack-index builtin writes multi-pack-index files, and
> uses a 'write' verb to do so. Add a 'verify' verb that checks this
> file matches the contents of the pack-indexes it replaces.
> [...]
> Signed-off-by: Derric
On Wed, Sep 5, 2018 at 10:46 AM Derrick Stolee via GitGitGadget
wrote:
> Add tests that check corrupted headers in a few ways:
> [...]
> Signed-off-by: Derrick Stolee
> ---
> diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
> @@ -154,6 +154,51 @@ test_expect_success 'verify
On Wed, Sep 5, 2018 at 10:46 AM Derrick Stolee via GitGitGadget
wrote:
> Replace the BUG() statement with a die() statement, now that we
> may hit a bad pack-int-id during a 'verify' command on a corrupt
> multi-pack-index, and it is covered by a test.
>
> Signed-off-by: Derrick Stolee
> ---
> di
On Wed, Jul 25, 2018 at 5:07 PM Junio C Hamano wrote:
> Eric Sunshine writes:
> > + if (cmit_fmt_is_mail(ctx.fmt) && opt->rdiff1) {
> > + struct diff_queue_struct dq;
> > +
> > + memcpy(&dq,
On Wed, Jul 25, 2018 at 4:53 PM Junio C Hamano wrote:
> Eric Sunshine writes:
> > When submitting a revised a patch series, the --range-diff option embeds
> > a range-diff in the cover letter showing changes since the previous
> > version of the patch series. The argument
On Fri, Sep 7, 2018 at 11:51 AM Nguyễn Thái Ngọc Duy wrote:
> Refreshing the index is usually very fast, but it can still take a
> long time sometimes. Cold cache is one, or something else silly (*).
> In this case, it's good to show something to let the user know "git
> status" is not hanging, it
On Fri, Sep 7, 2018 at 4:29 PM Derrick Stolee wrote:
> On 9/7/2018 1:38 PM, Eric Sunshine wrote:
> > On Fri, Sep 7, 2018 at 11:51 AM Nguyễn Thái Ngọc Duy
> > wrote:
> >> + if (progress)
> >> + display_progress(progre
On Fri, Sep 7, 2018 at 6:44 PM Tim Schumacher wrote:
> Introduce a testing suite that is dedicated to aliases.
> For now, check only if nested aliases work and if looping
> aliases are detected successfully.
>
> The looping aliases check for mixed execution is there but
> expected to fail because
On Tue, Sep 11, 2018 at 4:26 PM Derrick Stolee via GitGitGadget
wrote:
> In es/format-patch-rangediff, we added a '--range-diff' option to
> git-format-patch to automatically add a range-diff. We also added an option
> to write the diff as commentary to a single patch submission. However, this
> c
On Tue, Sep 11, 2018 at 4:26 PM Derrick Stolee via GitGitGadget
wrote:
> The commit 40ce4160 "format-patch: allow --range-diff to apply to
> a lone-patch" added the ability to see a range-diff as commentary
> after the commit message of a single patch series (i.e. [PATCH]
> instead of [PATCH X/N])
On Wed, Sep 12, 2018 at 6:11 AM Phillip Wood wrote:
> Use the new function to read the author script, updating
> read_env_script() and read_author_ident(). This means we now have a
> single code path that reads the author script and uses sq_dequote() to
> dequote it. This fixes potential problems
On Wed, Sep 12, 2018 at 3:01 PM Thomas Gummerer wrote:
> Subject: [PATCH] linear-assignment: fix potential out of bounds memory access
>
> Currently the 'compute_assignment()' function can may read memory out
"can may"?
> of bounds, even if used correctly. Namely this happens when we only
> hav
On Thu, Sep 13, 2018 at 10:56 AM Derrick Stolee via GitGitGadget
wrote:
> There have been a few bugs in recent patches what would have been caught
> if the test suite covered those blocks (including a few of mine). I want
> to work towards a "sensible" amount of coverage on new topics. In my opini
On Wed, Sep 12, 2018 at 6:11 AM Phillip Wood wrote:
> Add read_author_script() to sequencer.c based on the implementation in
> builtin/am.c and update read_am_author_script() to use
> read_author_script(). The sequencer code that reads the author script
> will be updated in the next commit.
>
> Si
On Wed, Sep 12, 2018 at 6:11 AM Phillip Wood wrote:
> Use the new function to read the author script, updating
> read_env_script() and read_author_ident(). This means we now have a
> single code path that reads the author script and uses sq_dequote() to
> dequote it. This fixes potential problems
On Fri, Sep 14, 2018 at 10:45 AM Tao Qingyun wrote:
> refs: docstirng typo
Typo: s/docstirng/docstring/
> ---
Please sign-off your patch. See Documentation/SubmittingPatches.
Thanks.
On Fri, Sep 14, 2018 at 10:20 PM Niko Dzhus wrote:
> Looks like the issue appeared after updating git from brew.
>
> A quick search revealed that brew changed how it builds git recently.
> I think, it just didn't include i18n by default before, so I never
> noticed this.
>
> Anybody here familiar
On Fri, Sep 14, 2018 at 7:29 PM Ramsay Jones
wrote:
> At one time, the POSIX standard required the type used to represent
> a thread handle (pthread_t) be an arithmetic type. This is no longer
> the case, probably because different platforms used to regularly
> ignore that requirement. For exampl
On Fri, Sep 14, 2018 at 7:12 PM Tim Schumacher wrote:
> This is the first multi-patch series that I submitted, so I'm unsure if I
> should send the updated patch only or if I should send the complete series
> again as v5. Any pointers to what the correct procedure for this case is would
> be appre
On Mon, Sep 17, 2018 at 3:36 PM Junio C Hamano wrote:
> Jonathan Nieder writes:
> >> +'$(SHELL_PATH_SQ)' ./doc-diff --clean
> >
> > This means I need a copy of git in order to run "make clean". That
> > was never required before. It makes bootstrapping difficult --- do we
> > really need it
On Mon, Sep 17, 2018 at 4:43 PM Eric Sunshine wrote:
> I did consider this case and felt that it would be reasonable for it
> to error out and ignore the error if git was missing or if the
> directory was not a repository. And, I _thought_ I had prefixed the
> line with "-"
On Mon, Sep 17, 2018 at 6:24 PM Matthew DeVore wrote:
> diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
> @@ -163,6 +163,35 @@ For shell scripts specifically (not exhaustive):
> + - In a piped sequence which spans multiple lines, put each statement
> + on a separate
On Mon, Sep 17, 2018 at 6:25 PM Matthew DeVore wrote:
> tests: Add linter check for pipe placement style
Until now, the various "lint" checks have been for genuine portability
problems (except perhaps 'test-lint-duplicates'). This new lint check
makes style violations worthy of failing "make test
On Mon, Sep 17, 2018 at 6:25 PM Matthew DeVore wrote:
> tests: split up pipes
This title explains the mechanical changes the patch is making but not
the intent. Perhaps reword it to say something like:
tests: avoid swallowing Git exit code upstream of a pipe
> Some pipes in tests lose the e
On Mon, Sep 17, 2018 at 6:25 PM Matthew DeVore wrote:
> t9109-git-svn-props.sh: split up several pipes
Similar to my comment about 5/6, this title talks about the mechanical
changes made by the patch but not the intent. Perhaps reword it like
this:
t9109: avoid swallowing Git exit code upstr
On Tue, Sep 18, 2018 at 1:48 AM Ævar Arnfjörð Bjarmason
wrote:
> "Work the same" is incorrect and needs to be "Works the same
> way". Fixes grammar in document anion I added in the recently landed
I, too, find those "document anions" problematic. Perhaps the
physicists around here can do somethin
On Tue, Sep 18, 2018 at 10:11 PM Matthew DeVore wrote:
> Yes, it's probably better to add a point about that. Here is the new
> documentation after applying your suggestions:
>
> - If a piped sequence which spans multiple lines, put each statement
s/which//
>on a separate line and put pipes
On Tue, Sep 18, 2018 at 10:56 PM Matthew DeVore wrote:
> On Mon, Sep 17, 2018 at 6:57 PM Eric Sunshine wrote:
> > On Mon, Sep 17, 2018 at 6:25 PM Matthew DeVore wrote:
> > > + cmp - $3
> >
> > This is just wrong. The "-" argument to 'c
On Thu, Sep 20, 2018 at 9:43 PM Matthew DeVore wrote:
> Add two guidelines:
Probably s/two/three/ or s/two/several/ since the patch now adds three
guidelines.
> - pipe characters should appear at the end of lines, and not cause
>indentation
The "not cause indentation" bit is outdated since
On Wed, Sep 19, 2018 at 10:10 AM Ævar Arnfjörð Bjarmason
wrote:
> Before this change the "git reflog expire" command didn't report any
> progress. This is the second command (after "pack-refs --all --prune")
> that the "gc" command will run.
> [...]
> That may just be some artifact of the reposito
On Wed, Sep 19, 2018 at 8:00 PM brian m. carlson
wrote:
> (I am having trouble getting make style to work, though, because it
> seems to invoke clang-format as a git subcommand, and I don't think that
> works. I may send a patch.)
You're probably missing this piece:
https://llvm.org/svn/llvm-pro
On Wed, Sep 19, 2018 at 6:25 PM Alexander Mills
wrote:
> The following command sequence exits with 1, and no stderr
>
> base='remotes/origin/dev';
> fork_point="$(git merge-base --fork-point "$base")";
>
> I cannot figure out why it's exiting with 1, but there is no stdout/stderr
Unable to reprod
4f7b81fed64ec8fbfc81952557f
> > Sébastien Guimmara
> > Nguyễn Thái Ngọc Duy
> > Eric Sunshine
> > Junio C Hamano
> > $ ./contrib/contacts/git-contacts
> > ./outgoing/0002-git-column.1-clarify-initial-description-provide-exa.patch
> > Junio C Ham
On Thu, Sep 20, 2018 at 1:47 PM wrote:
> On Thu, Sep 20, 2018 at 06:23:03PM +0200, Duy Nguyen wrote:
> > On Wed, Sep 19, 2018 at 03:59:58PM -0700, Junio C Hamano wrote:
> > > > @@ -23,7 +26,7 @@ OPTIONS
> > > >
> > > > --mode=::
> > > > Specify layout mode. See configuration variable column.ui
On Thu, Sep 20, 2018 at 2:04 PM Taylor Blau wrote:
> The recently-introduced "core.alternateRefsCommand" allows callers to
> specify with high flexibility the tips that they wish to advertise from
> alternates. This flexibility comes at the cost of some inconvenience
> when the caller only wishes
On Fri, Sep 21, 2018 at 2:47 PM Taylor Blau wrote:
> When in a repository containing one or more alternates, Git would
> sometimes like to list references from its alternates. For example, 'git
> receive-pack' list the objects pointed to by alternate references as
> special ".have" references.
> [
On Fri, Sep 21, 2018 at 2:47 PM Taylor Blau wrote:
> When in a repository containing one or more alternates, Git would
> sometimes like to list references from its alternates. For example, 'git
> receive-pack' list the objects pointed to by alternate references as
> special ".have" references.
> [
On Sat, Sep 22, 2018 at 2:05 PM Nguyễn Thái Ngọc Duy wrote:
> When multiple worktrees are used, we need rules to determine if
> something belongs to one worktree or all of them. Instead of keeping
> adding rules when new stuff comes, have a generic rule:
> [...]
> Signed-off-by: Nguyễn Thái Ngọc D
On Sat, Sep 22, 2018 at 2:05 PM Nguyễn Thái Ngọc Duy wrote:
> [...]
> The main worktree has to be treated specially because well.. it's
> special from the beginning. So HEAD from the main worktree is
> acccessible via the name "main/HEAD" (we can't use
> "worktrees/main/HEAD" because "main" under
On Sat, Sep 22, 2018 at 2:05 PM Nguyễn Thái Ngọc Duy wrote:
> Make use of the new ref aliases to pass refs from another worktree
> around and access them from the current ref store instead. This does
> not change any functionality, but when a problem shows up, we would
> report something like
>Fr
On Sat, Sep 22, 2018 at 2:05 PM Nguyễn Thái Ngọc Duy wrote:
> fsck is a repo-wide operation and should check all references no
> matter which worktree they are associated to.
>
> Reported-by: Jeff King
> Helped-by: Elijah Newren
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git a/t/t1450
On Sun, Sep 23, 2018 at 9:05 AM Lars Schneider wrote:
> I recently had to purge files from large Git repos (many files, many commits).
> The usual recommendation is to use `git filter-branch --index-filter` to purge
> files. However, this is *very* slow for large repos (e.g. it takes 45min to
> re
On Sun, Sep 23, 2018 at 1:04 PM Nguyễn Thái Ngọc Duy wrote:
> A new repo extension is added, worktreeConfig. When it is present:
>
> - Repository config reading by default includes $GIT_DIR/config _and_
>$GIT_DIR/config.worktree. "config" file remains shared in multiple
>worktree setup.
>
On Mon, Sep 24, 2018 at 4:58 PM Derrick Stolee via GitGitGadget
wrote:
> diff --git a/commit-reach.c b/commit-reach.c
> @@ -544,20 +544,42 @@ int can_all_from_reach_with_flag(struct object_array
> *from,
> {
> + from_one = deref_tag(the_repository, from_one,
> +
On Wed, Sep 26, 2018 at 5:53 AM Martin Ågren wrote:
> I came up with the following commit message. What do you think about it?
>
> t7005-editor: quote filename to fix whitespace-issue
>
> Commit 4362da078e (t7005-editor: get rid of the SPACES_IN_FILENAMES
> prereq, 2018-05-14) removed
On Thu, Sep 27, 2018 at 3:20 AM Elijah Newren wrote:
> Subject: [PATCH] commit: fix erroneous BUG, 'multiple renames on the same
> target? how?'
> [...]
> Signed-off-by: Elijah Newren
> ---
> diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
> @@ -359,4 +359,27 @@ test_expect_success 'new line
On Sat, Sep 29, 2018 at 11:30 AM Nguyễn Thái Ngọc Duy wrote:
> In many config-related tests it's common to check if a config variable
> has expected value and we want to print the differences when the test
> fails. Doing it the normal way is three lines of shell code. Let's add
> a function do to
On Sat, Sep 29, 2018 at 11:30 AM Nguyễn Thái Ngọc Duy wrote:
> A new repo extension is added, worktreeConfig. When it is present:
> [...]
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> @@ -2,8 +2,9 @@ CONFIGURATION FILE
> The Git
re later freed in the print functions.
>
> Nit: I think that in the past Eric Sunshine has recommended that I use
> active voice in patches, but "it was found" is passive.
>
> I tried to find the message that I was thinking of, but couldn't, so
> perhaps I'm inventi
On Sat, Sep 29, 2018 at 2:55 PM Stephen P. Smith wrote:
> Status variables were initialized in the collect phase and some
> variables were later freed in the print functions.
>
> A "struct wt_status" used to be sufficient for the output phase to
> work. It was designed to be filled in the collect
On Sat, Sep 29, 2018 at 3:10 PM Nguyễn Thái Ngọc Duy wrote:
> The main worktree has to be treated specially because well.. it's
Nit: s/well../well.../
> special from the beginning. So HEAD from the main worktree is
> acccessible via the name "main-worktree/HEAD" instead of
> "worktrees/main/HEAD
On Sat, Sep 29, 2018 at 3:11 PM Nguyễn Thái Ngọc Duy wrote:
> Make use of the new ref aliases to pass refs from another worktree
> around and access them from the current ref store instead. This does
> not change any functionality, but when a problem arises, we would like
> the reported messages t
On Sat, Sep 29, 2018 at 3:11 PM Nguyễn Thái Ngọc Duy wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt
> @@ -72,6 +72,11 @@ Options for `expire`
> +--single-worktree::
> + By default when `--all` is specified, reflo
On Sun, Sep 30, 2018 at 3:16 AM Duy Nguyen wrote:
> On Sun, Sep 30, 2018 at 6:33 AM Eric Sunshine wrote:
> > > diff --git a/builtin/config.c b/builtin/config.c
> > > @@ -645,7 +649,20 @@ int cmd_config(int argc, const char **argv, const
> > > char
On Tue, Oct 2, 2018 at 12:07 PM Nguyễn Thái Ngọc Duy wrote:
> In many config-related tests it's common to check if a config variable
> has expected value and we want to print the differences when the test
> fails. Doing it the normal way is three lines of shell code. Let's add
> a function do to a
On Tue, Oct 2, 2018 at 12:16 PM Duy Nguyen wrote:
> On Sun, Sep 30, 2018 at 7:36 AM Eric Sunshine wrote:
> > On Sat, Sep 29, 2018 at 3:11 PM Nguyễn Thái Ngọc Duy
> > wrote:
> > > +--single-worktree::
> > > + By default when `--all` is sp
On Mon, Oct 8, 2018 at 6:27 PM Stefan Beller wrote:
> On Mon, Oct 8, 2018 at 2:57 PM brian m. carlson
> wrote:
> > - if (line.len != 40)
> > - die("repack: Expecting 40 character sha1 lines only
> > from pack-objects.");
> > + if (line.len != the
On Tue, Oct 9, 2018 at 4:59 PM Junio C Hamano wrote:
> My inclination is to recommend to:
>
> (1) name the "show the current one" not "--current" but with some
> verb
>
> (2) display nothing when there is no current branch (i.e. detached
> HEAD) and without any error.
Sensible suggest
On Wed, Oct 10, 2018 at 5:29 AM Eric Sunshine wrote:
> On Tue, Oct 9, 2018 at 4:59 PM Junio C Hamano wrote:
> > My inclination is to recommend to:
> >
> > (1) name the "show the current one" not "--current" but with some
> > verb
> >
>
On Wed, Oct 10, 2018 at 4:54 AM Johannes Schindelin via GitGitGadget
wrote:
> We had not documented previously what happens when an `exec` command in
> an interactive rebase fails. Now we do.
>
> Signed-off-by: Johannes Schindelin
> ---
> diff --git a/Documentation/git-rebase.txt b/Documentation/
On Wed, Oct 10, 2018 at 6:14 AM Phillip Wood wrote:
> On 14/09/2018 00:49, Eric Sunshine wrote:
> > What if, instead of exit()ing directly, you drop the conditional and
> > instead return the value of read_author_script():
> >
> > return read_author_script(...);
On Fri, Oct 12, 2018 at 9:34 AM Daniels Umanovskis
wrote:
> When called with --show-current, git branch will print the current
> branch name and terminate. Only the actual name gets printed,
> without refs/heads. In detached HEAD state, nothing is output.
>
> Signed-off-by: Daniels Umanovskis
> -
On Mon, Oct 15, 2018 at 6:14 AM Johannes Schindelin via GitGitGadget
wrote:
> This patch adds the Git side of that feature: by setting http.sslBackend
> to "openssl" or "schannel", Git for Windows can now choose the SSL
> backend at runtime.
> [...]
> Signed-off-by: Johannes Schindelin
> ---
> di
On Mon, Oct 15, 2018 at 6:14 AM Brendan Forster via GitGitGadget
wrote:
> This config value is only used if http.sslBackend is set to "schannel",
> which forces cURL to use the Windows Certificate Store when validating
> server certificates associated with a remote server.
>
> This is only support
On Mon, Oct 15, 2018 at 5:47 AM Johannes Schindelin via GitGitGadget
wrote:
> Signed-off-by: Johannes Schindelin
> ---
> diff --git a/compat/mingw.c b/compat/mingw.c
> @@ -1800,16 +1800,27 @@ int mingw_getpagesize(void)
> struct passwd *getpwuid(int uid)
> {
> + static unsigned initialize
1501 - 1600 of 3976 matches
Mail list logo
