Initial cloning via
git clone http://git.denx.de/u-boot-efi.git
fails with git version 2.21.0.196.g041f5ea1cf
git version 2.1.4 works fine.
Bisection points to this first bad commit:
17966c0a63d25b1cc2dd1e98d30873e643bd581f
http: avoid disconnecting on 404s for loose objects
Please, fix th
Ævar Arnfjörð Bjarmason writes:
> +When common porcelain operations that creates objects are run, they
"operations that create objects are run"?
> +will check whether the repository has grown substantially since the
> +last maintenance, and if so run `git gc` automatically. See `gc.auto`
> +be
"Jeff Hostetler via GitGitGadget" writes:
> Teach "multi-pack-index verify" to handle cases where the number of
> packfiles exceeds the open file handle limit.
>
> The first commit fixes a problem that prevented the LRU-style
> close_one_pack() mechanism from working which caused midx verify to r
Jeff Hostetler writes:
> On 3/21/2019 5:09 PM, Josh Steadmon wrote:
>> Persistently enabling trace2 output is difficult because it requires
>> specifying a full filename. This series teaches tr2_dst_get_trace_fd()
>> to create files underneath a given directory provided as the target of
>> the GI
Leszek Swirski writes:
> I assume that either the reflog entry should be amended to print
> something more informative (moving from master to origin/master, or at
> least master@{u}, or the SHA...), or the reflog search in
> wt_status_get_detached_from should do something cleverer with relative
>
Philip Oakley writes:
>> of 'cp -R'. I thought of making the same clarification for 'rsync
>> --delete' as well, however I think with it being explicitly specified
>> for 'cp -R', readers should be able to deduce that we are talking
>> about the destination directory there as well.
> As a histor
Nguyễn Thái Ngọc Duy writes:
> This adds a new command 'git-switch' as the half-replacement for
> 'git-checkout'. Jump to 12/26 as the starting point. The other half is
> git-restore, which is dealt with separately.
>
> The diff delta is shrinking nicely. The two main changes are
>
> - '--orphan
On Fri, Mar 22, 2019 at 12:25:17PM +0900, Junio C Hamano wrote:
> > There is a "set_default" callback that was added by 6c374008b1
> > (diff_opt: track whether flags have been set explicitly, 2013-05-10),
> > but it looks like it was never actually used. I think the theory is that
> > cases like t
Phillip Wood writes:
> Hi Junio
>
> On 21/03/2019 04:21, Junio C Hamano wrote:
>> Phillip Wood writes:
>>
>>> +static struct replay_opts get_replay_opts(const struct rebase_options
>>> *opts)
>>> +{
>>> + struct replay_opts replay = REPLAY_OPTS_INIT;
>>> +
>>> + sequencer_init_config(&repla
Jeff Hostetler writes:
>>> + for (attempt_count = 0; attempt_count < MAX_RANDOM_ATTEMPTS;
>>> attempt_count++) {
>>> + strbuf_reset(&final_path);
>>> + strbuf_addbuf(&final_path, &base_path);
>>> + strbuf_addf(&final_path, ".%d", attempt_count);
>
> Since the last
Jeff King writes:
>> I think this also deserves some explanation of what didn't change,
>> especially after what I said in [*1*]. We're still not using the
>> 'diff_opt_parse()' option parser, as it doesn't understand '-v' for
>> example. 'setup_revisions()' understands that, but 'diff_opt_pars
Sergey Organov writes:
>> With it reverted, "[alias] cp = cherry-pick -m1" can be used to train
>> the user to blindly pick a range that has a merge without thinking,
>> which is what I meant by "ship has already sailed".
>
> Did you mean "With it *not* reverted" here?
Thanks for a correction.
Jonathan Tan writes:
> Because this configuration is not supported by all protocol versions,
> and because this configuration seems to be of limited usefulness (only
> useful for people who use manual credential entry and on servers that
> are OK with exposing refs but not objects, and even in th
Good day
We are sorry for the delay , Enclosed please find the Purchase order
attachment for your reference.
Please check and confirm by sending your PI ,
By sending your PI, please confirm all details of our PO.
If you have further questions please don’t hesitate to contact me
directly.
Bes
On Thu, Mar 21, 2019 at 05:28:44AM -0400, Jeff King wrote:
> - instead of disconnecting backend_data->packed_transaction on error,
> we could wait to install it until we successfully prepare. That
> might make the flow a little simpler, but it introduces a hassle.
> Earlier parts of
About two weeks ago there was a discussion about building an undo stack.
https://public-inbox.org/git/000401d4d6c8$f68bb020$e3a31060$@nexbridge.com/
it had me thinking about whether a stash --snapshot might be useful. Below
is a conceptual change - by no means even close to complete. This would
a
> On Thu, Mar 21, 2019 at 01:24:35PM -0700, Jonathan Tan wrote:
>
> > > The test you're deleting is basically just verifying that our apache
> > > config is indeed "half-auth". Because in v0, the server is never even
> > > going to ask for credentials, so no interesting code paths in the client
>
In preparation for a fix, add a failing test case to test that
git-p4 doesn't exclude files despite being told to
when handling multiple branches.
I.e., it should exclude //depot/branch2/file2 when run with
-//depot/branch2/file2,
but doesn't do this right now.
The test is based on 'git p4 clone
Currently, excluded paths are only handled in the following cases:
* no branch detection;
* branch detection with using clientspec.
However, excluded paths are not respected in case of
branch detection without using clientspec.
Fix this by consulting the list of excluded paths
when splitting fi
Currently, `cloneExclude` array is being groomed (by removing trailing "...")
on every changeset.
(since `extractFilesFromCommit()` is called on every imported changeset)
As a micro-optimization, do it once while parsing arguments.
Also, prepend "/" and remove trailing "..." at the same time.
Sig
Make sure not to exclude files unintentionally
if exclude paths are specified without a trailing /.
I.e., don't exclude "//depot/file_dont_exclude" if run with "-//depot/file".
Do this by ensuring that paths without a trailing "/" are only matched
completely.
Also, abort path search on the first
In preparation for a fix, add a failing test case to test that
git-p4 doesn't exclude files with the same prefix unintentionally
when exclude paths are specified without a trailing /.
I.e., don't exclude "//depot/file_dont_exclude" if run with "-//depot/file".
or don't exclude "//depot/discard_file
Under certain circumstances, gitCommitByP4Change() can enter an infinite
loop resulting in `git p4 sync` hanging forever.
The problem is that
`git rev-list --bisect ^` can return ``,
which would result in reinspecting and potentially an infinite loop.
This can happen when importing just a subse
This series fixes a few cases with branch detection
and handling of excludes by git-p4.
This is the second iteration of the patch series.
Changes since the v1 [1]:
* Added new test case for excluded paths when detecting branches;
* Added a new fix for excluded paths when detecting branches.
[1]
git-p4 knows how to handle case insensitivity in file paths
if core.ignorecase is set.
However, when determining a branch for a file,
it still does a case-sensitive prefix match.
This may result in some file changes to be lost on import.
For example, given the following commits
1. add //depot/mai
On 18.03.19 at 22:31 Jeff King wrote:
> On Mon, Mar 18, 2019 at 05:15:00PM +0100, Ævar Arnfjörð Bjarmason wrote:
>
>> Rather than duplicating the documentation for the various "gc" options
>> let's include the "gc" docs from git-config. They were mostly better
>> already, and now we don't have the
Dear Friend,
I am Mrs Clara David. am sending you this brief letter to solicit your
partnership to transfer $18.5 million US Dollars.I shall send you more
information and procedures when I receive positive response from you.
please send me a message in my Email box (mrsclarad...@gmail.com)
as i wa
On Thu, Mar 21, 2019 at 01:24:35PM -0700, Jonathan Tan wrote:
> > The test you're deleting is basically just verifying that our apache
> > config is indeed "half-auth". Because in v0, the server is never even
> > going to ask for credentials, so no interesting code paths in the client
> > are trig
Hey, I would like to work with your organisation for the upcoming Google summer
of code program , please guide me on how to go ahead
Aaryankapur
7507442555
ak6...@bennett.edu.in
On 3/21/2019 5:09 PM, Josh Steadmon wrote:
Persistently enabling trace2 output is difficult because it requires
specifying a full filename. This series teaches tr2_dst_get_trace_fd()
to create files underneath a given directory provided as the target of
the GIT_TR2_* envvars.
Changes since V2
Now that Unicode 12 has been announced[0], update the character
width tables to the new version.
[0] http://blog.unicode.org/2019/03/announcing-unicode-standard-version-120.html
Signed-off-by: Beat Bolli
---
unicode-width.h | 38 +-
1 file changed, 25 inserti
Hi Phillip,
It’s nice to see your work on this on the list.
Le 19/03/2019 à 20:03, Phillip Wood a écrit :
> From: Phillip Wood
>
> In order to run `rebase -i` without forking `rebase--interactive` it
> will be convenient to use the same structure when parsing the options in
> cmd_rebase() and c
When the value of a trace2 environment variable is an absolute path
referring to an existing directory, write output to files (one per
process) underneath the given directory. Files will be named according
to the final component of the trace2 SID, followed by a counter to avoid
potential collisions
Persistently enabling trace2 output is difficult because it requires
specifying a full filename. This series teaches tr2_dst_get_trace_fd()
to create files underneath a given directory provided as the target of
the GIT_TR2_* envvars.
Changes since V2:
* No longer appends a suffix to filenames on t
> Of On March 21, 2019 15:32, Fabio Aiuto wrote:
> Il giorno gio, 21/03/2019 alle 15.16 -0400, Randall S. Becker ha
> scritto:
> > On March 21, 2019 15:06, Fabio Aiuto wrote:
> > > I'm browsins git code with Eclipse. I'm on a local branch called
> > > "studio" based on master (last public commit e9
Amend the "PACKFILE OPTIMIZATION" section in "fast-import" to explain
that simply running "git gc --aggressive" after a "fast-import" should
properly optimize the repository. This is simpler and more effective
than the existing "repack" advice (which I'm keeping as it helps
explain things) because
Remove the mention of specific flags from the "gc" documentation, and
leave it at describing what we'll do instead. As seen in builtin/gc.c
we'll use various repack flags depending on what we detect we need to
do, so this isn't always accurate.
More importantly, a subsequent change is about to rem
Amend the "NOTES" section to fix up wording that's been with us since
3ffb58be0a ("doc/git-gc: add a note about what is collected",
2008-04-23).
I can't remember when/where anymore (I think Freenode #Git), but at
some point I was having a conversation with someone who was convinced
that "gc" would
The chance of a repository being corrupted due to a "gc" has nothing
to do with whether or not that "gc" was invoked via "gc --auto", but
whether there's other concurrent operations happening.
This is already noted earlier in the paragraph, so there's no reason
to suggest this here. The user can i
The existing "gc --aggressive" docs come just short of recommending to
users that they run it regularly. I've personally talked to many users
who've taken these docs as an advice to use this option, and have,
usually it's (mostly) a waste of time.
So let's clarify what it really does, and let the
Re-flow the "gc.*" section in "config". A previous commit moved this
over from the "gc" docs, but tried to keep as many of the lines
identical to benefit from diff's move detection.
Signed-off-by: Ævar Arnfjörð Bjarmason
---
Documentation/config/gc.txt | 17 -
1 file changed, 8 i
Since 07e7dbf0db (gc: default aggressive depth to 50, 2016-08-11) we
somewhat confusingly use the same depth under --aggressive as we do by
default.
As noted in that commit that makes sense, it was wrong to make more
depth the default for "aggressive", and thus save disk space at the
expense of ru
Rather than duplicating the documentation for the various "gc" options
let's include the "gc" docs from git-config. They were mostly better
already, and now we don't have the same docs in two places with subtly
different wording.
In the cases where the git-gc(1) docs were saying something the "gc"
For v1 see: https://public-inbox.org/git/20190318161502.7979-1-ava...@gmail.com/
This addresses all the feedback it got, which includes splitting out
various "while we're at it" fixes, and then I found/remembered some
more things I needed to fix.
It would still be great to have Peff submit some v
Clean up the grammar in the documentation for
"gc.bigPackThreshold". This documentation was added in 9806f5a7bf ("gc
--auto: exclude base pack if not enough mem to "repack -ad"",
2018-04-15).
Saying "the amount of memory estimated for" flows more smoothly than
the previous "the amount of memory is
The docs have been recommending that users need to run this manually,
but that hasn't been needed in practice for a long time except in
exceptional circumstances.
Let's instead have this reflect reality and say that most users don't
need to run this manually at all, while briefly describing the so
Dear Sir/Madam,
Do you need a loan to pay off your bills at 2% Interest rate? We give
maximum of 95,000,000.00 USD to minimum of $5,000. If you are
interested contact us at Email: gloriatuckerloanf...@gmail.com
Full Name...
Country
State.
Loan Amount
Duration's...
Sex .
Phone
> On Thu, Mar 21, 2019 at 03:55:37PM -0400, Jeff King wrote:
>
> > I am a little confused about v2 here, though. It should hit the initial
> > info/refs endpoint the same as usual. If it's a noop fetch, then it's
> > done. Otherwise, we'd hit the git-upload-pack and expect to require
> > authentic
On Thu, Mar 21, 2019 at 03:55:37PM -0400, Jeff King wrote:
> I am a little confused about v2 here, though. It should hit the initial
> info/refs endpoint the same as usual. If it's a noop fetch, then it's
> done. Otherwise, we'd hit the git-upload-pack and expect to require
> authentication. That
On Thu, Mar 21, 2019 at 10:47:19AM -0700, Jonathan Tan wrote:
> When using protocol v0, upload-pack over HTTP permits a "half-auth"
> configuration in which, at the web server layer, the info/refs path is
> not protected by authentication but the git-upload-pack path is, so that
> a user can perfo
On Thu, Mar 21, 2019 at 12:04:22PM -0700, Bryan Turner wrote:
> > Why does it show two entries? In my `packed-refs` file, it also shows
> > a strange revision for the tag (I expect to see just 1 SHA1). Not sure
> > if it is related:
> >
> > ```
> > 66c41d67da887025c4e22e9891f5cd261f82eb31 refs/tag
Version 3 drops the packed-git commit I mentioned earlier, simplifies the
finish_if_sparse API as suggested by Eric, and splits the object sort commit
into 2 commits: one to add the additional progress indicators and one to
sort the objects by packfile. This makes it easier to follow.
---
From: Jeff Hostetler
Teach `multi-pack-index verify` to sort the set of object by
packfile so that only one packfile needs to be open at a time.
This is a performance improvement. Previously, objects were
verified in OID order. This essentially requires all packfiles
to be open at the same tim
From: Jeff Hostetler
Log multi-pack-index command mode.
Log number of objects and packfiles in the midx.
Signed-off-by: Jeff Hostetler
---
builtin/multi-pack-index.c | 3 +++
midx.c | 4
2 files changed, 7 insertions(+)
diff --git a/builtin/multi-pack-index.c b/builti
From: Jeff Hostetler
Add progress indicators to more parts of midx verify.
Use sparse progress indicator for object iteration.
Signed-off-by: Jeff Hostetler
---
midx.c | 26 --
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/midx.c b/midx.c
index 24141a7c
From: Jeff Hostetler
Add new start_sparse_progress() and start_delayed_sparse_progress()
constructors and "sparse" flag to struct progress.
Teach stop_progress() to force a 100% complete progress message before
printing the final "done" message when "sparse" is set.
Calling display_progress() f
Il giorno gio, 21/03/2019 alle 15.16 -0400, Randall S. Becker ha
scritto:
> On March 21, 2019 15:06, Fabio Aiuto wrote:
> > I'm browsins git code with Eclipse. I'm on a local branch called
> > "studio" based
> > on master (last public commit e902e9b by Junio C Hamano on Monday
> > March 11 2019). I
On Thu, Mar 21, 2019 at 11:59:42AM -0500, Robert Dailey wrote:
> I have a particular tag in my repo that shows 2 annotated
> descriptions, which is very confusing.
>
> The command I ran:
>
> ```
> git show --format=fuller 4.2.0.1900
> ```
>
> And the output:
>
> ```
> tag 4.2.0/1900
> Tagger:
On March 21, 2019 15:06, Fabio Aiuto wrote:
> I'm browsins git code with Eclipse. I'm on a local branch called "studio"
> based
> on master (last public commit e902e9b by Junio C Hamano on Monday
> March 11 2019). I've built everything by changing:
> CFLAGS = -g -Wall (removing -O2 to have smooth
Hello to all,
I'm browsins git code with Eclipse. I'm on a local branch called
"studio" based on master (last public commit e902e9b by Junio C Hamano
on Monday March 11 2019). I've built everything by changing:
CFLAGS = -g -Wall (removing -O2 to have smooth trace in debugging).
But the environment
On Thu, Mar 21, 2019 at 9:59 AM Robert Dailey wrote:
>
> I have a particular tag in my repo that shows 2 annotated
> descriptions, which is very confusing.
>
> The command I ran:
>
> ```
> git show --format=fuller 4.2.0.1900
> ```
>
> And the output:
>
> ```
> tag 4.2.0/1900
> Tagger: John Doe
Dear,
It is about my late client a national of your country. Urgent response
needed for More details about his (WILL)..
Kind Regards.
Mrs. Annabelle Edo.
When using protocol v0, upload-pack over HTTP permits a "half-auth"
configuration in which, at the web server layer, the info/refs path is
not protected by authentication but the git-upload-pack path is, so that
a user can perform fetches that do not download any objects without
authentication, but
On 3/20/2019 10:04 PM, Junio C Hamano wrote:
Josh Steadmon writes:
[...]
+/*
+ * How many attempts we will make at creating a random trace output path.
+ */
+#define MAX_RANDOM_ATTEMPTS 10
With the updated design, randomness is no longer the primary
property of this new feature. The fac
Junio C Hamano wrote:
> Todd Zullinger writes:
>
>> Other than a follow-up to update the commit reference in 4/4
>> after 1/4 is in the final form on pu, I think this might be good.
>> If it's easier, we can skip 4/4 and I'll resend it after the
>> others are on pu.
>
> A series that makes a sin
I have a particular tag in my repo that shows 2 annotated
descriptions, which is very confusing.
The command I ran:
```
git show --format=fuller 4.2.0.1900
```
And the output:
```
tag 4.2.0/1900
Tagger: John Doe
TaggerDate: Fri Jul 18 10:46:30 2014 -0500
QA/Internal Release for 4.2.0.19
Hi Junio,
On Mon, 18 Mar 2019, Junio C Hamano wrote:
> Duy Nguyen writes:
>
> > On Thu, Mar 14, 2019 at 9:10 PM Johannes Schindelin
> > wrote:
> >> In any case, before we get better tooling to work around these issues, I
> >> still think it makes a ton of sense to encourage proper separation of
Hello Philip
> This list is for the development of Git. There is a googlegroups list
> for git users. However..
Sorry, my mistake, I found this mailing list here[0] where it is written that
this is one for asking questions, having comments or reporting bugs.
> A detached head simply means that
Hi Alex
On 21/03/2019 14:11, MARIE Alexandre wrote:
Hello,
I am searching for help as I made two mistakes, I think.
First I fetched origin in a 'branch' called temp that is in a 'detached head'
state.
But I can't delete temp by checking out master.
I don't know how to get rid of this temp deta
Consider a repository with branch master, with upstream origin/master.
If one is on master, and runs "git checkout @{u}" to get the upstream,
then git branch stops working. The reason is that we end up on a
detached HEAD, and git branch searches recent reflog entries to figure
out where the HEAD wa
Hi Junio
On 21/03/2019 04:21, Junio C Hamano wrote:
Phillip Wood writes:
+static struct replay_opts get_replay_opts(const struct rebase_options *opts)
+{
+ struct replay_opts replay = REPLAY_OPTS_INIT;
+
+ sequencer_init_config(&replay);
+
+ replay.action = REPLAY_INTERACTIV
On Thu, Mar 21 2019, Johannes Schindelin wrote:
> Hi Ævar,
>
> On Sun, 17 Mar 2019, Ævar Arnfjörð Bjarmason wrote:
>
>>
>> On Fri, Feb 15 2019, Jeff Hostetler wrote:
>>
>> > On 2/14/2019 7:33 AM, Ævar Arnfjörð Bjarmason wrote:
>> >>
>> >> On Wed, Feb 06 2019, Jeff Hostetler via GitGitGadget wrot
Hi, sorry for the late response..
On 17/03/2019 20:19, Thomas Gummerer wrote:
Add a definition for what overlay means in the context of git, to
clarify the recently introduced overlay-mode in git checkout.
Helped-by: Elijah Newren
Helped-by: Junio C Hamano
Signed-off-by: Thomas Gummerer
---
On 19/03/2019 20:24, Ævar Arnfjörð Bjarmason wrote:
On Tue, Mar 19 2019, Phillip Wood wrote:
From: Phillip Wood
cmd_rebase() and cmd_rebase__interactive() used different enums to hold
the current action. Change to using a common enum so the values are the
same when we change `rebase -i` t
On 20/03/2019 23:05, Ævar Arnfjörð Bjarmason wrote:
On Tue, Mar 19 2019, Phillip Wood wrote:
From: Phillip Wood
When the builtin rebase starts an interactive rebase it parses the
options and then repackages them and forks `rebase--interactive`. This
series refactors rebase--interactive so
Hi Ævar,
On Mon, 18 Mar 2019, Ævar Arnfjörð Bjarmason wrote:
> On Sat, Mar 16 2019, Johannes Schindelin via GitGitGadget wrote:
>
> > It was reported by Ævar Arnfjörð Bjarmason
> > [https://public-inbox.org/git/nycvar.qro.7.76.6.1903142058130...@tvgsbejvaqbjf.bet/T/#mb8718fe52e4721dacd3b143a09187
On 20/03/2019 01:50, Duy Nguyen wrote:
On Wed, Mar 20, 2019 at 2:04 AM Phillip Wood wrote:
It would perhaps be better to pass around the_index rather than
the_repository
Not by a large margin. For sequencer.c most operations require more
than just the index and passing 'struct repos
Hi Ævar,
On Sun, 17 Mar 2019, Ævar Arnfjörð Bjarmason wrote:
>
> On Fri, Feb 15 2019, Jeff Hostetler wrote:
>
> > On 2/14/2019 7:33 AM, Ævar Arnfjörð Bjarmason wrote:
> >>
> >> On Wed, Feb 06 2019, Jeff Hostetler via GitGitGadget wrote:
> >>
> >>> V6 addresses: [] The remaining hdr-check warning
On Thu, Mar 21 2019, Johannes Schindelin wrote:
> Hi Richard,
>
> On Sat, 16 Mar 2019, Richard Hipp wrote:
>
>> I'm trying to transform a repository from another VCS into a Git
>> repository using "git fast-import". It appears to work, but the
>> resulting Git repository is huge relative to the
Hello,
I am searching for help as I made two mistakes, I think.
First I fetched origin in a 'branch' called temp that is in a 'detached head'
state.
But I can't delete temp by checking out master.
I don't know how to get rid of this temp detached head.
Second, the detached head causes one issue
Hi Junio,
On Mon, 18 Mar 2019, Junio C Hamano wrote:
> Duy Nguyen writes:
>
> >> - This is synonymous to the previous form. If on
> >> + This is synonymous to the previous form. However,
> >> + users should prefer the previous form over this form
> >> + as this form ma
On Tue, Mar 19 2019, Michael Haggerty wrote:
> Thanks for your work and for your thorough explanation of the change!
Hi. Yes, thanks a lot for the feedback. Just hadn't gotten around to
looping back to this yet & digging into the issue you raised.
> On 3/15/19 4:59 PM, Ævar Arnfjörð Bjarmason
Hi Richard,
On Sat, 16 Mar 2019, Richard Hipp wrote:
> I'm trying to transform a repository from another VCS into a Git
> repository using "git fast-import". It appears to work, but the
> resulting Git repository is huge relative to the original - 18 times
> larger. Most of the space seems to be
Hi Denton,
On Wed, Mar 20, 2019 at 10:28 AM Denton Liu wrote:
>
> Hi Elijah,
>
> Sorry for the late reply, I've been mulling over it for the past couple
> of days.
No worries; thanks for thinking about it.
> On Mon, Mar 18, 2019 at 10:59:56AM -0700, Elijah Newren wrote:
> > On Sun, Mar 17, 2019
From: Johannes Schindelin
With this change, the `index_state` struct becomes the new home for the
flag that says whether the fsmonitor hook has been run, i.e. it is now
per-index.
It also gets re-set when the index is discarded, fixing the bug where
fsmonitor-enabled Git would miss updates under
From: Johannes Schindelin
This one is tricky.
When `core.fsmonitor` is set, a `refresh_index()` will not perform a
full scan of files that might be modified, but will query the fsmonitor
and refresh only the ones that have been actually touched.
Due to implementation details, the fsmonitor is q
It was reported by Ævar Arnfjörð Bjarmason
[https://public-inbox.org/git/nycvar.qro.7.76.6.1903142058130...@tvgsbejvaqbjf.bet/T/#mb8718fe52e4721dacd3b143a09187ff9090ef4e3]
that there were problems with the fsmonitor feature in conjunction with the
newly built-in git stash/git rebase.
The culprit
On Wed, Mar 20, 2019 at 7:58 AM Duy Nguyen wrote:
>
> On Wed, Mar 20, 2019 at 8:53 PM Elijah Newren wrote:
> > So, I think we do need something (eventually at least). Would you
> > prefer we dropped this patch from Duy and instead made 'checkout -m'
> > abort when the index is dirty?
>
> I have
On Thu, Mar 21, 2019 at 6:17 AM Nguyễn Thái Ngọc Duy wrote:
>
> This adds a new command 'git-switch' as the half-replacement for
> 'git-checkout'. Jump to 12/26 as the starting point. The other half is
> git-restore, which is dealt with separately.
>
> The diff delta is shrinking nicely. The two m
Completion support for --guess could be made better. If no --detach is
given, we should only provide a list of refs/heads/* and dwim ones,
not the entire ref space. But I still can't penetrate that
__git_refs() function yet.
---
contrib/completion/git-completion.bash | 37 +
Switching and creating branches always involves knowing the
to begin the new branch from. Sometimes, people want to
create a new branch that does not have any commits yet; --orphan is a
flag to allow that.
--orphan overrides the default of HEAD for instead causing
us to start from an empty histo
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 includes
documentation, suggestions/advice from other commands...
---
Docume
---
t/t2060-switch.sh (new +x) | 98 ++
1 file changed, 98 insertions(+)
diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh
new file mode 100755
index 00..81e13cf7f0
--- /dev/null
+++ b/t/t2060-switch.sh
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+test_description='
Unless you know what you're doing, switching to another branch to do
something then switching back could be confusing. Worse, you may even
forget that you're in the middle of something. By the time you realize,
you may have done a ton of work and it gets harder to go back.
The new option --ignore-
When we switch from one branch to another, it makes sense to show a
summary of local changes since there could be conflicts, or some files
left modified When switch is used solely for creating a new
branch (and "switch" to the same commit) or detaching, we don't really
need to show anything.
"
"git checkout" automatically detaches branches and --detach is not
that useful (--no-detach is more likely). But for "switch", you
may want to use it more often once you're used to detached HEAD. This
of course adds -d to git-checkout but it does not harm (yet?) to do it.
---
builtin/checkout.c |
This is already the default in git-checkout. The real change in here is
just minor cleanup. The main excuse is to explain why dwim is kept default.
Contrary to detach mode that is easy to get into and confusing to get
back out. Automatically creating a tracking branch often does not kick
in as oft
The shortcut of these options do not make much sense when used with
switch. And their descriptions are also tied to checkout. Move -b/-B
to cmd_checkout() and new -c/-C with the same functionality in
cmd_switch_branch()
---
builtin/checkout.c | 32 +---
1 file changed,
"git checkout " will checkout the commit in question and
detach HEAD from the current branch. It is naturally a right thing to
do once you get git references. But detached HEAD is a scary concept
to new users because we show a lot of warnings and stuff, and it could
be hard to get out of (until you
--discard-changes is a better name than --force for this option since
it's what really happens. --force is turned to an alias for
--discard-changes. But it's meant to be an alias for potentially more
force options in the future.
---
builtin/checkout.c | 12 ++--
1 file changed, 10 insertio
1 - 100 of 138 matches
Mail list logo
