1
0
mirror of https://github.com/git/git.git synced 2024-09-30 10:11:21 +02:00
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
Go to file
Shawn O. Pearce ce015c213f git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu
In a13ee29b975d3a9a012983309e842d942b2bbd44 I totally broke the
"Stage Hunk For Commit" feature by making this menu item always
appear in a disabled state, so it was never invokable.  A "teaser
feature", just sitting there taunting the poor user who has become
used to having it available.

The issue caused by a13ee was I added a test to look at the data
in $file_states, but I didn't do that test correctly as it was
always looking at a procedure local $file_states array, which is
not defined, so the test was always true and we always disabled
the menu entry.

Instead we only want to disable the menu entry if the current file
we are looking at has no file state information (git-gui is just a
very confused little process) or it is an untracked file (and we
cannot stage individual hunks).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-08-21 02:22:53 -04:00
lib git-gui: Allow git-merge to use branch names in conflict markers 2007-08-20 02:17:05 -04:00
.gitignore
git-gui.sh git-gui: Paper bag fix "Stage Hunk For Commit" in diff context menu 2007-08-21 02:22:53 -04:00
GIT-VERSION-GEN
Makefile Merge branch 'maint' 2007-06-27 00:36:38 -04:00