Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

When argument parsing fails to detect a file name, "git-gui" will try to
use the previously detected "head" as the file name. We should avoid
prepending the prefix if "head" looks like a full path.
Signed-off-by: NAndrew Wong <andrew.kw.w@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

When running "git-gui blame" from a subfolder (which means prefix is
non-empty), if we pass a full path as argument, the argument parsing
will fail to recognize the argument as a file name, because prefix is
prepended to the argument.

This patch handles that scenario by adding an additional branch that
checks the file name without using the prefix.
Signed-off-by: NAndrew Wong <andrew.kw.w@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Adding _git_ps1() to one's bash prompt displays various repo status
info after each command. After committing a git cherry-pick -n using
git-gui, the prompt still contains the "|CHERRY-PICKING" flag.

Delete the file causing this flag when cleaning up.
Signed-off-by: NBeat Bolli <bbolli@ewanet.ch>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Acked-by: NJunio C Hamano <gitster@pobox.com>
Signed-off-by: NBeat Bolli <bbolli@ewanet.ch>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Make Ctrl+U for unstaging and Ctrl+J for reverting selection behave
more like Ctrl+T for adding.

They were working only when one area was focused (diff or commit message),
now they should work everywhere.
Acked-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NVitaly _Vi Shukela <vi0oss@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

According to the translation in git-core, we
translate "remote" as "extern".
Signed-off-by: NRalf Thielow <ralf.thielow@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

According to the translation in git-core, we
translate "bare" as "bloß".
Signed-off-by: NRalf Thielow <ralf.thielow@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

The user might not really know what hook is
actually meant if it's translated. To avoid such
a confusion we should consistently write it untranslated
within braces after.
Signed-off-by: NRalf Thielow <ralf.thielow@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

The commit message buffer is automatically preserved to a local file
but this uses the system encoding which may fail to properly encode
unicode text. Forcing this file to use utf-8 preserves the message
correctly.
Reported-by: NÁngel José Riesgo <ajriesgo@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

When starting a gui program on windows stdout, stderr and stdin are not
connected to the cmd console. As a workaround tk has a console window.
Lets open this when the --trace commandline option has been given.
This is helpful for debugging.
Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

"succeeded" was misspelled in the code, which propagated throughout the
 translations.

Fixed all of them.

Signed-off-by: Benjamin Kerensa <bkerensa <at> ubuntu.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

The current working directory is set to / when git-gui is invoked
using the Git Gui.app bundle on Mac OS X. This means that if it is
launched from a directory which contains a repository then git-gui
won't automatically find it unless the repository happens to be
located in /.

The PWD environment variable is however preserved if the bundle is
invoked using open(1). If git-gui would check for PWD then a user
could for example type open -a 'Git Gui' on a command line in order to
launch the program and it would automatically find the repository.

Teach git-gui to use the PWD environment variable on Mac OS X.
Signed-off-by: NMarcus Karlsson <mk@acc.umu.se>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Recently, a clone initiated via git gui on Windows crashed on me due to
an "unknown variable cdone". It turns out that there is a code path
where this variable is used uninitialized.
Signed-off-by: NClemens Buchacher <drizzd@aon.at>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

When loading a file into the blame window git-gui does all the work and
must handle the text conversion filters if defined. On Windows it is
necessary to detect the need for a shell script explicitly.

Such filter commands are run using non-blocking I/O but this has the
unfortunate side effect of losing any error that might be reported when
the pipe is closed. Switching to blocking mode just before closing
enables reporting of errors in the filter scripts to the user.
Tested-by: NSebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

It would be better if the 32x32 icon was equivalent to the one used on
Windows (in git-gui.ico), but I'm not sure how that would best be done,
so I copied this code from gitk instead.
Signed-off-by: NSamuel Bronson <naesten@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

On startup in multicommit mode git-gui checks to see if the repository
has a lot of objects. If so it shows a dialog suggesting gc be run.
This adds 'gui.gcwarning' as a control config variable to allow this
to be disabled. The default is true (the warning is shown). Setting this
false will prevent the check being done.
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NTilman Vogel <tilman.vogel@web.de>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

This ensures that underline does not conflict with inverse colors.
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Suggested-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Spelling error originally reported to Ubuntu as launchpad bug #879427.
Acked-by: NErik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: NDejan Ribič <dejan.ribic@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

For those guitools that require a filename, display this filename when
asking the user to confirm the tool launch.

[PT: modified to use positional parameters for i18n]
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

The config is now called gui.search.case and can have the three values:
no/yes/smart. yes is the default.

It also resets the case detection in smart mode, when the entry field was
cleared by the use.
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

This patch uses recent Tk attributes support to specify the intended use of new
toplevels by setting the correct EWMH hint. This helps modern window managers
to apply sensible decoration for the tooltip and dialogs.
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Ensure the browser path is shown on the title with a / suffix and escape
any backslashes or newlines in path elements before display.
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

The default is the current "ask".
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

"untracked" is the right phrase for files new to git. For example
git-status uses this phrase. Also make the question shorter.
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Use the up/down keys to browse the history.
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>