merge(third_party/git): Merge squashed git subtree at v2.23.0 r/373

Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'

3 files changed, 59 insertions, 0 deletions

diff --git a/third_party/git/git-gui/macosx/AppMain.tcl b/third_party/git/git-gui/macosx/AppMain.tcl
new file mode 100644
index 000000000000..b6c6dc35003b
--- /dev/null
+++ b/third_party/git/git-gui/macosx/AppMain.tcl
@@ -0,0 +1,29 @@
+set gitexecdir {@@gitexecdir@@}
+if { [info exists ::env(GIT_GUI_LIB_DIR) ] } {
+	set gitguilib $::env(GIT_GUI_LIB_DIR)
+} else {
+	set gitguilib {@@GITGUI_LIBDIR@@}
+}
+
+set env(PATH) "$gitexecdir:$env(PATH)"
+
+if {[string first -psn [lindex $argv 0]] == 0} {
+	lset argv 0 [file join $gitexecdir git-gui]
+}
+
+if {[file tail [lindex $argv 0]] eq {gitk}} {
+	set argv0 [lindex $argv 0]
+	set AppMain_source $argv0
+} else {
+	set argv0 [file join $gitexecdir [file tail [lindex $argv 0]]]
+	set AppMain_source [file join $gitguilib git-gui.tcl]
+	if {[info exists env(PWD)]} {
+		cd $env(PWD)
+	} elseif {[pwd] eq {/}} {
+		cd $env(HOME)
+	}
+}
+
+unset gitexecdir gitguilib
+set argv [lrange $argv 1 end]
+source $AppMain_source
diff --git a/third_party/git/git-gui/macosx/Info.plist b/third_party/git/git-gui/macosx/Info.plist
new file mode 100644
index 000000000000..1ade121c4cc5
--- /dev/null
+++ b/third_party/git/git-gui/macosx/Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>@@GITGUI_TKEXECUTABLE@@</string>
+	<key>CFBundleGetInfoString</key>
+	<string>Git Gui @@GITGUI_VERSION@@ © 2006-2007 Shawn Pearce, et. al.</string>
+	<key>CFBundleIconFile</key>
+	<string>git-gui.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>cz.or.repo.git-gui</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Git Gui</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>@@GITGUI_VERSION@@</string>
+	<key>CFBundleSignature</key>
+	<string>GITg</string>
+	<key>CFBundleVersion</key>
+	<string>@@GITGUI_VERSION@@</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
+</dict>
+</plist>
diff --git a/third_party/git/git-gui/macosx/git-gui.icns b/third_party/git/git-gui/macosx/git-gui.icns
new file mode 100644
index 000000000000..77d88a77a766
--- /dev/null
+++ b/third_party/git/git-gui/macosx/git-gui.icns
Binary files differ