On Tue, Jan 5, 2016 at 4:12 PM, Dennis Kaarsemaker
wrote:
> git reflog (ab)uses the log machinery to display its list of log
> entries. To do so it must fake commit parent information for the log
> walker.
>
> For refs in refs/heads this is no problem, as they should only ever
> point to commits.
On Tue, Jan 5, 2016 at 8:20 PM, Dennis Kaarsemaker
wrote:
> On di, 2016-01-05 at 20:05 -0500, Eric Sunshine wrote:
>> On Tue, Jan 5, 2016 at 4:12 PM, Dennis Kaarsemaker
>> > + git update-ref --create-reflog -m "Creating ref" \
>> > +
On Tue, Jan 5, 2016 at 8:28 PM, Eric Sunshine wrote:
> On Tue, Jan 5, 2016 at 8:20 PM, Dennis Kaarsemaker
> wrote:
>> On di, 2016-01-05 at 20:05 -0500, Eric Sunshine wrote:
>>> Hmm, this test is successful for me on OS X even without the
>>> reflog-walk.c changes
On Thu, Nov 22, 2018 at 10:58 AM Ævar Arnfjörð Bjarmason
wrote:
> There's a regression related to this that I wanted to send a headsup
> for, but don't have time to fix today. Now range-diff in format-patch
> includes --stat output. See e.g. my
> https://public-inbox.org/git/20181122132823.9883-1-
On Mon, Dec 10, 2018 at 5:50 PM Silvio Fricke wrote:
> HTTP has several protocol versions. By default, libcurl is using HTTP/2
> today and check if the remote can use this protocol variant and fall
> back to a previous version if not.
>
> Under rare conditions it is needed to switch the used proto
On Tue, Dec 11, 2018 at 4:50 PM Thomas Gummerer wrote:
> On 12/10, Duy Nguyen wrote:
> > On Sun, Dec 9, 2018 at 9:04 PM Thomas Gummerer wrote:
> > > Move the worktree tests to t24* to adhere to that guideline. We're
> > > going to make use of the free'd up numbers in a subsequent commit.
> >
> >
On Thu, Dec 13, 2018 at 2:03 PM Stefan Beller wrote:
> In a028a1930c (fetching submodules: respect `submodule.fetchJobs`
> config option, 2016-02-29), we made sure to keep the default behavior
> of a fetching at most one submodule at once when not setting the
s/of a/of/
> newly introduced `submo
On Sun, Dec 16, 2018 at 7:12 AM Nguyễn Thái Ngọc Duy wrote:
> Uninitialized submodules have nothing valueable for us to be worried
> about. They are just SHA-1. Let "worktree remove" and "worktree move"
> continue in this case so that people can still use multiple worktrees
> on repos with optiona
On Sun, Dec 23, 2018 at 3:05 AM Duy Nguyen wrote:
> On Thu, Dec 20, 2018 at 2:48 PM Thomas Gummerer wrote:
> > +--[no-]overlay::
> > + In the default overlay mode files `git checkout` never
>
> -ECANTPARSE. Maybe "files" should be removed from this line?
Also, add a comma after "mode".
Clarify by improving the grammar and mentioning "git worktree add"
explicitly.
Reported-by: Олег Самойлов
Signed-off-by: Eric Sunshine
---
Reference:
https://public-inbox.org/git/0e640233-b2cb-465d-9713-bbece331c...@ya.ru/
Documentation/config/worktree.txt | 4 ++--
1 file changed
On Wed, Dec 26, 2018 at 6:05 PM wrote:
> A number of configuration options are not automatically detected by
> configure mechanisms, including the location of Perl and Python.
> [...]
> Signed-off-by: Randall S. Becker
> ---
> diff --git a/config.mak.uname b/config.mak.uname
> @@ -441,26 +441,45
On Thu, Dec 27, 2018 at 1:35 PM wrote:
> A number of configuration options are not automatically detected by
> configure mechanisms, including the location of Perl and Python.
>
> There was a problem at a specific set of operating system versions
> that caused getopt to have compile errors. Accoun
On Thu, Dec 27, 2018 at 11:26 AM Nguyễn Thái Ngọc Duy wrote:
> While at there, move exit() back to the caller. It's easier to see the
> flow that way then burying it in diff-no-index.c
s/then/than/
> Signed-off-by: Nguyễn Thái Ngọc Duy
On Thu, Dec 27, 2018 at 10:56 AM Nguyễn Thái Ngọc Duy wrote:
> "git config --worktree" can write to the write file whether
s/write file/right file/
> extensions.worktreeConfig is enabled or not. In order to do the same
> using config API, we need to determine the right file to write to. Add
> th
On Thu, Dec 27, 2018 at 10:56 AM Nguyễn Thái Ngọc Duy wrote:
> Do not handle prefix directly. It's simpler to use OPT_FILENAME()
> instead. The othe reason for doing this is because this code (where
s/othe/other/
> the deleted code is) will be factored out and called when "prefix" is
> not avail
On Thu, Dec 27, 2018 at 8:47 PM Masaya Suzuki wrote:
> When GIT_CURL_VERBOSE is set, libcurl produces request/response headers
> to stderr. However, if the response is an error response and
> CURLOPT_FAILONERROR is set, libcurl stops parsing the response, and it
> won't ump the headers. Showing HT
On Thu, Dec 27, 2018 at 5:39 PM wrote:
> A number of configuration options are not automatically detected by
> configure mechanisms, including the location of Perl and Python.
>
> There was a problem at a specific set of operating system versions
> that caused getopt to have compile errors. Accoun
On Fri, Dec 28, 2018 at 2:51 PM Masaya Suzuki wrote:
> On Fri, Dec 28, 2018 at 11:37 AM Eric Sunshine
> wrote:
> > On Thu, Dec 27, 2018 at 8:47 PM Masaya Suzuki
> > wrote:
> > > +test_expect_success 'failure in git-upload-pack is shown' '
> >
On Wed, Jan 2, 2019 at 4:38 AM Eric Wong wrote:
>
> strncat() has the same quadratic behavior as strcat() and is
> difficult-to-read and bug-prone. While it hasn't yet been a
> problem in git iself, strncat() found it's way into 'master'
s/iself/itself/
> of cgit and caused segfaults on my syst
On Tue, Jan 1, 2019 at 6:20 PM SZEDER Gábor wrote:
> [...]
> To my understanding both shells are right and conform to POSIX,
> because the standard allows both behavior by stating the following
s/behavior/behaviors/
> under '2.8.1 Consequences of Shell Errors':
>
> Reported-by: Max Kirillov
> S
On Thu, Jan 3, 2019 at 12:40 AM Jeff King wrote:
> On Mon, Dec 24, 2018 at 12:47:54AM -0800, nbelakov...@gmail.com wrote:
> > +test_expect_success 'validate worktree atom' '
> > + {
> > + echo master: $PWD &&
> > + echo master_worktree: $PWD/worktree_dir &&
> > + echo side: not che
On Thu, Jan 3, 2019 at 4:04 PM wrote:
> A number of configuration options are not automatically detected by
> configure mechanisms, including the location of Perl and Python.
>
> There was a problem at a specific set of operating system versions
> that caused getopt to have compile errors. Account
On Thu, Jan 3, 2019 at 4:04 PM wrote:
> The HPE NonStop (a.k.a. __TANDEM) platform cannot build git without
> using the FLOSS package supplied by HPE. The convenient location
> for including the relevant headers is in this file.
>
> The NSIG define is also not defined on __TANDEM, so we define it
On Fri, Jan 4, 2019 at 5:51 PM Junio C Hamano wrote:
> Nguyễn Thái Ngọc Duy writes:
> > Uninitialized submodules have nothing valueable for us to be worried
> > about. They are just SHA-1. Let "worktree remove" and "worktree move"
> > continue in this case so that people can still use multiple w
On Sun, Jan 6, 2019 at 1:09 PM Thomas Gummerer wrote:
> On 12/23, Eric Sunshine wrote:
> > The documentation for this option jumps right in with "With `add`",
> > without explaining that `add` is a sub-command of "git worktree".
> > Together with rather o
On Wed, Jan 9, 2019 at 5:19 PM Kim Gybels wrote:
> According to getenv(3)'s notes:
> [...]
> Since strings returned by getenv() are allowed to change on subsequent
> calls to getenv(), make sure to duplicate when caching external_diff_cmd
> from environment.
> [...]
> Signed-off-by: Kim Gybels
>
On Sun, Jan 13, 2019 at 3:52 AM Christian Couder
wrote:
> There is "extensions.partialclone" and "core.partialCloneFilter", but
> not "core.partialclone". Only "extensions.partialclone" is meant to
> contain a remote name.
>
> While at it, let's wrap the relevant code lines to keep them at a
> rea
On Sun, Jan 13, 2019 at 8:58 AM Luke Diamand wrote:
> Updating a shelved P4 changelist where one or more of the files have
> been moved does not work. Add a test for this.
Perhaps this message could give more detail about the actual problem
than the generic "does not work" which provides no usefu
On Tue, Jan 15, 2019 at 2:06 PM Nate Weaver wrote:
> Nevermind: I've been informed that this has already been fixed on the git
> trunk
> for gettext, and will be in the next release.
>
> (See: https://savannah.gnu.org/bugs/?49560)
Thanks for the follow-up report. It's good to know that this is f
On Tue, Jan 15, 2019 at 3:31 PM wrote:
> From `man sed` (on a Mac OS X box):
> The -E, -a and -i options are non-standard FreeBSD extensions and may not be
> available
> on other operating systems.
> [...]
> To be on the safe side, don't allow it.
>
> Signed-off-by: Torsten Bögershausen
> ---
>
On Tue, Jan 22, 2019 at 3:00 PM Torsten Bögershausen wrote:
> On 22.01.19 20:47, Junio C Hamano wrote:
> > tbo...@web.de writes:
> >> -/\bsed\s+-i/ and err 'sed -i is not portable';
> >> +/\bsed\s+-[^efn]\s+/ and err 'Not portable option with sed (use only
> >> [-n] [-e command] [-f comma
On Fri, Jan 25, 2019 at 12:52 PM Elijah Newren wrote:
> On Fri, Jan 25, 2019 at 9:41 AM Derrick Stolee wrote:
> > On 1/25/2019 11:54 AM, Elijah Newren wrote:
> > > + printf "0f9645804ebb04cc3eef91f799eb7fb54d70cefb\0::100644 100644
> > > 100644 f00c965d8307308469e537302baa73048488f162
> > >
On Sat, Jan 26, 2019 at 3:53 AM Ævar Arnfjörð Bjarmason
wrote:
> Which, looking at this again, you'd only want if a previous test in the
> file was leaking its state. That's not the case, so this isn't needed
> and you can just apply this on top:
>
> test_expect_success \
> 'autho
On Sun, Jan 27, 2019 at 2:28 PM Sven van Haastregt wrote:
> Until now, `git submodule summary` was always emitting 7-character
> SHA-1s that have a higher chance of being ambiguous for larger
> repositories. Use `git rev-parse --short` instead, which will
> determine suitable short SHA-1 lengths.
On Tue, Jan 29, 2019 at 8:12 AM Jeff King wrote:
> On Tue, Jan 29, 2019 at 06:18:58AM +0100, Sebastian Staudt wrote:
> > This ensures the given working tree is used for --dirty.
>
> There's been a lot of digging and discussion on the list about what
> happens if we don't do this. Could we summariz
On Tue, Jan 29, 2019 at 3:11 PM Jeremy Huddleston Sequoia
wrote:
> This was causing problems with ppc/sha1ppc.S
What problems, exactly?
> Signed-off-by: Jeremy Huddleston Sequoia
> ---
> diff --git a/.gitignore b/.gitignore
> @@ -195,7 +195,7 @@
> -*.[aos]
> +*.[ao]
On Tue, Jan 29, 2019 at 4:19 PM Jeremy Huddleston Sequoia
wrote:
> Subject: t0500: New regression test for git add of a path that contains a
> .git directory
Please describe the actual problem here in the commit message so
readers of this change can understand what this is all about.
> Signed-o
On Wed, Jan 30, 2019 at 6:37 AM Jeremy Huddleston Sequoia
wrote:
> > On Jan 30, 2019, at 03:33, Eric Sunshine wrote:
> > On Tue, Jan 29, 2019 at 3:11 PM Jeremy Huddleston Sequoia
> > wrote:
> >> This was causing problems with ppc/sha1ppc.S
> >
> > What pro
On Wed, Jan 30, 2019 at 7:29 AM Eric Sunshine wrote:
> On Wed, Jan 30, 2019 at 6:37 AM Jeremy Huddleston Sequoia
> wrote:
> > > On Jan 30, 2019, at 03:33, Eric Sunshine wrote:
> > > On Tue, Jan 29, 2019 at 3:11 PM Jeremy Huddleston Sequoia
> > > wrote:
> >
On Wed, Jan 30, 2019 at 6:21 PM Max Kirillov wrote:
> If packed-refs is marked as sorted but not really sorted it causes
> very hard to comprehend misbehavior of reference resolving - a reference
> is reported as not found.
>
> As the scope of the issue is not clear, make it visible by failing
> p
On Wed, Jan 30, 2019 at 4:49 AM Nguyễn Thái Ngọc Duy wrote:
> "git checkout" doing too many things is a source of confusion for many
> users (and it even bites old timers sometimes). To remedy that, the
> command will be split into two new ones: switch and
> something-to-checkout-paths. The good o
On Thu, Jan 31, 2019 at 12:29 AM Duy Nguyen wrote:
> On Thu, Jan 31, 2019 at 7:50 AM Eric Sunshine wrote:
> > On Wed, Jan 30, 2019 at 4:49 AM Nguyễn Thái Ngọc Duy
> > wrote:
> > > +'git switch' [] [--guess]
> > > +'git switch' []
On Wed, Jan 30, 2019 at 4:49 AM Nguyễn Thái Ngọc Duy wrote:
> The shortcut of these options do not make much sense when used with
> switch. And their descriptions are also tied to checkout
> out. Move -b/-B to cmd_checkout() and new -c/-C with the same
> functionality in cmd_switch_branch()
>
> Si
On Wed, Jan 30, 2019 at 4:50 AM Nguyễn Thái Ngọc Duy wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh
> @@ -0,0 +1,91 @@
> +test_expect_success 'switch and create branch' '
> + test_when_finished git switch master &&
> + git switc
On Thu, Jan 31, 2019 at 1:24 AM Eric Sunshine wrote:
> On Thu, Jan 31, 2019 at 12:29 AM Duy Nguyen wrote:
> > On Thu, Jan 31, 2019 at 7:50 AM Eric Sunshine
> > wrote:
> > > On Wed, Jan 30, 2019 at 4:49 AM Nguyễn Thái Ngọc Duy
> > > wrote:
> > > &
On Wed, Jan 30, 2019 at 4:50 AM Nguyễn Thái Ngọc Duy wrote:
> The new command "git switch" is added to avoid the confusion of
> one-command-do-all "git checkout" for new users. They are also helpful
> to avoid ambiguation context.
>
> For these reasons, promote it everywhere possible. This include
On Thu, Jan 31, 2019 at 2:44 AM Duy Nguyen wrote:
> On Thu, Jan 31, 2019 at 1:25 PM Eric Sunshine wrote:
> > I find, however, that the top-level git-switch "DESCRIPTION" section,
> > which talks about "switching branches" doesn't actually ever explain
&
On Thu, Jan 31, 2019 at 4:21 AM Nguyễn Thái Ngọc Duy wrote:
> The description of git-commit jumps right into the commit content, which
> is important, but it fails to mention how the commit is "added" to the
> repository. Update the first paragraph saying a bit more about branch
> update to fill t
On Thu, Jan 31, 2019 at 1:17 PM Jeremy Sequoia wrote:
> > On Jan 31, 2019, at 09:57, Junio C Hamano wrote:
> > I still do not see what problem you need a "solution" for in the
> > first place---I saw a few comments asking it in the thread, but saw
> > no answer. ppc/sha1ppc.S is already tracked,
On Thu, Jan 31, 2019 at 6:04 AM Duy Nguyen wrote:
> On Thu, Jan 31, 2019 at 5:49 PM Eric Sunshine wrote:
> > On Thu, Jan 31, 2019 at 4:21 AM Nguyễn Thái Ngọc Duy
> > wrote:
> > > +NOTES
> > > +-
> > > +If a branch is associated with the working
On Fri, Feb 1, 2019 at 12:44 AM Jiang Xin wrote:
>> Junio C Hamano 于2019年2月1日周五 上午5:44写道：
> > Move this outside loop, not for efficiency but for clarity. This
> > helper function creates a single empty tree and bunch of commits
> > that hold the same empty tree, arranged as a single strand of
> >
On Mon, Jan 28, 2019 at 7:58 AM Marketa Calabkova wrote:
> On 15/01/2019 15:03, Marketa Calabkova wrote:
> > I am writing to report a bug. The original report is from my colleague, I
> > am also providing his suggestions.
> >
> > There is insufficient locking for worktree addition. Adding worktre
On Fri, Feb 1, 2019 at 3:36 AM Shahzad Lone wrote:
> diff --git a/pack-revindex.c b/pack-revindex.c
> @@ -186,9 +186,9 @@ int find_revindex_position(struct packed_git *p, off_t
> ofs)
> struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs)
> {
> -
> + int pos;
>
On Fri, Feb 1, 2019 at 3:36 AM Shahzad Lone wrote:
> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
> @@ -197,9 +197,8 @@ static unsigned long write_large_blob_data(struct
> git_istream *st, struct hashfi
>const struct object_id *oid)
> {
On Fri, Feb 1, 2019 at 11:22 AM Jiang Xin wrote:
> Add test cases for git pack-redundant to validate new algorithm for git
> pack-redundant.
>
> Signed-off-by: Jiang Xin
> ---
> diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
> @@ -0,0 +1,510 @@
> +# Note: DO NOT run it in a su
On Fri, Feb 1, 2019 at 8:17 AM Duy Nguyen wrote:
> I'm not going to bother you with code yet (although if you want, you
> can check out branch worktree-name on my gitlab repo), but this is
> what the user facing changes look like. Looking good?
>
> -- 8< --
> diff --git a/Documentation/git-worktre
On Fri, Feb 1, 2019 at 8:55 AM Sebastian Staudt wrote:
> We don't use NEED_WORK_TREE when running the git-describe builtin,
> since you should be able to describe a commit even in a bare repository.
> However, the --dirty flag does need a working tree. Since we don't call
> setup_work_tree(), it u
On Fri, Feb 1, 2019 at 4:03 PM Junio C Hamano wrote:
> Eric Sunshine writes:
> > On Fri, Feb 1, 2019 at 11:22 AM Jiang Xin wrote:
> >> +# Note: DO NOT run it in a subshell, otherwise the variables will not be
> >> set
> >
> > Which variables won't
On Fri, Feb 1, 2019 at 5:04 PM wrote:
> Add an atom providing the path of the linked worktree where this ref is
> checked out, if it is checked out in any linked worktrees, and empty
> string otherwise.
>
> Signed-off-by: Nickolai Belakovski
> ---
> diff --git a/Documentation/git-for-each-ref.txt
On Fri, Feb 1, 2019 at 5:04 PM wrote:
> Subject: branch: Add an extra verbose output displaying worktree path for
> refs checked out in a linked worktree
Overlong subject. Perhaps shorten it to:
branch: display worktree path in -v -v mode
or something, and use the longer description as the
On Sat, Feb 2, 2019 at 5:05 AM Sebastian Staudt wrote:
> Am Fr., 1. Feb. 2019 um 21:12 Uhr schrieb Eric Sunshine
> :
> > On Fri, Feb 1, 2019 at 8:55 AM Sebastian Staudt wrote:
> > > diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
> > > @@ -145,14 +145
On Sun, Feb 3, 2019 at 3:37 AM Martin Ågren wrote:
> `usage` tries to call $0, which might very well be "./doc-diff", so if
> we `cd_to_toplevel` before calling `usage`, we'll end with an error to
> the effect of "./doc-diff: not found" rather than a friendly `doc-diff
> -h` output. Granted, all o
On Sun, Feb 3, 2019 at 4:08 AM Eric Sunshine wrote:
> I wonder if a more fruitful, longer-term fix which would save us from
> having to worry about this in the future, would be to make
> git-sh-setup.sh remember the original $0 before cd_to_toplevel() and
> then employ the origina
On Sun, Feb 3, 2019 at 5:37 AM Martin Ågren wrote:
> On Sun, 3 Feb 2019 at 10:12, Eric Sunshine wrote:
> > On Sun, Feb 3, 2019 at 4:08 AM Eric Sunshine
> > wrote:
> > > I wonder if a more fruitful, longer-term fix which would save us from
> > > having to worr
e
submodule directory. It would be helpful for the commit message to
explain this potential failure in enough detail for someone working in
this area in the future to understand any implications of changes to
this code.
> Signed-off-by: Sven van Haastregt
> ---
> Differences since v2: Simp
On Mon, Feb 4, 2019 at 1:47 PM Junio C Hamano wrote:
> Eric Sunshine writes:
> > On Sun, Feb 3, 2019 at 4:01 PM Sven van Haastregt wrote:
> >> We cannot always rely on successfully invoking `git rev-parse` in the
> >> submodule directory. Keep the old metho
On Thu, Mar 28, 2019 at 1:17 PM Christian Couder
wrote:
> Otherwise the error from `git rev-parse` is uselessly
> polluting the debug output.
>
> Signed-off-by: Christian Couder
> ---
> diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
> @@ -40,7 +40,7 @@ commit_peeling_shows_parents ()
> -
On Mon, Apr 1, 2019 at 7:52 AM SZEDER Gábor wrote:
> [...]
> Let's make display_progress() return void, too.
>
> Signed-off-by: SZEDER Gábor
> ---
> diff --git a/progress.c b/progress.c
> @@ -78,12 +78,12 @@ static int is_foreground_fd(int fd)
> -static int display(struct progress *progress, uint
On Mon, Apr 1, 2019 at 7:52 AM SZEDER Gábor wrote:
> [...]
> To prepare for those changes assemble the changing parts in a separate
> strbuf kept in 'struct progress' before printing.
>
> Signed-off-by: SZEDER Gábor
> ---
> diff --git a/progress.c b/progress.c
> @@ -80,36 +81,42 @@ static int is_
On Tue, Apr 2, 2019 at 1:45 AM Eric Sunshine wrote:
> On Mon, Apr 1, 2019 at 7:52 AM SZEDER Gábor wrote:
> > + if (show_update) {
> > [...]
> > progress_update = 0;
> > - return;
> > }
>
> Removal
On Wed, Apr 3, 2019 at 6:15 PM Mark Kharitonov
wrote:
> C:\Dayforce\56 [release/r-856 ≡]> git --version
> git version 2.18.0.windows.1
> C:\Dayforce\56 [release/r-856 ≡]> git worktree list
> [...]
> C:/Dayforce/56 f9c36d3a2b [release/r-856]
> C:/Dayforce/56 f9c36d3a2b [release/r-856]
>
> I
On Fri, Apr 5, 2019 at 2:24 PM Jeff King wrote:
> On Fri, Apr 05, 2019 at 12:50:33PM +0200, SZEDER Gábor wrote:
> > > + git cat-file commit $commit |
> > > + perl -lpe "/^author/ && print q(parent $blob)" \
> > > + >broken-commit &&
>
> > Wouldn't a 'sed' one-liner suffice, s
On Sun, Apr 7, 2019 at 7:43 PM SZEDER Gábor wrote:
> [...]
> We could improve the error message, of course, but let's just default
> to HEAD in a bare repository instead, as most likely that is what the
> user wanted anyway (if they wanted to start from an other commit, then
> they would have spec
On Mon, Apr 8, 2019 at 10:31 PM Taylor Blau wrote:
> On Mon, Apr 08, 2019 at 03:44:25PM +0900, Junio C Hamano wrote:
> > Eric Sunshine writes:
> > >> > > + git cat-file commit $commit |
> > >> > > + perl -lpe "/^author/ &&am
On Tue, Apr 9, 2019 at 1:09 AM Taylor Blau wrote:
> On Mon, Apr 08, 2019 at 11:28:19PM -0400, Eric Sunshine wrote:
> > I suspect that Junio's "Looks good" was referring to the 'sed expression.
>
> I think that you are right -- and I'll happily _not_ introdu
On Tue, Apr 9, 2019 at 6:27 AM Nguyễn Thái Ngọc Duy wrote:
> A new attribute "precious" is added to indicate that certain files
> have valuable content and should not be easily discarded even if they
> are ignored or untracked.
> [...]
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff --git a/t/
On Wed, Apr 10, 2019 at 7:35 PM brian m. carlson
wrote:
> [...]
> Note that we are guaranteed to always correctly encode carriage returns
> when writing quoted-printable since we explicitly specify the line
> ending as "\n", forcing MIME::QuotedPrint to encode our carriage return
> as "=OD".
s/=O
On Fri, Apr 12, 2019 at 8:00 AM Johannes Schindelin via GitGitGadget
wrote:
> When building with certain build options, some commands are excluded
> from the build. For example, `git-credential-cache` is skipped when
> building with `NO_UNIX_SOCKETS`.
>
> Let's not build or package documentation f
On Sun, Apr 14, 2019 at 5:09 PM Thomas Gummerer wrote:
> [...]
> However it can still be useful to have the function name that 'git
> diff' extracts as additional context for the change.
> [...]
> Signed-off-by: Thomas Gummerer
> ---
> diff --git a/range-diff.c b/range-diff.c
> @@ -102,9 +102,12
On Sun, Apr 14, 2019 at 5:10 PM Thomas Gummerer wrote:
> [...]
> Introduce a new range diff hunk header, that's enclosed by "##",
> similar to how line numbers in diff hunks are enclosed by "@@", and
> give human readable information of what exactly happened to the file,
> including the file name.
On Sun, Apr 14, 2019 at 11:10 PM Junio C Hamano wrote:
> Eric Sunshine writes:
> >> +Documentation/GIT-EXCLUDED-PROGRAMS: Makefile config.mak.uname
> >> + $(QUIET_GEN)echo "EXCLUDED_PROGRAMS := $(EXCLUDED_PROGRAMS)" >$@
> >
> >
On Mon, Apr 15, 2019 at 12:16 AM Eric Sunshine wrote:
> When composing that email, I originally wrote $(wildcard
> config.mak.autogen) as the suggestion but changed it to the looser
> $(wildcard config.mak*) when I realized that the developer's own
> config.mak probably ought t
On Wed, Apr 17, 2019 at 1:32 AM Junio C Hamano wrote:
> "Emily Shaffer via GitGitGadget" writes:
> > +Now that you've written your manpage, you'll need to build it explicitly.
> > We
> > +convert your AsciiDoc to troff which is man-readable like so:
> > +
> > +make all doc
> > +man Documentation
On Wed, Apr 17, 2019 at 12:07 AM Alex Henrie wrote:
> A common workflow is to make a commit on a local branch, push the branch
> to the remote, check out the remote branch on a second computer, amend
> the commit on the second computer, force-push back to the remote branch,
> and finally submit a
On Sun, Apr 21, 2019 at 9:19 AM Junio C Hamano wrote:
> diff --git a/Makefile b/Makefile
> @@ -822,12 +822,12 @@ VCSSVN_LIB = vcs-svn/lib.a
> -LIB_H := $(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null ||
> \
> +LIB_H := $(shell (git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/
On Mon, Apr 22, 2019 at 1:07 AM Denton Liu wrote:
> In git-difftool, these options specify which tool to ultimately run. As
> a result, they are logically conflicting. Explicitly disallow these
> options from being used together.
>
> Signed-off-by: Denton Liu
> ---
> diff --git a/builtin/difftool
On Mon, Apr 22, 2019 at 1:07 AM Denton Liu wrote:
> [...]
> Rewrite `get_merge_tool` to return whether or not the tool was guessed
> and make git-mergetool call this function instead of duplicating the
> logic. Also, let `$GIT_MERGETOOL_GUI` be set to determine whether or not
> the guitool will be
On Wed, Apr 24, 2019 at 7:26 AM SZEDER Gábor wrote:
> On second thought, however, I'm not sure that such a '--dedup' option
> would be all that useful in the above cases. If the users have to
> adjust their 'git ls-files' invocation by specifying '--dedup' to
> avoid the same paths listed multipl
On Thu, Apr 25, 2019 at 11:51 AM Elijah Newren wrote:
> This test used an author with non-ascii characters in the name, but
> no special commit message. It then grep'ed for those non-ascii
> characters, but those are guaranteed to exist regardless of the
> reencoding process since the reencoding
On Thu, Apr 25, 2019 at 11:51 AM Elijah Newren wrote:
> Since git supports commit messages with an encoding other than utf-8,
> allow fast-import to import such commits. This may be useful for folks
> who do not want to reencode commit messages from an external system, and
> may also be useful to
On Thu, Apr 25, 2019 at 5:10 PM Denton Liu wrote:
> Before, in t2018, if do_checkout failed to create `branch2`, the next
> test-case would run `git branch -D branch2` but then fail because it was
> expecting `branch2` to exist, even though it doesn't. As a result, an
> early failure could cause a
On Thu, Apr 25, 2019 at 10:50 PM Junio C Hamano wrote:
> Eric Sunshine writes:
> > test_when_finished '
> > git checkout branch1 &&
> > test_might_fail git branch -D branch2
> > ' &&
>
> Perhaps. Be careful in ch
On Mon, Apr 29, 2019 at 6:04 PM Thomas Braun via GitGitGadget
wrote:
> Since commit 0c499ea60f (send-pack: demultiplex a sideband stream with
> status data, 2010-02-05) the built-in send-pack uses the side-band-64k
> capability if advertised by the server.
>
> Unfortunately this breaks pushing ove
On Mon, Apr 29, 2019 at 6:06 PM Jarosław Honkis via GitGitGadget
wrote:
> When a user is asked for credentials there is no need to mask the
> username, so the PROMPT_ASKPASS flag on calling credential_ask_one for
> login is unnecessary.
>
> The `credential_ask_one()` function internally uses `git_
On Sat, May 4, 2019 at 10:39 PM Boxuan Li wrote:
> The exit code of the upstream in a pipe is ignored thus we should avoid
> using it. By writing out the output of the git command to a file, we can
> test the exit codes of both the commands.
>
> Signed-off-by: Boxuan Li
> ---
> diff --git a/t/t42
On Sun, May 5, 2019 at 3:43 PM Jeffrey Walton wrote:
> I have a PowerMac I use for testing. [...]
> make -C t/ all
> readline() on unopened filehandle test_must_fail
> run_sub_test_lib_test at check-non-portable-shell.pl line 34.
> Modification of a read-only value attempted at
> check-non-
On Mon, May 6, 2019 at 4:30 PM Emily Shaffer wrote:
> On Fri, May 03, 2019 at 06:04:15PM +0300, Konstantin Kharlamov wrote:
> > Interactive rebase (i.e. for example "git rebase -i HEAD~10") is used most
> > often to apply an action to a single commit, e.g. "rename", "edit", "fixup",
> > etc…
> >
>
On Tue, May 7, 2019 at 5:51 PM Johannes Schindelin via GitGitGadget
wrote:
> [...]
> Let's fix this by making sure that the Windows PID is written into
> `gc.pid` in this test script soo that `git.exe` is able to understand
> that that process does indeed still exist.
>
> Signed-off-by: Johannes S
On Wed, May 8, 2019 at 6:56 AM Junio C Hamano wrote:
> Since e67a228cd8a ("send-email: automatically determine
> transfer-encoding"), the value of sendmail.transferencoding in the
> configuration file is ignored, because $target_xfer_encoding is
s/,//
> already defined read_config sub parses the
On Wed, May 8, 2019 at 6:28 PM Ævar Arnfjörð Bjarmason wrote:
> On Sun, May 05 2019, Eric Sunshine wrote:
> > On Sun, May 5, 2019 at 3:43 PM Jeffrey Walton wrote:
> >> readline() on unopened filehandle test_must_fail
> >
> > Given [1], I can see (I gue
1301 - 1400 of 3976 matches
Mail list logo
