git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 3/4] gitk: Remember time zones from author and commit timestamps

From
Anders Kaseorg <andersk@mit.edu>
Date
Nov 19, 2010, 07:38 UTC
Message-ID
<1290152300-21393-3-git-send-email-andersk@mit.edu>
In-Reply-To
<1290152300-21393-1-git-send-email-andersk@mit.edu>

When resolving a conflicted cherry-pick, this lets us pass GIT_AUTHOR_DATE to git citool with the correct timezone.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 gitk-git/gitk |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 61f2e95..acdbd21 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -644,7 +644,7 @@ proc newvarc {view id} {
 	if {![info exists commitinfo($id)]} {
 	    parsecommit $id $commitdata($id) 1
 	}
-	set cdate [lindex $commitinfo($id) 4]
+	set cdate [lindex [lindex $commitinfo($id) 4] 0]
 	if {![string is integer -strict $cdate]} {
 	    set cdate 0
 	}
@@ -1626,10 +1626,10 @@ proc parsecommit {id contents listed} {
 	set line [split $line " "]
 	set tag [lindex $line 0]
 	if {$tag == "author"} {
-	    set audate [lindex $line end-1]
+	    set audate [lrange $line end-1 end]
 	    set auname [join [lrange $line 1 end-2] " "]
 	} elseif {$tag == "committer"} {
-	    set comdate [lindex $line end-1]
+	    set comdate [lrange $line end-1 end]
 	    set comname [join [lrange $line 1 end-2] " "]
 	}
     }
@@ -10957,7 +10957,7 @@ proc prefsok {} {
 proc formatdate {d} {
     global datetimeformat
     if {$d ne {}} {
-	set d [clock format $d -format $datetimeformat]
+	set d [clock format [lindex $d 0] -format $datetimeformat]
     }
     return $d
 }
-- 
1.7.3.2
Previous: Anders KaseorgNext: Anders Kaseorg
Message 3 of 4 in “gitk: Update cherry-pick error message parsing”
  1. 1/4 gitk: Update cherry-pick error message parsingAnders Kaseorg, Nov 19, 2010
  2. 2/4 gitk: Remove unused $cdate arrayAnders Kaseorg, Nov 19, 2010
  3. 3/4 gitk: Remember time zones from author and commit timestampsAnders Kaseorg, Nov 19, 2010
  4. 4/4 gitk: Allow displaying time zones from author and commit timestampsAnders Kaseorg, Nov 19, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.