From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 3/3] tests: automatic whitespace trimming broke earlier commit
Date: Wed, 15 Jan 2014 20:15:53 +0000 [thread overview]
Message-ID: <1389816953-11531-3-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1389816953-11531-1-git-send-email-kerolasa@iki.fi>
Setting in .gitconfig to do 'git apply --whitespace=fix' automatically
turned automation against user.
Frankencommit: 4d2f0d08f67707b6d44d4a45fb6e21876c02c731
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
tests/expected/cal/weekarg | 84 +++++++++++++++++++++++-----------------------
1 file changed, 42 insertions(+), 42 deletions(-)
diff --git a/tests/expected/cal/weekarg b/tests/expected/cal/weekarg
index 5c4eac9..75e2efb 100644
--- a/tests/expected/cal/weekarg
+++ b/tests/expected/cal/weekarg
@@ -1,13 +1,13 @@
Gregorian - Monday-based, week 40, 3 month
- September 2013 October 2013 November 2013
+ September 2013 October 2013 November 2013
Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su
-35 1 40 1 2 3 4 5 6 44 1 2 3
-36 2 3 4 5 6 7 8 41 7 8 9 10 11 12 13 45 4 5 6 7 8 9 10
-37 9 10 11 12 13 14 15 42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17
-38 16 17 18 19 20 21 22 43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24
-39 23 24 25 26 27 28 29 44 28 29 30 31 48 25 26 27 28 29 30
-40 30
+35 1 40 1 2 3 4 5 6 44 1 2 3
+36 2 3 4 5 6 7 8 41 7 8 9 10 11 12 13 45 4 5 6 7 8 9 10
+37 9 10 11 12 13 14 15 42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17
+38 16 17 18 19 20 21 22 43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24
+39 23 24 25 26 27 28 29 44 28 29 30 31 48 25 26 27 28 29 30
+40 30
Gregorian - Sunday-based, week 40, 3 month
September 2013 October 2013 November 2013
Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa
@@ -18,14 +18,14 @@ Gregorian - Sunday-based, week 40, 3 month
39 29 30 43 27 28 29 30 31 47 24 25 26 27 28 29 30
Julian - Monday-based, week 40, 3 month
- September 2013 October 2013 November 2013
+ September 2013 October 2013 November 2013
Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun
-35 244 40 274 275 276 277 278 279 44 305 306 307
-36 245 246 247 248 249 250 251 41 280 281 282 283 284 285 286 45 308 309 310 311 312 313 314
-37 252 253 254 255 256 257 258 42 287 288 289 290 291 292 293 46 315 316 317 318 319 320 321
-38 259 260 261 262 263 264 265 43 294 295 296 297 298 299 300 47 322 323 324 325 326 327 328
-39 266 267 268 269 270 271 272 44 301 302 303 304 48 329 330 331 332 333 334
-40 273
+35 244 40 274 275 276 277 278 279 44 305 306 307
+36 245 246 247 248 249 250 251 41 280 281 282 283 284 285 286 45 308 309 310 311 312 313 314
+37 252 253 254 255 256 257 258 42 287 288 289 290 291 292 293 46 315 316 317 318 319 320 321
+38 259 260 261 262 263 264 265 43 294 295 296 297 298 299 300 47 322 323 324 325 326 327 328
+39 266 267 268 269 270 271 272 44 301 302 303 304 48 329 330 331 332 333 334
+40 273
Julian - Sunday-based, week 40, 3 month
September 2013 October 2013 November 2013
Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat
@@ -36,14 +36,14 @@ Julian - Sunday-based, week 40, 3 month
39 272 273 43 300 301 302 303 304 47 328 329 330 331 332 333 334
Gregorian - Monday-based, week 40, 1 month
- October 2013
+ October 2013
Mo Tu We Th Fr Sa Su
-40 1 2 3 4 5 6
-41 7 8 9 10 11 12 13
-42 14 15 16 17 18 19 20
-43 21 22 23 24 25 26 27
-44 28 29 30 31
-
+40 1 2 3 4 5 6
+41 7 8 9 10 11 12 13
+42 14 15 16 17 18 19 20
+43 21 22 23 24 25 26 27
+44 28 29 30 31
+
Gregorian - Sunday-based, week 40, 1 month
October 2013
Su Mo Tu We Th Fr Sa
@@ -54,14 +54,14 @@ Gregorian - Sunday-based, week 40, 1 month
43 27 28 29 30 31
Julian - Monday-based, week 40, 1 month
- October 2013
+ October 2013
Mon Tue Wed Thu Fri Sat Sun
-40 274 275 276 277 278 279
-41 280 281 282 283 284 285 286
-42 287 288 289 290 291 292 293
-43 294 295 296 297 298 299 300
-44 301 302 303 304
-
+40 274 275 276 277 278 279
+41 280 281 282 283 284 285 286
+42 287 288 289 290 291 292 293
+43 294 295 296 297 298 299 300
+44 301 302 303 304
+
Julian - Sunday-based, week 40, 1 month
October 2013
Sun Mon Tue Wed Thu Fri Sat
@@ -108,20 +108,20 @@ Julian - Monday-based, week 53 with colors, 1 month
4 25 26 27 28 29 30 31
Gregorian - Monday-based, week 40 with colors, 3 month
- September 2013 October 2013 November 2013
+ September 2013 October 2013 November 2013
Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su
-35 1 ^[[7m40^[[27m 1 2 3 4 5 6 44 1 2 3
-36 2 3 4 5 6 7 8 41 ^[[7m 7^[[27m 8 9 10 11 12 13 45 4 5 6 7 8 9 10
-37 9 10 11 12 13 14 15 42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17
-38 16 17 18 19 20 21 22 43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24
-39 23 24 25 26 27 28 29 44 28 29 30 31 48 25 26 27 28 29 30
-^[[7m40^[[27m 30
+35 1 ^[[7m40^[[27m 1 2 3 4 5 6 44 1 2 3
+36 2 3 4 5 6 7 8 41 ^[[7m 7^[[27m 8 9 10 11 12 13 45 4 5 6 7 8 9 10
+37 9 10 11 12 13 14 15 42 14 15 16 17 18 19 20 46 11 12 13 14 15 16 17
+38 16 17 18 19 20 21 22 43 21 22 23 24 25 26 27 47 18 19 20 21 22 23 24
+39 23 24 25 26 27 28 29 44 28 29 30 31 48 25 26 27 28 29 30
+^[[7m40^[[27m 30
Julian - Monday-based, week 40 with colors, 3 month
- September 2013 October 2013 November 2013
+ September 2013 October 2013 November 2013
Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun Mon Tue Wed Thu Fri Sat Sun
-35 244 ^[[7m40^[[27m 274 275 276 277 278 279 44 305 306 307
-36 245 246 247 248 249 250 251 41 ^[[7m280^[[27m 281 282 283 284 285 286 45 308 309 310 311 312 313 314
-37 252 253 254 255 256 257 258 42 287 288 289 290 291 292 293 46 315 316 317 318 319 320 321
-38 259 260 261 262 263 264 265 43 294 295 296 297 298 299 300 47 322 323 324 325 326 327 328
-39 266 267 268 269 270 271 272 44 301 302 303 304 48 329 330 331 332 333 334
-^[[7m40^[[27m 273
+35 244 ^[[7m40^[[27m 274 275 276 277 278 279 44 305 306 307
+36 245 246 247 248 249 250 251 41 ^[[7m280^[[27m 281 282 283 284 285 286 45 308 309 310 311 312 313 314
+37 252 253 254 255 256 257 258 42 287 288 289 290 291 292 293 46 315 316 317 318 319 320 321
+38 259 260 261 262 263 264 265 43 294 295 296 297 298 299 300 47 322 323 324 325 326 327 328
+39 266 267 268 269 270 271 272 44 301 302 303 304 48 329 330 331 332 333 334
+^[[7m40^[[27m 273
--
1.8.5.3
next prev parent reply other threads:[~2014-01-15 20:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-15 20:15 [PATCH 1/3] cal: limit year to 32 bit value Sami Kerola
2014-01-15 20:15 ` [PATCH 2/3] tests: cal(1) is year is limited to signed " Sami Kerola
2014-01-15 20:15 ` Sami Kerola [this message]
2014-02-17 8:31 ` [PATCH 3/3] tests: automatic whitespace trimming broke earlier commit Mike Frysinger
2014-02-17 9:01 ` Sami Kerola
2014-02-17 12:49 ` Karel Zak
2014-02-06 15:56 ` [PATCH 1/3] cal: limit year to 32 bit value Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1389816953-11531-3-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox