On Fri, Jan 18, 2019 at 10:40:55PM +, Eric Wong wrote:
> Steve Keller wrote:
> > $ git reflog expire --all
>
> I've never used "git reflog" directly, but I think you need to
> add "--expire=all" to cover all time. "--all" is only for all
> branches, so you need "--expire=" is for a time
On Friday, January 18, 2019 11:35:22 AM MST Junio C Hamano wrote:
> "Stephen P. Smith" writes:
> I think doing two things in this step (i.e. reverting Linus's "auto"
> support from 1/5, and adding "auto" that is similar to color's auto)
> is OK, but then the title should list both. It sounded lik
Add --gpg-sign option in commit-tree, which was documented, but not
implemented, in 55ca3f99ae. Add tests for the --gpg-sign option.
Signed-off-by: Brandon Richardson
---
Hi all,
Third and (hopefully) final version. Thanks again Martin for the helpful
comments.
---
builtin/commit-tree.c|
Want to shoot photos for your products and retouching also i needed?
We are studio special for photo shooting and retouching.
For your photos:
White background, Optimized for Shopify, Retouching included
Revisions accepted
We can also give you dedicate editing service for your photos
Let me kn
On Fri, Jan 18, 2019 at 8:10 AM Duy Nguyen wrote:
>
> On Fri, Jan 18, 2019 at 8:04 PM Patrick Hogg wrote:
> >
> > On Fri, Jan 18, 2019 at 4:21 AM Duy Nguyen wrote:
> >>
> >> On Fri, Jan 18, 2019 at 9:28 AM Patrick Hogg wrote:
> >> >
> >> > ac77d0c37 ("pack-objects: shrink size field in struct o
Ævar Arnfjörð Bjarmason writes:
> This was reviewed & discussed shortly before 2.20 went out the door,
> but the changes deemed too significant during the RC period, and
> instead we had my much smaller 01ca387774 ("commit-graph: split up
> close_reachable() progress output", 2018-11-19) as a fi
Ben Peart writes:
> checkout: add test to demonstrate regression with checkout -b on
> initial commit
> checkout: fix regression in checkout -b on intitial checkout
>
> builtin/checkout.c | 6 ++
> t/t2018-checkout-branch.sh | 11 +++
> 2 files changed, 17 insertions
On Thu, Jan 17, 2019 at 08:05:24PM +0700, Nguyễn Thái Ngọc Duy wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff.c | 113 ++---
> 1 file changed, 52 insertions(+), 61 deletions(-)
>
> diff --git a/diff.c b/diff.c
> index 4398b30f47..1b0
On Thu, Jan 17, 2019 at 08:06:09PM +0700, Nguyễn Thái Ngọc Duy wrote:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> diff.c | 6 +++---
> parse-options.h | 3 ++-
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/diff.c b/diff.c
> index 3e7c36524d..cc10b27df0 100644
> -
On Fri, Jan 18, 2019 at 3:22 PM Junio C Hamano wrote:
> * en/rebase-merge-on-sequencer (2019-01-07) 8 commits
> - rebase: implement --merge via the interactive machinery
> - rebase: define linearization ordering and enforce it
> - git-legacy-rebase: simplify unnecessary triply-nested if
> - gi
On Fri, Jan 18, 2019 at 01:55:58PM -0500, Ben Peart wrote:
> From: Ben Peart
>
> When doing a 'checkout -b' do a full checkout including updating the working
> tree when doing the initial checkout. This fixes the regression in behavior
> caused by fa655d8411 checkout: optimize "git checkout -b "
On Fri, Jan 18, 2019 at 3:36 AM Ævar Arnfjörð Bjarmason
wrote:
>
>
> On Fri, Jan 18 2019, Farhan Khan wrote:
>
> > Hi all,
> >
> > I am trying to understand how git's index-pack works, particularly how
> > it calculates the packfile checksum and idxfile checksum.
>
> It's unclear if this is what y
On Fri, Jan 18, 2019 at 3:18 PM Junio C Hamano wrote:
>
> Stefan Beller writes:
>
> > 74d4731da1f (submodule--helper: replace connect-gitdir-workingtree by
> > ensure-core-worktree, 2018-08-13) forgot to exit the submodule operation
> > if the helper could not ensure that core.worktree is set cor
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
A handful of topics graduated to '
Stefan Beller writes:
> 74d4731da1f (submodule--helper: replace connect-gitdir-workingtree by
> ensure-core-worktree, 2018-08-13) forgot to exit the submodule operation
> if the helper could not ensure that core.worktree is set correctly.
>
> Signed-off-by: Stefan Beller
> ---
> git-submodule.s
Steve Keller wrote:
> $ git reflog expire --all
I've never used "git reflog" directly, but I think you need to
add "--expire=all" to cover all time. "--all" is only for all
branches, so you need "--expire=" is for a time range.
Fwiw, I use a single command:
git -c gc.reflogExpire=n
Steve Keller wrote:
> After converting from SVN to git using git svn init + git svn fetch,
> my SVN tags appear as remote branches in git. I find many suggestions
> to convert these to git tags by calling git tag -a
> but this gives something like this
Hi Steve, instead of an annotated tag ("-
Thanks for adding the test.
On Fri, 2019-01-18 at 22:26 +, Eric Wong wrote:
> David Turner wrote:
> > Let's try this version.
>
> Thanks!
>
> Tested-by: Eric Wong
>
> Not sure if t1512 would be the best place to put the test, but
> having a repo with ambiguous data already at hand was ea
On Fri, Jan 18 2019, Jeff King wrote:
> On Fri, Jan 18, 2019 at 09:59:21PM +0100, Johannes Schindelin wrote:
>
>> By that reasoning all the preparatory work for switching to SHA-256 and
>> making the references in the Git code base less tied to SHA-1 would be
>> irrelevant now, "because we can c
David Turner wrote:
> Let's try this version.
Thanks!
Tested-by: Eric Wong
Not sure if t1512 would be the best place to put the test, but
having a repo with ambiguous data already at hand was easiest.
-8<---
Subject: [PATCH] t1512: test ambiguous cat-file --batch and --batch-outpu
> I dunno. This is why I submitted the initial patch as the simplest fix. ;)
>
The first patch is
Reviewed-by: Stefan Beller
Diffing across both patches, this seems to be the relevant part:
---8<---
@@ -,14 +1116,13 @@ static void collect_some_attrs(const struct
index_state *istate,
On Fri, Jan 18, 2019 at 2:17 PM Nickolai Belakovski
wrote:
>
>
> I think avoiding this would be check, we can simply check ref->kind ==
> FILTER_REFS_BRANCHES ahead of calling into get_worktree_path and
> provide an empty string otherwise.
>
*would be check -> would be cheap
I will start a separate thread containing these replies for the
potential change to allow deleting branches checked out in worktrees.
Getting back on track for this series, specifically this 2/3 patch,
how do you feel about it? As I pointed out the goal is to communicate
to the user that the branc
On Mon, Jan 7, 2019 at 10:20 AM Junio C Hamano wrote:
> When seeing a tag or note ref, by definition that's not something we
> can have checked out in any worktree. I wonder if it is worth to
> optimize further by omitting this lookup when ref is not a local
> branch?
>
> IOW, with a typical numb
74d4731da1f (submodule--helper: replace connect-gitdir-workingtree by
ensure-core-worktree, 2018-08-13) forgot to exit the submodule operation
if the helper could not ensure that core.worktree is set correctly.
Signed-off-by: Stefan Beller
---
git-submodule.sh | 2 +-
1 file changed, 1 insertion
On Fri, Jan 18, 2019 at 04:34:58PM -0500, Jeff King wrote:
> When 06a604e670 later refactored the macro code, it dropped maybe_real
> entirely. This missed the fact that "maybe_real" could be unset for two
> reasons: because of a macro, or because it was never found during
> parsing. This had two
On Fri, Jan 18, 2019 at 11:58:01AM -0500, Jeff King wrote:
> Now, on to the actual bug. The simplest reproduction is:
>
> (echo "[attr]foo bar"; echo "* foo") >.gitattributes
> git check-attr foo file
Actually, even simpler is to just "binary", which is pre-defined as a
macro. :)
> which sh
On Fri, Jan 18, 2019 at 09:59:21PM +0100, Johannes Schindelin wrote:
> By that reasoning all the preparatory work for switching to SHA-256 and
> making the references in the Git code base less tied to SHA-1 would be
> irrelevant now, "because we can cross that bridge when we reach it".
>
> You ar
Johannes Schindelin writes:
> Hi Junio,
>
> On Fri, 18 Jan 2019, Junio C Hamano wrote:
>
>> Johannes Schindelin writes:
>>
>> > I am about to submit a new iteration of my patch series, would it be too
>> > much trouble for you to rebase on top? If it would be, let me know, then I
>> > will reba
Hi Junio,
On Fri, 18 Jan 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > I am about to submit a new iteration of my patch series, would it be too
> > much trouble for you to rebase on top? If it would be, let me know, then I
> > will rebase on top of yours.
>
> Or both of you k
Brandon Richardson writes:
> - if (skip_prefix(arg, "-S", &sign_commit))
> + if(!strcmp(arg, "--gpg-sign")) {
Style. "if (!strcmp(arg, "--gpg-sign")) {"
> + skip_prefix(arg, "--gpg-sign", &sign_commit);
> + continue;
Technically, skippin
Hi,
On Fri, 18 Jan 2019, Junio C Hamano wrote:
> Ævar Arnfjörð Bjarmason writes:
>
> > On Thu, Jan 17 2019, Barret Rhoden wrote:
> >
> >> - die("Could not open skip list: %s", path);
> >> [...]
> >> + die("Could not open skip list: %s", path);
> >
> > You're just moving this a
Hi Phillip,
On Fri, 18 Jan 2019, Phillip Wood wrote:
> On 18/01/2019 12:19, Slavica Đukić wrote:
> >
> > On 18-Jan-19 12:20 PM, Phillip Wood wrote:
> > >
> > > I think this round is looking good I've got a couple of comments
> > > about the translation of the help text but everything else looks
"Matthew Kraai via GitGitGadget" writes:
> From: Matthew Kraai
>
> After `git add -N `, the index is in a special state. A state for
> which the built-in stash was not prepared, as it failed to initialize
> the `rev` structure in that case before using `&rev.pending`.
>
> Detailed explanation: I
Hi Junio,
On Fri, 18 Jan 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > Especially on Windows, where Unix shell scripting is a foreign endeavor, and
> > an expensive one at that, we really want to avoid running through the Bash.
> >
> > This not only makes
Junio C Hamano writes:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
>> Especially on Windows, where Unix shell scripting is a foreign endeavor, and
>> an expensive one at that, we really want to avoid running through the Bash.
>>
>> This not only makes everything faster, but also more ro
Ben Peart writes:
> From: Ben Peart
>
> When doing a 'checkout -b' do a full checkout including updating the working
> tree when doing the initial checkout. This fixes the regression in behavior
> caused by fa655d8411 checkout: optimize "git checkout -b "
>
> Signed-off-by: Ben Peart
> ---
>
SZEDER Gábor writes:
> On Wed, Nov 21, 2018 at 06:32:19AM -0500, Derrick Stolee wrote:
>> >>I rename these variables to 'num_large_edges', because the commit
>> >>graph file format speaks about the 'Large Edge List' chunk.
>> >>
>> >>However, I do find that the term 'extra' makes much more sense
"Stephen P. Smith" writes:
> +check_date_format() {
> + format=$1
> + t=$(($TEST_DATE_NOW - $2))
> + expect=$3
Notice that neither $format nor $1 is used in this test, which means
that "check_date_format" is not a generic "I can take a format
parameter to check the specified one". S
On Fri, Jan 18, 2019 at 01:55:57PM -0500, Ben Peart wrote:
> From: Ben Peart
>
> Commit fa655d8411 checkout: optimize "git checkout -b " introduced
Style nit: fa655d8411 (checkout: optimize "git checkout -b
", 2018-08-16)
Furthermore, please wrap the commit message at a width of around 70 or
so
Hi Johannes,
Thanks so much for your response!
As I went down the path of trying to prove the problem via an MCVE, and found
that the problem was not reproducing as I was expecting, I found out that one
of the pre-commit hooks had a bug for a corner case that I regularly traverse,
and that the
"Stephen P. Smith" writes:
> Add the human format support to the test tool so that TEST_DATE_NOW
> can be used to specify the current time.
>
> A static variable is used for passing the tool specified value to
> get_date. The get_date helper function eliminates the need to
> refactor up the show
From: Ben Peart
When doing a 'checkout -b' do a full checkout including updating the working
tree when doing the initial checkout. This fixes the regression in behavior
caused by fa655d8411 checkout: optimize "git checkout -b "
Signed-off-by: Ben Peart
---
builtin/checkout.c | 6 +
From: Ben Peart
Anthony Sottile determined that commit fa655d8411
"checkout: optimize "git checkout -b " introduced
an unintentional change in behavior for 'checkout -b' after doing a
'clone --no-checkout'. Create a test to demonstrate the regression then
fix the bug and update the test to demo
From: Ben Peart
Commit fa655d8411 checkout: optimize "git checkout -b " introduced
an unintentional change in behavior for 'checkout -b' after doing a
'clone --no-checkout'. Add a test to demonstrate the changed behavior to be
used in a later patch to verify the fix.
Signed-off-by: Ben Peart
-
"Stephen P. Smith" writes:
> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
> index 90761f1694..1d2d932c76 100644
> --- a/Documentation/git-log.txt
> +++ b/Documentation/git-log.txt
> @@ -193,6 +193,10 @@ log.date::
> `--date` option.) Defaults to "default", which means
On Fri, Jan 18, 2019 at 10:16:33AM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > I just had to cc Brandon and manually look up his email address, which
> > made me wonder what ever happened to this patch. :)
>
> d076ad13 ("Merge branch 'bw/mailmap'", 2019-01-14)
Oh, heh. False alarm:
"Stephen P. Smith" writes:
> In addition to adding the 'human' format, the patch added the auto
> keyword which could be used in the config file as an alternate way to
> specify the human format. Removing 'auto' cleans up the 'human'
> format interface.
>
> Instead add 'auto:human' date mode whi
Jeff King writes:
> I just had to cc Brandon and manually look up his email address, which
> made me wonder what ever happened to this patch. :)
d076ad13 ("Merge branch 'bw/mailmap'", 2019-01-14)
Hi Junio,
On Fri, 18 Jan 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> Overall, this was quite a pleasant read and a well constructed
> >> series. Other than two minor points (i.e. interaction with the
> >> 'post-checkout hook' topic, and discard_cache() before calling
> >>
On Fri, Jan 18, 2019 at 9:55 AM Junio C Hamano wrote:
>
> Johannes Schindelin writes:
>
> > I am about to submit a new iteration of my patch series, would it be too
> > much trouble for you to rebase on top? If it would be, let me know, then I
> > will rebase on top of yours.
>
> Or both of you k
"Johannes Schindelin via GitGitGadget"
writes:
> Especially on Windows, where Unix shell scripting is a foreign endeavor, and
> an expensive one at that, we really want to avoid running through the Bash.
>
> This not only makes everything faster, but also more robust, as the Bash we
> use on Wind
Johannes Schindelin writes:
>> Overall, this was quite a pleasant read and a well constructed
>> series. Other than two minor points (i.e. interaction with the
>> 'post-checkout hook' topic, and discard_cache() before calling
>> move_to_original_branch) I did not quite understand, looks good to
Johannes Schindelin writes:
> I am about to submit a new iteration of my patch series, would it be too
> much trouble for you to rebase on top? If it would be, let me know, then I
> will rebase on top of yours.
Or both of you keep the topics as-is and self-consistent, and let
the rerere machiner
Johannes Schindelin writes:
> Hi Junio,
>
> On Thu, 3 Jan 2019, Junio C Hamano wrote:
>
>> Paul-Sebastian Ungureanu writes:
>>
>> > This is a new iteration of git-stash which also takes
>> > sd/stash-wo-user-name into account. I cherry-picked
>> > some of dscho's commits (from [1]) to keep the
Luke Diamand writes:
> This updates the patchset to support copy, as suggested by Andrey.
>
> Luke Diamand (2):
> git-p4: add failing test for shelved CL update involving move/copy
> git-p4: handle update of moved/copied files when updating a shelve
>
> git-p4.py| 2 ++
> t/
Ævar Arnfjörð Bjarmason writes:
> On Thu, Jan 17 2019, Barret Rhoden wrote:
>
>> -die("Could not open skip list: %s", path);
>> [...]
>> +die("Could not open skip list: %s", path);
>
> You're just moving this around, but now that this has two uses let's say
> "Could not op
On 2019-01-18 at 10:47 Johannes Schindelin
wrote:
> ... and this change limit the user to specifying a single file, for no
> good reason. Worse: specifying two different files via two
> `--ignore-revs-file` parameters will only heed the latter and skip the
> former without any warning.
>
> A bett
On Wed, Jan 16, 2019 at 02:29:41PM +0100, Ævar Arnfjörð Bjarmason wrote:
> @@ -941,11 +957,25 @@ void write_commit_graph(const char *obj_dir,
> hashwrite(f, chunk_write, 12);
> }
>
> - write_graph_chunk_fanout(f, commits.list, commits.nr);
> - write_graph_chunk_oids(f,
The optional 'Large Edge List' chunk of the commit graph file stores
parent information for commits with more than two parents. Since the
chunk is optional, write_commit_graph() looks through all commits to
find those with more than two parents, and then writes the commit
graph file header accordi
The optional 'Large Edge List' chunk of the commit graph file stores
parent information for commits with more than two parents, and the
names of most of the macros, variables, struct fields, and functions
related to this chunk contain the term "large edges", e.g.
write_graph_chunk_large_edges(). H
On Wed, Nov 21, 2018 at 06:32:19AM -0500, Derrick Stolee wrote:
> >>I rename these variables to 'num_large_edges', because the commit
> >>graph file format speaks about the 'Large Edge List' chunk.
> >>
> >>However, I do find that the term 'extra' makes much more sense
> >>
> >>Would it make sense
On Fri, Jan 18, 2019 at 09:41:03AM +, Sérgio Peixoto wrote:
> Create a file .git/info/attributes with contents
>
> If the contents are:
> [attr]allowed-ext
> *.py allowed-ext=100
>
> then the problem occurs.
>
> If contents are:
> #[attr]allowed-ext
> *.py allowed-ext=100
>
> the problem
On Fri, Dec 07, 2018 at 02:22:25PM -0800, Jonathan Nieder wrote:
> Stefan Beller wrote:
>
> > What would be more of interest is why we'd be interested in this patch
> > as there is no commit/patch sent by Brandon with this email in gits history.
>
> I think there's an implicit assumption in this
Let's try this version.
On Fri, 2019-01-18 at 10:45 +, Eric Wong wrote:
> David Turner wrote:
> > It appears that get_oid_with_context calls into get_short_oid for
> > that
> > case, and get_short_oid returns SHORT_NAME_AMBIGUOUS, which is
> > -2. We
> > treat that as DANGLING_SYMLINK, which
From: Johannes Schindelin
Over the next commits, we want to make use of it in `run_am()` (i.e.
running the `--am` backend directly, without detouring to Unix shell
script code) which in turn will be called from `run_specific_rebase()`.
So let's move it before that latter function.
This commit i
From: Johannes Schindelin
While the scripted `git rebase` still has to rely on the
`git-rebase--am.sh` script to implement the glue between the `rebase`
and the `am` commands, we can go a more direct route in the built-in
rebase and avoid using a shell script altogether.
This patch represents a
From: Johannes Schindelin
This is what the legacy (scripted) rebase does in
`move_to_original_branch`, and we will need this functionality in the
next commit.
Signed-off-by: Johannes Schindelin
---
builtin/rebase.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/buil
From: Johannes Schindelin
When switching a branch *and* updating said branch to a different
revision, let's avoid a double entry in HEAD's reflog by first updating
the branch and then adjusting the symbolic ref HEAD.
Signed-off-by: Johannes Schindelin
---
builtin/rebase.c | 7 ---
1 file c
Especially on Windows, where Unix shell scripting is a foreign endeavor, and
an expensive one at that, we really want to avoid running through the Bash.
This not only makes everything faster, but also more robust, as the Bash we
use on Windows relies on a derivative of the Cygwin runtime, which in
Hi Martin,
Thanks again for your comments and patience, I appreciate it :-)
> > - if (skip_prefix(arg, "-S", &sign_commit))
> > + if(!strcmp(arg, "--gpg-sign")) {
> > + skip_prefix(arg, "--gpg-sign", &sign_commit);
>
> I personally find this a bit con
Hi Slavica
On 18/01/2019 12:19, Slavica Đukić wrote:
Hi Phillip,
On 18-Jan-19 12:20 PM, Phillip Wood wrote:
Hi Slavica
I think this round is looking good I've got a couple of comments about
the translation of the help text but everything else looks fine to me
now. In future when you're postin
Hi Elijah,
On Fri, 18 Jan 2019, Johannes Schindelin wrote:
> On Mon, 7 Jan 2019, Elijah Newren wrote:
>
> > Dscho: Looks like our series conflicts slightly. Would you like me to
> > rebase mine on top of yours and squash the following change into
> > commit c91c944a068e ("rebase: define lineari
Hi Junio,
On Fri, 4 Jan 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > When switching a branch *and* updating said branch to a different
> > revision, let's avoid a double entry by first updating the branch and
> > then ad
Hi Junio,
On Fri, 4 Jan 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > This is what the legacy (scripted) rebase does in
> > `move_to_original_branch`, and we will need this functionality in the
> > next commit.
>
> The m
Hi Junio,
On Fri, 4 Jan 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > +static int write_basic_state(struct rebase_options *opts)
> > +{
> > + write_file(state_dir_path("head-name", opts), "%s",
> > + opts->head_name ? opts->head_name : "deta
After converting my CVS repositories from CVS to git using
git cvsimport -a -m -A authors repo
I see that two branches, master and origin are created:
$ cd repo
$ git branch
* master
origin
What is the branch origin for? Should I delete it?
Steve
After deleting a branch or amending a commit I still have orphaned
objects in the repository:
$ mkdir repo; cd repo
$ git init
$ date > foo; git add foo; git commit -mmsg1
$ date > foo; git add foo; git commit -mmsg2
Hi Elijah,
On Mon, 7 Jan 2019, Elijah Newren wrote:
> On Mon, Jan 7, 2019 at 12:11 PM Junio C Hamano wrote:
> >
> > Junio C Hamano writes:
> >
> > > Elijah Newren writes:
> > >
> > >> On Tue, Dec 11, 2018 at 8:11 AM Elijah Newren wrote:
> > >>>
> > >>> This series continues the work of making
From: Johannes Schindelin
If the file system is case-insensitive, we really must be careful to
ignore differences in case only.
This fixes https://github.com/git-for-windows/git/issues/735
Signed-off-by: Johannes Schindelin
---
setup.c| 6 +++---
t/t3700-add.sh | 7 +++
2 files ch
It is completely legitimate these days to call git add with absolute paths.
Of course, on a case-insensitive file system, users rightfully expect the
argument to be handled case-insensitively, too. This patch makes it so.
Git for Windows carried this patch for over one and a half years already, I
On Fri, Jan 18, 2019 at 8:04 PM Patrick Hogg wrote:
>
> On Fri, Jan 18, 2019 at 4:21 AM Duy Nguyen wrote:
>>
>> On Fri, Jan 18, 2019 at 9:28 AM Patrick Hogg wrote:
>> >
>> > ac77d0c37 ("pack-objects: shrink size field in struct object_entry",
>> > 2018-04-14) added an extra usage of read_lock/re
On Fri, Jan 18, 2019 at 4:21 AM Duy Nguyen wrote:
>
> On Fri, Jan 18, 2019 at 9:28 AM Patrick Hogg wrote:
> >
> > ac77d0c37 ("pack-objects: shrink size field in struct object_entry",
> > 2018-04-14) added an extra usage of read_lock/read_unlock in the newly
> > introduced oe_get_size_slow for thr
Hi Torsten,
On Tue, 25 Dec 2018, Torsten Bögershausen wrote:
>
> Should it be
> s/respect core.fileMode/respect core.ignoreCase/
>
> in the header line ?
Yep. Fixed.
Dscho
Hi Junio,
first of all, my apologies for the incorrect commit message (you missed
it, too, though): it is not about respecting core.fileMode, but about
core.ignoreCase.
On Tue, 25 Dec 2018, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > the resulting index entry is "blub" or "BLUB". Sho
After converting from SVN to git using git svn init + git svn fetch,
my SVN tags appear as remote branches in git. I find many suggestions
to convert these to git tags by calling git tag -a
but this gives something like this
C4
|
V
T -> C3 -> C2
Hi Phillip,
On 18-Jan-19 12:20 PM, Phillip Wood wrote:
Hi Slavica
I think this round is looking good I've got a couple of comments about
the translation of the help text but everything else looks fine to me
now. In future when you're posting a new version it's helpful CC the
people who commente
Hi Junio,
On Thu, 3 Jan 2019, Junio C Hamano wrote:
> Paul-Sebastian Ungureanu writes:
>
> > This is a new iteration of git-stash which also takes
> > sd/stash-wo-user-name into account. I cherry-picked
> > some of dscho's commits (from [1]) to keep the scripted
> > version of `git stash` as `g
Hi Junio,
On Thu, 17 Jan 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > ...
> > See the updated series:
> > https://public-inbox.org/git/pull.31.v3.git.gitgitgad...@gmail.com/
>
> Thanks.
>
> I see that you are already planning for v4, but I'll find time to
> take a look at w
Hi Slavica
Thanks for moving this up, it's really good to add the test before the
conversion to C.
Best Wishes
Phillip
On 18/01/2019 07:47, Slavica Djukic via GitGitGadget wrote:
> From: Slavica Djukic
>
> Add test to t3701-add-interactive to verify that add_i_show_help()
> outputs expected c
Hi Slavica
I think this round is looking good I've got a couple of comments about
the translation of the help text but everything else looks fine to me
now. In future when you're posting a new version it's helpful CC the
people who commented on the previous version(s).
On 18/01/2019 07:47, Slavic
Hi Patrick,
On Thu, 17 Jan 2019, Patrick Hogg wrote:
> ac77d0c37 ("pack-objects: shrink size field in struct object_entry",
> 2018-04-14) added an extra usage of read_lock/read_unlock in the newly
> introduced oe_get_size_slow for thread safety in parallel calls to
> try_delta(). Unfortunately oe
David Turner wrote:
> It appears that get_oid_with_context calls into get_short_oid for that
> case, and get_short_oid returns SHORT_NAME_AMBIGUOUS, which is -2. We
> treat that as DANGLING_SYMLINK, which also seems to have the value -2.
> So, it's an ambiguity in ambiguity resolution.
>
> Fix
Hi Beenish,
On Thu, 17 Jan 2019, Khurshid, Beenish wrote:
> I frequently use 'git add -p' to filter changes before committing. This
> usually works, but on many occasions, the use of add and commit results
> in unstaged chunks and files being committed.
>
> Steps to reproduce:
> 1. Create unstag
Hi Junio,
On Thu, 17 Jan 2019, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > Fix this by using TRAVIS_PULL_REQUEST_BRANCH (i.e. the *source branch*)
> > when available, falling back to TRAVIS_BRANCH (i.e. for CI builds, also
> > known as "push builds").
> >
> >
Hi Barret,
On Thu, 17 Jan 2019, Barret Rhoden wrote:
> When ignoring commits, the commit that is blamed might not be
> responsible for the change. Users might want to know when a particular
> line has a potentially inaccurate blame.
>
> By specifying blame.markIgnoredFiles, each blame line is m
Hi Thomas & Junio,
On Wed, 16 Jan 2019, Thomas Gummerer wrote:
> On 01/15, Junio C Hamano wrote:
> > * ps/stash-in-c (2019-01-04) 27 commits
> > - tests: add a special setup where stash.useBuiltin is off
> > - stash: optionally use the scripted version again
> > - stash: add back the original,
On Thu, Jan 17 2019, Barret Rhoden wrote:
> Adds the ability to ignore a set of commits and their changes when
> blaming. This can be used to ignore a commit deemed 'not interesting,'
> such as reformatting.
>
> v1: https://public-inbox.org/git/20190107213013.231514-1-b...@google.com/
> v1 -> v
Git for Windows offered the built-in stash early: in v2.19.0 it was offered
as an experimental option, and in v2.20.0 it was enabled by default.
One corner case was identified
[https://github.com/git-for-windows/git/issues/2006] and fixed
[https://github.com/git-for-windows/git/pull/2008] in the m
From: Matthew Kraai
After `git add -N `, the index is in a special state. A state for
which the built-in stash was not prepared, as it failed to initialize
the `rev` structure in that case before using `&rev.pending`.
Detailed explanation: If `reset_tree()` returns a non-zero value,
`stash_worki
1 - 100 of 111 matches
Mail list logo
