From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 16 Jan 2008 06:29:39 +0000 (-0500)
Subject: git-gui: Refresh file status description after hunk application
X-Git-Tag: v1.5.4-rc4~1^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a41e45ea1ccc88b4b13af16434c79ffe65ba978a;p=thirdparty%2Fgit.git

git-gui: Refresh file status description after hunk application

If we apply a hunk in either direction this may change the file's
status.  For example if a file is completely unstaged, and has at
least two hunks in it and the user stages one hunk the file will
change from "Modified, not staged" to "Portions staged for commit".

Resetting the file path causes our trace on this variable to fire;
that trace is used to update the file header in the diff viewer to
the file's current status.

Noticed by Johannes Sixt.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/lib/diff.tcl b/lib/diff.tcl
index 18aba3eae3..d04f6dbde2 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -358,5 +358,7 @@ proc apply_hunk {x y} {
 	display_file $current_diff_path $mi
 	if {$o eq {_}} {
 		clear_diff
+	} else {
+		set current_diff_path $current_diff_path
 	}
 }