t4211: add test cases for SHA-256
There are already files containing example output for SHA-1. Add test files providing example output for SHA-256 as well and adjust the test to look up the appropriate ones based on the algorithm in use. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
							parent
							
								
									f743e8f5b3
								
							
						
					
					
						commit
						dfa5f53e78
					
				|  | @ -4,6 +4,7 @@ test_description='test log -L' | |||
| . ./test-lib.sh | ||||
|  | ||||
| test_expect_success 'setup (import history)' ' | ||||
| 	test_oid_init && | ||||
| 	git fast-import < "$TEST_DIRECTORY"/t4211/history.export && | ||||
| 	git reset --hard | ||||
| ' | ||||
|  | @ -11,7 +12,7 @@ test_expect_success 'setup (import history)' ' | |||
| canned_test_1 () { | ||||
| 	test_expect_$1 "$2" " | ||||
| 		git log $2 >actual && | ||||
| 		test_cmp \"\$TEST_DIRECTORY\"/t4211/sha1/expect.$3 actual | ||||
| 		test_cmp \"\$TEST_DIRECTORY\"/t4211/$(test_oid algo)/expect.$3 actual | ||||
| 	" | ||||
| } | ||||
|  | ||||
|  |  | |||
|  | @ -0,0 +1,43 @@ | |||
| commit 62a40b38fa4f00800004aee81ef287b7201317594ebcb990f38cbe493b01d200 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:47:40 2013 +0100 | ||||
|  | ||||
|     change at very beginning | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -1,3 +1,4 @@ | ||||
| +#include <unistd.h> | ||||
|  #include <stdio.h> | ||||
|   | ||||
|  long f(long x) | ||||
|  | ||||
| commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:16 2013 +0100 | ||||
|  | ||||
|     touch both functions | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -1,3 +1,3 @@ | ||||
|  #include <stdio.h> | ||||
|   | ||||
| -int f(int x) | ||||
| +long f(long x) | ||||
|  | ||||
| commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:48 2013 +0100 | ||||
|  | ||||
|     initial | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- /dev/null | ||||
| +++ b/a.c | ||||
| @@ -0,0 +1,3 @@ | ||||
| +#include <stdio.h> | ||||
| + | ||||
| +int f(int x) | ||||
|  | @ -0,0 +1,62 @@ | |||
| commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:43 2013 +0100 | ||||
|  | ||||
|     change back to complete line | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -20,3 +20,5 @@ | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| \ No newline at end of file | ||||
| +} | ||||
| + | ||||
| +/* incomplete lines are bad! */ | ||||
|  | ||||
| commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:10 2013 +0100 | ||||
|  | ||||
|     change to an incomplete line at end | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -20,3 +20,3 @@ | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| +} | ||||
| \ No newline at end of file | ||||
|  | ||||
| commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:16 2013 +0100 | ||||
|  | ||||
|     touch both functions | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -19,3 +19,3 @@ | ||||
| -	printf("%d\n", f(15)); | ||||
| +	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
|  } | ||||
|  | ||||
| commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:48 2013 +0100 | ||||
|  | ||||
|     initial | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- /dev/null | ||||
| +++ b/a.c | ||||
| @@ -0,0 +18,3 @@ | ||||
| +	printf("%d\n", f(15)); | ||||
| +	return 0; | ||||
| +} | ||||
|  | @ -0,0 +1,80 @@ | |||
| commit 4f7a58195a92c400e28a2354328587f1ff14fb77f5cf894536f17ccbc72931b9 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:49:50 2013 +0100 | ||||
|  | ||||
|     another simple change | ||||
|  | ||||
| diff --git a/b.c b/b.c | ||||
| --- a/b.c | ||||
| +++ b/b.c | ||||
| @@ -4,9 +4,9 @@ | ||||
|  long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
| -		x >>= 1; | ||||
| +		x /= 2; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|  | ||||
| commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:16 2013 +0100 | ||||
|  | ||||
|     touch both functions | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,9 +3,9 @@ | ||||
| -int f(int x) | ||||
| +long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|  | ||||
| commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:55 2013 +0100 | ||||
|  | ||||
|     change f() | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,8 +3,9 @@ | ||||
|  int f(int x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
| +	return s; | ||||
|  } | ||||
|  | ||||
| commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:48 2013 +0100 | ||||
|  | ||||
|     initial | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- /dev/null | ||||
| +++ b/a.c | ||||
| @@ -0,0 +3,8 @@ | ||||
| +int f(int x) | ||||
| +{ | ||||
| +	int s = 0; | ||||
| +	while (x) { | ||||
| +		x >>= 1; | ||||
| +		s++; | ||||
| +	} | ||||
| +} | ||||
|  | @ -0,0 +1,104 @@ | |||
| commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:43 2013 +0100 | ||||
|  | ||||
|     change back to complete line | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -18,5 +18,7 @@ | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| \ No newline at end of file | ||||
| +} | ||||
| + | ||||
| +/* incomplete lines are bad! */ | ||||
|  | ||||
| commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:10 2013 +0100 | ||||
|  | ||||
|     change to an incomplete line at end | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -18,5 +18,5 @@ | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| +} | ||||
| \ No newline at end of file | ||||
|  | ||||
| commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:16 2013 +0100 | ||||
|  | ||||
|     touch both functions | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,9 +3,9 @@ | ||||
| -int f(int x) | ||||
| +long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
| @@ -17,5 +17,5 @@ | ||||
|  int main () | ||||
|  { | ||||
| -	printf("%d\n", f(15)); | ||||
| +	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
|  } | ||||
|  | ||||
| commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:55 2013 +0100 | ||||
|  | ||||
|     change f() | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,8 +3,9 @@ | ||||
|  int f(int x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
| +	return s; | ||||
|  } | ||||
|  | ||||
| commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:48 2013 +0100 | ||||
|  | ||||
|     initial | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- /dev/null | ||||
| +++ b/a.c | ||||
| @@ -0,0 +3,8 @@ | ||||
| +int f(int x) | ||||
| +{ | ||||
| +	int s = 0; | ||||
| +	while (x) { | ||||
| +		x >>= 1; | ||||
| +		s++; | ||||
| +	} | ||||
| +} | ||||
|  | @ -0,0 +1,187 @@ | |||
| commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:43 2013 +0100 | ||||
|  | ||||
|     change back to complete line | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -4,19 +4,21 @@ | ||||
|  long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
|   * This is only an example! | ||||
|   */ | ||||
|   | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| \ No newline at end of file | ||||
| +} | ||||
| + | ||||
| +/* incomplete lines are bad! */ | ||||
|  | ||||
| commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:10 2013 +0100 | ||||
|  | ||||
|     change to an incomplete line at end | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -4,19 +4,19 @@ | ||||
|  long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
|   * This is only an example! | ||||
|   */ | ||||
|   | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| +} | ||||
| \ No newline at end of file | ||||
|  | ||||
| commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:41 2013 +0100 | ||||
|  | ||||
|     touch comment | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,19 +3,19 @@ | ||||
|  long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
| - * A comment. | ||||
| + * This is only an example! | ||||
|   */ | ||||
|   | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
|  } | ||||
|  | ||||
| commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:16 2013 +0100 | ||||
|  | ||||
|     touch both functions | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,19 +3,19 @@ | ||||
| -int f(int x) | ||||
| +long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
|   * A comment. | ||||
|   */ | ||||
|   | ||||
|  int main () | ||||
|  { | ||||
| -	printf("%d\n", f(15)); | ||||
| +	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
|  } | ||||
|  | ||||
| commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:55 2013 +0100 | ||||
|  | ||||
|     change f() | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,18 +3,19 @@ | ||||
|  int f(int x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
| +	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
|   * A comment. | ||||
|   */ | ||||
|   | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%d\n", f(15)); | ||||
|  	return 0; | ||||
|  } | ||||
|  | ||||
| commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:48 2013 +0100 | ||||
|  | ||||
|     initial | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- /dev/null | ||||
| +++ b/a.c | ||||
| @@ -0,0 +3,18 @@ | ||||
| +int f(int x) | ||||
| +{ | ||||
| +	int s = 0; | ||||
| +	while (x) { | ||||
| +		x >>= 1; | ||||
| +		s++; | ||||
| +	} | ||||
| +} | ||||
| + | ||||
| +/* | ||||
| + * A comment. | ||||
| + */ | ||||
| + | ||||
| +int main () | ||||
| +{ | ||||
| +	printf("%d\n", f(15)); | ||||
| +	return 0; | ||||
| +} | ||||
|  | @ -0,0 +1,187 @@ | |||
| commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:43 2013 +0100 | ||||
|  | ||||
|     change back to complete line | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -4,19 +4,21 @@ | ||||
|  long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
|   * This is only an example! | ||||
|   */ | ||||
|   | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| \ No newline at end of file | ||||
| +} | ||||
| + | ||||
| +/* incomplete lines are bad! */ | ||||
|  | ||||
| commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:10 2013 +0100 | ||||
|  | ||||
|     change to an incomplete line at end | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -4,19 +4,19 @@ | ||||
|  long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
|   * This is only an example! | ||||
|   */ | ||||
|   | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| +} | ||||
| \ No newline at end of file | ||||
|  | ||||
| commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:41 2013 +0100 | ||||
|  | ||||
|     touch comment | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,19 +3,19 @@ | ||||
|  long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
| - * A comment. | ||||
| + * This is only an example! | ||||
|   */ | ||||
|   | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
|  } | ||||
|  | ||||
| commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:16 2013 +0100 | ||||
|  | ||||
|     touch both functions | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,19 +3,19 @@ | ||||
| -int f(int x) | ||||
| +long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
|   * A comment. | ||||
|   */ | ||||
|   | ||||
|  int main () | ||||
|  { | ||||
| -	printf("%d\n", f(15)); | ||||
| +	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
|  } | ||||
|  | ||||
| commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:55 2013 +0100 | ||||
|  | ||||
|     change f() | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,18 +3,19 @@ | ||||
|  int f(int x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
| +	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
|   * A comment. | ||||
|   */ | ||||
|   | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%d\n", f(15)); | ||||
|  	return 0; | ||||
|  } | ||||
|  | ||||
| commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:48 2013 +0100 | ||||
|  | ||||
|     initial | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- /dev/null | ||||
| +++ b/a.c | ||||
| @@ -0,0 +3,18 @@ | ||||
| +int f(int x) | ||||
| +{ | ||||
| +	int s = 0; | ||||
| +	while (x) { | ||||
| +		x >>= 1; | ||||
| +		s++; | ||||
| +	} | ||||
| +} | ||||
| + | ||||
| +/* | ||||
| + * A comment. | ||||
| + */ | ||||
| + | ||||
| +int main () | ||||
| +{ | ||||
| +	printf("%d\n", f(15)); | ||||
| +	return 0; | ||||
| +} | ||||
|  | @ -0,0 +1,160 @@ | |||
| commit 98117c2059b76c36995748fb97b02542aef477fe26379e94c18fd70f7790bc67 | ||||
| Merge: b511694 4f7a581 | ||||
| Author: Thomas Rast <trast@inf.ethz.ch> | ||||
| Date:   Fri Apr 12 16:16:24 2013 +0200 | ||||
|  | ||||
|     Merge across the rename | ||||
|  | ||||
|  | ||||
| commit 4f7a58195a92c400e28a2354328587f1ff14fb77f5cf894536f17ccbc72931b9 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:49:50 2013 +0100 | ||||
|  | ||||
|     another simple change | ||||
|  | ||||
| diff --git a/b.c b/b.c | ||||
| --- a/b.c | ||||
| +++ b/b.c | ||||
| @@ -4,14 +4,14 @@ | ||||
|  long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
| -		x >>= 1; | ||||
| +		x /= 2; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
|   * This is only an example! | ||||
|   */ | ||||
|   | ||||
|  | ||||
| commit b511694f5337663fbd697622993a5f8e1099eca84be4df313f2b3ee94a098b42 | ||||
| Author: Thomas Rast <trast@inf.ethz.ch> | ||||
| Date:   Fri Apr 12 16:15:57 2013 +0200 | ||||
|  | ||||
|     change on another line of history while rename happens | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -4,14 +4,14 @@ | ||||
|  long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
| - * This is only an example! | ||||
| + * This is only a short example! | ||||
|   */ | ||||
|   | ||||
|  | ||||
| commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:41 2013 +0100 | ||||
|  | ||||
|     touch comment | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,14 +3,14 @@ | ||||
|  long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
| - * A comment. | ||||
| + * This is only an example! | ||||
|   */ | ||||
|   | ||||
|  | ||||
| commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:16 2013 +0100 | ||||
|  | ||||
|     touch both functions | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,14 +3,14 @@ | ||||
| -int f(int x) | ||||
| +long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
|   * A comment. | ||||
|   */ | ||||
|   | ||||
|  | ||||
| commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:55 2013 +0100 | ||||
|  | ||||
|     change f() | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,13 +3,14 @@ | ||||
|  int f(int x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
| +	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
|   * A comment. | ||||
|   */ | ||||
|   | ||||
|  | ||||
| commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:48 2013 +0100 | ||||
|  | ||||
|     initial | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- /dev/null | ||||
| +++ b/a.c | ||||
| @@ -0,0 +3,13 @@ | ||||
| +int f(int x) | ||||
| +{ | ||||
| +	int s = 0; | ||||
| +	while (x) { | ||||
| +		x >>= 1; | ||||
| +		s++; | ||||
| +	} | ||||
| +} | ||||
| + | ||||
| +/* | ||||
| + * A comment. | ||||
| + */ | ||||
| + | ||||
|  | @ -0,0 +1,59 @@ | |||
| commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:16 2013 +0100 | ||||
|  | ||||
|     touch both functions | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,9 +3,9 @@ | ||||
| -int f(int x) | ||||
| +long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|  | ||||
| commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:55 2013 +0100 | ||||
|  | ||||
|     change f() | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,8 +3,9 @@ | ||||
|  int f(int x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
| +	return s; | ||||
|  } | ||||
|  | ||||
| commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:48 2013 +0100 | ||||
|  | ||||
|     initial | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- /dev/null | ||||
| +++ b/a.c | ||||
| @@ -0,0 +3,8 @@ | ||||
| +int f(int x) | ||||
| +{ | ||||
| +	int s = 0; | ||||
| +	while (x) { | ||||
| +		x >>= 1; | ||||
| +		s++; | ||||
| +	} | ||||
| +} | ||||
|  | @ -0,0 +1,100 @@ | |||
| commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:41 2013 +0100 | ||||
|  | ||||
|     touch comment | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,14 +3,14 @@ | ||||
|  long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
| - * A comment. | ||||
| + * This is only an example! | ||||
|   */ | ||||
|   | ||||
|  | ||||
| commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:16 2013 +0100 | ||||
|  | ||||
|     touch both functions | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,14 +3,14 @@ | ||||
| -int f(int x) | ||||
| +long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
|   * A comment. | ||||
|   */ | ||||
|   | ||||
|  | ||||
| commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:55 2013 +0100 | ||||
|  | ||||
|     change f() | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,13 +3,14 @@ | ||||
|  int f(int x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
| +	return s; | ||||
|  } | ||||
|   | ||||
|  /* | ||||
|   * A comment. | ||||
|   */ | ||||
|   | ||||
|  | ||||
| commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:48 2013 +0100 | ||||
|  | ||||
|     initial | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- /dev/null | ||||
| +++ b/a.c | ||||
| @@ -0,0 +3,13 @@ | ||||
| +int f(int x) | ||||
| +{ | ||||
| +	int s = 0; | ||||
| +	while (x) { | ||||
| +		x >>= 1; | ||||
| +		s++; | ||||
| +	} | ||||
| +} | ||||
| + | ||||
| +/* | ||||
| + * A comment. | ||||
| + */ | ||||
| + | ||||
|  | @ -0,0 +1,68 @@ | |||
| commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:43 2013 +0100 | ||||
|  | ||||
|     change back to complete line | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -18,5 +18,5 @@ | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| \ No newline at end of file | ||||
| +} | ||||
|  | ||||
| commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:10 2013 +0100 | ||||
|  | ||||
|     change to an incomplete line at end | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -18,5 +18,5 @@ | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| +} | ||||
| \ No newline at end of file | ||||
|  | ||||
| commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:16 2013 +0100 | ||||
|  | ||||
|     touch both functions | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -17,5 +17,5 @@ | ||||
|  int main () | ||||
|  { | ||||
| -	printf("%d\n", f(15)); | ||||
| +	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
|  } | ||||
|  | ||||
| commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:48 2013 +0100 | ||||
|  | ||||
|     initial | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- /dev/null | ||||
| +++ b/a.c | ||||
| @@ -0,0 +16,5 @@ | ||||
| +int main () | ||||
| +{ | ||||
| +	printf("%d\n", f(15)); | ||||
| +	return 0; | ||||
| +} | ||||
|  | @ -0,0 +1,70 @@ | |||
| commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:43 2013 +0100 | ||||
|  | ||||
|     change back to complete line | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -18,5 +18,7 @@ | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| \ No newline at end of file | ||||
| +} | ||||
| + | ||||
| +/* incomplete lines are bad! */ | ||||
|  | ||||
| commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:10 2013 +0100 | ||||
|  | ||||
|     change to an incomplete line at end | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -18,5 +18,5 @@ | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| +} | ||||
| \ No newline at end of file | ||||
|  | ||||
| commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:16 2013 +0100 | ||||
|  | ||||
|     touch both functions | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -17,5 +17,5 @@ | ||||
|  int main () | ||||
|  { | ||||
| -	printf("%d\n", f(15)); | ||||
| +	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
|  } | ||||
|  | ||||
| commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:48 2013 +0100 | ||||
|  | ||||
|     initial | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- /dev/null | ||||
| +++ b/a.c | ||||
| @@ -0,0 +16,5 @@ | ||||
| +int main () | ||||
| +{ | ||||
| +	printf("%d\n", f(15)); | ||||
| +	return 0; | ||||
| +} | ||||
|  | @ -0,0 +1,102 @@ | |||
| commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:43 2013 +0100 | ||||
|  | ||||
|     change back to complete line | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -18,5 +18,5 @@ | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| \ No newline at end of file | ||||
| +} | ||||
|  | ||||
| commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:10 2013 +0100 | ||||
|  | ||||
|     change to an incomplete line at end | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -18,5 +18,5 @@ | ||||
|  int main () | ||||
|  { | ||||
|  	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
| -} | ||||
| +} | ||||
| \ No newline at end of file | ||||
|  | ||||
| commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:45:16 2013 +0100 | ||||
|  | ||||
|     touch both functions | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,9 +3,9 @@ | ||||
| -int f(int x) | ||||
| +long f(long x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
|  	return s; | ||||
|  } | ||||
| @@ -17,5 +17,5 @@ | ||||
|  int main () | ||||
|  { | ||||
| -	printf("%d\n", f(15)); | ||||
| +	printf("%ld\n", f(15)); | ||||
|  	return 0; | ||||
|  } | ||||
|  | ||||
| commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:55 2013 +0100 | ||||
|  | ||||
|     change f() | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -3,8 +3,9 @@ | ||||
|  int f(int x) | ||||
|  { | ||||
|  	int s = 0; | ||||
|  	while (x) { | ||||
|  		x >>= 1; | ||||
|  		s++; | ||||
|  	} | ||||
| +	return s; | ||||
|  } | ||||
|  | ||||
| commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:48 2013 +0100 | ||||
|  | ||||
|     initial | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- /dev/null | ||||
| +++ b/a.c | ||||
| @@ -0,0 +3,8 @@ | ||||
| +int f(int x) | ||||
| +{ | ||||
| +	int s = 0; | ||||
| +	while (x) { | ||||
| +		x >>= 1; | ||||
| +		s++; | ||||
| +	} | ||||
| +} | ||||
|  | @ -0,0 +1,39 @@ | |||
| commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:43 2013 +0100 | ||||
|  | ||||
|     change back to complete line | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -22,1 +24,1 @@ | ||||
| -} | ||||
| \ No newline at end of file | ||||
| +/* incomplete lines are bad! */ | ||||
|  | ||||
| commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:48:10 2013 +0100 | ||||
|  | ||||
|     change to an incomplete line at end | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- a/a.c | ||||
| +++ b/a.c | ||||
| @@ -22,1 +22,1 @@ | ||||
| -} | ||||
| +} | ||||
| \ No newline at end of file | ||||
|  | ||||
| commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592 | ||||
| Author: Thomas Rast <trast@student.ethz.ch> | ||||
| Date:   Thu Feb 28 10:44:48 2013 +0100 | ||||
|  | ||||
|     initial | ||||
|  | ||||
| diff --git a/a.c b/a.c | ||||
| --- /dev/null | ||||
| +++ b/a.c | ||||
| @@ -0,0 +20,1 @@ | ||||
| +} | ||||
		Loading…
	
		Reference in New Issue
	
	 brian m. carlson
						brian m. carlson