Re: merging emacs-24

[Michael Welsh Duggan <mwd@md5i.com>]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Michael Welsh Duggan <mwd@md5i.com>
>> Cc: emacs-devel@gnu.org
>> Date: Fri, 28 Nov 2014 09:20:38 -0500
>> 
>> I experimented with setting the GIT_TRACE and GIT_TRACE_SETUP
>> environment variables to ~/.git.log.  On the upside, you get a log of
>> what was done.  On the downside, you get a log of just about
>> _everything_ that was done.  It is difficult to tell at a glance what
>> command you typed in versus what commands your command is running under
>> the hood.  (Though git is usually fast enough that looking at the
>> timestamps can give you a very good indication of what was manual versus
>> automated.)
>> 
>> It's definitely not as nice as .bzr.log, and the output is more tuned to
>> debugging git than remembering what you did.  But you should probably
>> try it and see if its output is useful for you.
>
> Thanks, will do.

As an extra note: if you set GIT_TRACE_PERFORMANCE to the same log, you
a) get even more output!  (Not really what you want, but...)
b) You get output when the command ends that you can trace back to the
   beginning, allowing you to automate chunking the data.  For example,
   from running 'git fetch':

10:05:38.995341 trace.c:315             setup: git_dir: .git
10:05:38.995375 trace.c:316             setup: worktree: /usr/local/home/md5i/src/emacs/master
10:05:38.995379 trace.c:317             setup: cwd: /usr/local/home/md5i/src/emacs/master
10:05:38.995383 trace.c:318             setup: prefix: (null)
10:05:38.995388 git.c:349               trace: built-in: git 'fetch'
10:05:39.187844 run-command.c:341       trace: run_command: 'rev-list' '--objects' '--stdin' '--not' '--all' '--quiet'
10:05:39.188061 exec_cmd.c:134          trace: exec: 'git' 'rev-list' '--objects' '--stdin' '--not' '--all' '--quiet'
10:05:39.188772 trace.c:315             setup: git_dir: .git
10:05:39.188794 trace.c:316             setup: worktree: /usr/local/home/md5i/src/emacs/master
10:05:39.188797 trace.c:317             setup: cwd: /usr/local/home/md5i/src/emacs/master
10:05:39.188800 trace.c:318             setup: prefix: (null)
10:05:39.188806 git.c:349               trace: built-in: git 'rev-list' '--objects' '--stdin' '--not' '--all' '--quiet'
10:05:39.191515 trace.c:414             performance: 0.002864780 s: git command: 'git' 'rev-list' '--objects' '--stdin' '--not' '--all' '--quiet'
10:05:39.192073 run-command.c:341       trace: run_command: 'rev-list' '--objects' '--stdin' '--not' '--all'
10:05:39.192224 exec_cmd.c:134          trace: exec: 'git' 'rev-list' '--objects' '--stdin' '--not' '--all'
10:05:39.192836 trace.c:315             setup: git_dir: .git
10:05:39.192856 trace.c:316             setup: worktree: /usr/local/home/md5i/src/emacs/master
10:05:39.192860 trace.c:317             setup: cwd: /usr/local/home/md5i/src/emacs/master
10:05:39.192863 trace.c:318             setup: prefix: (null)
10:05:39.192868 git.c:349               trace: built-in: git 'rev-list' '--objects' '--stdin' '--not' '--all'
10:05:39.195159 trace.c:414             performance: 0.002428034 s: git command: 'git' 'rev-list' '--objects' '--stdin' '--not' '--all'
10:05:39.196573 run-command.c:341       trace: run_command: 'gc' '--auto'
10:05:39.196690 exec_cmd.c:134          trace: exec: 'git' 'gc' '--auto'
10:05:39.197279 trace.c:315             setup: git_dir: .git
10:05:39.197297 trace.c:316             setup: worktree: /usr/local/home/md5i/src/emacs/master
10:05:39.197301 trace.c:317             setup: cwd: /usr/local/home/md5i/src/emacs/master
10:05:39.197304 trace.c:318             setup: prefix: (null)
10:05:39.197309 git.c:349               trace: built-in: git 'gc' '--auto'
10:05:39.197418 trace.c:414             performance: 0.000230295 s: git command: 'git' 'gc' '--auto'
10:05:39.197509 trace.c:414             performance: 0.202293483 s: git command: 'git' 'fetch'



-- 
Michael Welsh Duggan
(md5i@md5i.com)