Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

150630 git for windows update t0027 #228

Merged
merged 4 commits into from
Jul 1, 2015
Merged

150630 git for windows update t0027 #228

merged 4 commits into from
Jul 1, 2015

Conversation

tboegi
Copy link

@tboegi tboegi commented Jun 30, 2015

Update t0027 with upstream Git

tboegi added 4 commits July 1, 2015 05:28
@tboegi
SQUASH! Revert "Teach t0027 about native end-of-lines"
0614b60 
This reverts commit 62f99d8.
It will be replaced with the (nealry identical) change from
upstream Git in a second
@tboegi
t0027: cleanup: rename functions; avoid non-leading TABs
aba60cd 
Make more clear what the tests are doing:

  commit_check_warn():
    Commit files and checks for conversion warnings.
    Old name: create_file_in_repo()

  checkout_files():
    Checkout files from the repo and check if they have
    the appropriate line endings in the work space.
    Old name: check_files_in_ws()

Replace non-leading TABS with spaces

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
@tboegi
t0027: support NATIVE_CRLF platforms
577f287 
t0027 expects the native end-of-lines to be a single line feed
character.  On Windows, however, we set it to a carriage return
character followed by a line feed character.  Thus, we have to
modify t0027 to expect different warnings depending on the
end-of-line markers.

Adjust the check of the warnings and use these macros:

  WILC:  Warn if LF becomes CRLF
  WICL:  Warn if CRLF becomes LF
  WAMIX: Mixed line endings: either CRLF->LF or LF->CRLF

Improve the information given by check_warning().

Use test_cmp to show which warning is missing (or shouldn't be
there).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
@tboegi
t0027: Add repoMIX and LF_nul
430b10e 
"new safer autocrlf handling":

  - Check if eols in a file are converted at commit, when the file has
    CR (or CRLF) in the repo (technically speaking in the index).
  - Add a test-file repoMIX with mixed line-endings.
  - When converting LF->CRLF or CRLF->LF: check the warnings

checkout_files():

  - Checking out CRLF_nul and checking for eol coversion does not
    make much sense (CRLF will stay CRLF).
  - Use the file LF_nul instead: It is handled a binary in "auto" modes,
    and when declared as text the LF may be replaced with CRLF, depending
    on the configuration.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
@tboegi
Copy link
Author

tboegi commented Jul 1, 2015

Better now ?

dscho added a commit that referenced this pull request Jul 1, 2015
@dscho
Merge pull request #228 from tboegi/150630_git-for-windows-update-t0027
bf9806d 
150630 git for windows update t0027
@dscho dscho merged commit bf9806d into git-for-windows:master Jul 1, 2015
@dscho
Copy link
Member

dscho commented Jul 1, 2015

I think that rebase -i does not handle all upper-case "SQUASH!" correctly. I'll just have to remember to fix that manually next merging rebase.

Thanks!

@tboegi
Copy link
Author

tboegi commented Jul 2, 2015

