wish dies when ibus is restarted
Hello. Recently, the guys from Google have to deal with an issue in Android Studio where the user can no longer type in the IDE. Their workaround is to restart ibus via "ibus restart", which works more or less [1]. As a side effect I noticed that wish and therefore gitk and git-gui die as soon as I execute the command. I want to let you know about this in case you can do anything about this. Best, Tobias __ [1] http://tools.android.com/knownissues/ibus -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Bug report: Folder and files are deleted by git stash -u
Hello. I noticed some bizarre behaviour when using: git stash -u. It deletes folders which contain files configured to be ignored. I actually lost files by this which I could not restore. Here is how you can reproduce the case. 1. Create a project folder to act as the root of the repository. `cd` into the directory 2. Create a folder `tracked-folder` with a file `tracked-file` in it. Add some content to the file. 3. Create a folder `untracked-folder` with a file `untracked-file` in it. Add some content to the file. 4. Create a file `to-be-stashed`, add some content to the file. 5. Create a `.gitignore` file with the following content: `untracked-file`. 6. Initialize the Git repository: `git init .` 7. Add all files to be tracked: `git add . & git commit` 8. List the current content of the repository: `tree`. It should show the following: ├── to-be-stashed ├── tracked-folder │ └── tracked-file └── untracked-folder └── untracked-file 9. Run `git stash -u` and inspect the folder again: . └── tracked-folder └── tracked-file 10. Run `git stash pop` and inspect the folder once again: . ├── to-be-stashed └── tracked-folder └── tracked-file There you are - you just lost the whole folder. Can you please confirm or deny if this is a bug? Thank you. Best regards, Tobias -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] git-gui: allow "\ No newline at end of file" for linewise staging
I tested the patch as I am the same person that bothered about the
behavior a while ago. Please merge.
- Sorry for sending an HTML formatted mail before.
On Thu, May 9, 2013 at 6:30 PM, Heiko Voigt wrote:
> Counting of lines did not skip this line when generating the hunk
> header.
>
> Signed-off-by: Heiko Voigt
> ---
> Here is an attempt at fixing the no newline issue. I would appreciate
> another pair of eyes though.
>
> git-gui/lib/diff.tcl | 11 +--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
> index ec44055..30d9a79 100644
> --- a/git-gui/lib/diff.tcl
> +++ b/git-gui/lib/diff.tcl
> @@ -764,8 +764,15 @@ proc apply_range_or_line {x y} {
> # context line
> set ln [$ui_diff get $i_l $next_l]
> set patch "$patch$pre_context$ln"
> - set n [expr $n+1]
> - set m [expr $m+1]
> + # Skip the "\ No newline at end of
> + # file". Depending on the locale setting
> + # we don't know what this line looks
> + # like exactly. The only thing we do
> + # know is that it starts with "\ "
> + if {![string match {\\ *} $ln]} {
> + set n [expr $n+1]
> + set m [expr $m+1]
> + }
> set pre_context {}
> } elseif {$c1 eq $to_context} {
> # turn change line into context line
> --
> 1.8.3.rc1.40.gba374ae
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
