Up until now I was able to do git add -p in my repo. Git would ask me for the hunks I'd like to add separately ignoring all whitespace and/or line endings (crlf etc.)
I now installed the most recent version of git for Windows (git version 2.7.1.windows.2) and for some reason, whitespace is not ignored anymore.
Whenever I git add -p now, the whole changed file is displayed (prefixed with minus signs in red, then again prefixed with plus signs in green), followed by the usual prompt
Stage this hunk [y,n,q,a,d,/,e,?]?
So basically I'm not presented hunks anymore but complete files, making the feature pretty much useless.
What settings do I need to revert to/change to get "real" hunks again?
Edit: git diff has the same problem (as expected), git diff --ignore-space-at-eol and git diff --ignore-all-space give the desired output.
I have been unable to reproduce the problem since I committed the files that weren't shown as hunks anymore.
Related
I am using Ubuntu for Windows.
Vim and git work fine when calling git commit --amend, but calling git diff or git log results in improperly formatted output. Can anyone please explain when the output is not formatted correctly like when calling git commit --amend?
I'm using zsh with git aliases, which is why it says I called gc! and not git commit --amend, etc.
The stuff you're seeing—the [32m, [m, and so on—is the result of partly, but not completely, stripping out colorization codes. Git is printing ESC [ (optional digits) m so as to tell your terminal emulator / display window to change colors, backgrounds, and so on. The pager you're using is for some reason removing the ESC but leaving the rest in.
To find out which pager you're using, use:
git var GIT_PAGER
To correct its behavior ... well, that depends on which pager you're using. :-)
I'm using cygwin under Windows to do some command line stuff. One of the commands I use sometimes is git stash. Since few weeks I always get this error when I use it: Cannot save the current index state
I also tried it in other projects, so it is no project related issue. The history is not broken or something like that. I don't use it often so I don't know when the issue started.
The error is thrown on line 110 of the git-stash file. That's why I debugged the two lines before.
$(printf 'index on %s\n' "$msg" |
git commit-tree $i_tree -p $b_commit)
When I echo the first command it outputs my last commit. This seems ok. When I output both commands piped it is empty, so maybe something is wrong with "git commit-tree $i_tree -p $b_commit". I google a long time but was not able to find a solution to this issue.
Cygwin Git version: 2.14.1
Cygwin x64 version: 2.8.2(0.313/5/3)
First, check if the issue persists with bash (the bash packaged with Git). Make sure to set your PATH in order to:
no include cygwin
include git/bin, git/usr/bin, git/mingw64/bin: see this example.
Working with a simplified path (for testing purposes) is important to make sure there is no side-effect from any other software.
Second, try and add a git status in the git stash critical lines, to see if the Git repo status reveal anything suspicious.
So I'm running git in Windows with a repo that runs on *nix, where git checks out Windows-style newlines (line ending CRLF) but commits *nix-style (LF), however I can't get a diff/apply to work without some fatal snag no matter what I've tried.
For example, I run a diff to a file from one commit to another like:
git diff commit1 commit2 > patch.diff
But when I run git apply patch.diff, I get errors like:
trailing whitespace
patch failed
patch does not apply
I've tried setting git config --global core.autocrlf true, tried git apply --ignore-space-change --ignore-whitespace patch.diff, and git config --global core.whitespace cr-at-eol, and even if it works, the apply shows that almost every line of code was changed just because of the newlines.
If I check the applied patch in something like Git GUI or WinMerge, it shows the proper changes just because they ignore newline changes, but either the diff or apply command is considering the newline differences, and everything I've found on the web to try just doesn't end up with a proper result.
I found something about git rm --cached -r . but it requires committing all files with "fixed" newlines... which isn't feasible for our project (and shouldn't be necessary).
Am I just not running the right combination or commands and options or what am I supposed to do?
I have several repos that have been converted from SVN. Each time I attempt to run git rebase -i master, the message defaults to noop. When saving, I get Successfully rebased and updated refs/heads/master which seems suggest it has done something, but all commits are still present.
I did find this question but the solution doesn't appear to apply to OsX.
I also tried git rebase -i HEAD~3 on a project with 3 commits, but I get:
fatal: Needed a single revision
Using rebase -i HEAD~2 will and rebases correctly, but I need to squash these to a single commit with the init commit date.
Interestingly, the rebase consistently misses the earliest commit on each project. In each it it the only commit not assigned to my user (it is a system commit), so I wonder if that is related.
The question cited has a possible answer: Setting the shell variable IFS (what characters are interpreted as separating "words" in shell lines, in this case separating arguments) makes two arguments interpreted as one (obviously unknown), and the (internal) command fails with the cited result.
See to what (if anything) IFS is set (echo $IFS). Try (unset IFS; git rebase -i HEAD~3) (the parentesis are required here in bash(1), OS X shell could be different, but I doubt it).
In my repository, which has mixed line endings.
I am using Mac OS X, and git 1.8.3.1
I would like to renormalize this repository so that every file has line endings that agree with the .gitattributes file.
To this end, I have checked out the latest change:
git checkout origin/develop
git reset --hard
git rm -rf .
git rm --cached -rf .
rm .git/index
git checkout HEAD .gitattributes
git reset --hard
git status
Now, git rm --cached -rf . will cause an error, but I am being very paranoid with the above command. (On my machine, those commands were on one line, ignoring exit codes)
I repeat the command many times. (Ie, UP; ENTER; UP; ENTER; UP; ENTER;...)
Most of the time, I have a clean check out, which is not what I am expecting.
However, roughly once every ten times, I find that I get three files (which seem to be correctly renormalized). The remaining times there is no renormalization.
The output of such a file that gets renormalized (Ie, is 'modified') is:
$ file source/RemoveDuplications.cs
source/RemoveDuplications.cs: UTF-8 Unicode (with BOM) C++ program text, with CRLF line terminators
My git attributes file has a fair number of entries, but the relevant one is here:
* text=auto
*.cs text eol=crlf
What might be going wrong here?
It looks like what you are doing may be overly complex. You shouldn't need to remove all files from the repo or delete the index by hand. Have you tried:
git rm --cached -r . # remove everything from the index
git reset --hard # replace files w/ corrected line endings
git add . # stage all changes
git commit -m "Normalize line endings"
If this isn't working for you I'd re-check the values of your core.autocrlf and .gitattributes. You may need to clear those, reset your shell, check out the repo again and then reset them to get the behavior you want.
Here are some other resources that might help:
Github - dealing w/ line endings
A similar question here with multiple answers to consider
A good post about the pros/cons of this approach vs git filter-branch
You could always use something like a sed script to edit the files and then recommit them to see if this keeps happening. If you do this from the command line, you should, using the proper regex, be able to pull out any hidden characters that might be causing your problem.