Learned somthing new: git-rebase--interactive.sh understands the "squash!"
(Next time I'll make a v3 with "squash!" instead of "SQUASH!" :-)

dscho added a commit that referenced this pull request Jul 18, 2015
@dscho
Merge pull request #228 from tboegi/150630_git-for-windows-update-t0027
2f7e7bb 
150630 git for windows update t0027
@tboegi tboegi deleted the 150630_git-for-windows-update-t0027 branch November 2, 2016 06:50
garimasi514 pushed a commit to garimasi514/git that referenced this pull request Jan 6, 2020
@derrickstolee
Merge pull request git-for-windows#228: "gvfs-helper prefetch" during…
e0c9861 
… "git fetch"

This is a follow-up to git-for-windows#227.

1. When a new flag is added to our Git config, we can run `gvfs-helper prefetch` inside of our `git fetch` calls. This will help ensure we have updated commits and trees even if the background prefetches have fallen behind (or are not running).

2. With a new `--no-update-remote-refs` we can avoid updating the `refs/remotes` namespace. This will allow us to run `git fetch --all --no-update-remote-refs +refs/heads/*:refs/hidden/*` and we will get the new refs into a local folder (that doesn't appear anywhere). The most important thing is that users will still see when their remote refs update.
jeffhostetler pushed a commit to jeffhostetler/git that referenced this pull request Apr 11, 2020
@derrickstolee
Merge pull request git-for-windows#228: "gvfs-helper prefetch" during…
d4097de 
… "git fetch"

This is a follow-up to git-for-windows#227.

1. When a new flag is added to our Git config, we can run `gvfs-helper prefetch` inside of our `git fetch` calls. This will help ensure we have updated commits and trees even if the background prefetches have fallen behind (or are not running).

2. With a new `--no-update-remote-refs` we can avoid updating the `refs/remotes` namespace. This will allow us to run `git fetch --all --no-update-remote-refs +refs/heads/*:refs/hidden/*` and we will get the new refs into a local folder (that doesn't appear anywhere). The most important thing is that users will still see when their remote refs update.
jeffhostetler pushed a commit to jeffhostetler/git that referenced this pull request Apr 13, 2020
@derrickstolee
Merge pull request git-for-windows#228: "gvfs-helper prefetch" during…
f72ece7 
… "git fetch"

This is a follow-up to git-for-windows#227.

1. When a new flag is added to our Git config, we can run `gvfs-helper prefetch` inside of our `git fetch` calls. This will help ensure we have updated commits and trees even if the background prefetches have fallen behind (or are not running).

2. With a new `--no-update-remote-refs` we can avoid updating the `refs/remotes` namespace. This will allow us to run `git fetch --all --no-update-remote-refs +refs/heads/*:refs/hidden/*` and we will get the new refs into a local folder (that doesn't appear anywhere). The most important thing is that users will still see when their remote refs update.
jeffhostetler pushed a commit to jeffhostetler/git that referenced this pull request Jun 3, 2020
@derrickstolee
Merge gvfs-helper prefetch feature
b0950dc 
Includes these pull requests:

 git-for-windows#227
 git-for-windows#228
 git-for-windows#229
 git-for-windows#231
 git-for-windows#240

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
jeffhostetler pushed a commit to jeffhostetler/git that referenced this pull request May 14, 2021
@derrickstolee @jeffhostetler
Merge gvfs-helper prefetch feature
853b02d 
Includes these pull requests:

 git-for-windows#227
 git-for-windows#228
 git-for-windows#229
 git-for-windows#231
 git-for-windows#240

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
jeffhostetler pushed a commit to jeffhostetler/git that referenced this pull request Jun 21, 2021
@derrickstolee @dscho
Merge gvfs-helper prefetch feature
f80297e 
Includes these pull requests:

 git-for-windows#227
 git-for-windows#228
 git-for-windows#229
 git-for-windows#231
 git-for-windows#240

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
jeffhostetler pushed a commit to jeffhostetler/git that referenced this pull request Aug 18, 2021
@derrickstolee
Merge gvfs-helper prefetch feature
cadf2b5 
Includes these pull requests:

 git-for-windows#227
 git-for-windows#228
 git-for-windows#229
 git-for-windows#231
 git-for-windows#240

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
mjcheetham pushed a commit to mjcheetham/git that referenced this pull request Jun 16, 2022
@derrickstolee @mjcheetham
Merge gvfs-helper prefetch feature
db148b4 
Includes these pull requests:

 git-for-windows#227
 git-for-windows#228
 git-for-windows#229
 git-for-windows#231
 git-for-windows#240

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
mjcheetham pushed a commit to mjcheetham/git that referenced this pull request Jul 23, 2024
@derrickstolee @mjcheetham
Merge gvfs-helper prefetch feature
1188a9b 
Includes these pull requests:

 git-for-windows#227
 git-for-windows#228
 git-for-windows#229
 git-for-windows#231
 git-for-windows#240

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tboegi @dscho