The first mentions 'git stash' in a relevant paragraph. The second changes parameters for 'lcov' example - the current parameters produce wrong output (the source files are not found, with LCOV version 1.9 ).
-gordon
>From e1ece5ff278258a18a078cad1d8fbf65c7e4fe71 Mon Sep 17 00:00:00 2001 From: Assaf Gordon <[email protected]> Date: Thu, 13 Dec 2012 11:42:01 -0500 Subject: [PATCH 1/2] doc: mention "git stash" in HACKING --- HACKING | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/HACKING b/HACKING index f3f961a..84e9707 100644 --- a/HACKING +++ b/HACKING @@ -120,6 +120,8 @@ Note 2: sometimes the checkout will fail, telling you that your local modifications conflict with changes required to switch branches. However, in any case, you will *not* lose your uncommitted changes. + Run "git stash" to temporarily hide uncommited changes in your + local directory, restoring a clean working directory. Anyhow, get back onto your just-created branch: -- 1.7.7.4 >From 8cd8f40882daa165ced8091697c158c7afb479d6 Mon Sep 17 00:00:00 2001 From: Assaf Gordon <[email protected]> Date: Thu, 13 Dec 2012 14:20:47 -0500 Subject: [PATCH 2/2] doc: tweak 'lcov' in HACKING Use the correct -b (--base-directory) parameter. --- HACKING | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/HACKING b/HACKING index 84e9707..8e4243f 100644 --- a/HACKING +++ b/HACKING @@ -610,8 +610,8 @@ to generate HTML coverage reports. Follow these steps: # run whatever tests you want, i.e.: make check # run lcov - lcov -t coreutils -q -d lib -b lib -o lib.lcov -c - lcov -t coreutils -q -d src -b src -o src.lcov -c + lcov -t coreutils -q -d lib -b `pwd` -o lib.lcov -c + lcov -t coreutils -q -d src -b `pwd` -o src.lcov -c # generate HTML from the output genhtml -p `pwd` -t coreutils -q --output-directory lcov-html *.lcov -- 1.7.7.4
