RE: git merge (again) (was Re: [csmith-project/csmith] 0229d0: ...)

["Xuejun Yang" <jxyang@cs.utah.edu>]

Eric, I know you are going raise the eyebrow. I did try "rebase", and git
wouldn't allow me. Here is the error message:

> git rebase master fixes
cannot rebase: you have unstaged changes
M       autoconf/compile
M       autoconf/config.guess
M       autoconf/config.sub
M       autoconf/depcomp
M       autoconf/install-sh
M       autoconf/missing
M       bootstrap
M       configure
M       scripts/compiler_test.pl
M       scripts/launchn.pl
M       scripts/test_csmith.pl
M       utah/scripts/coverage/build_gcov_compilers.pl
M       utah/scripts/coverage/gen_cov.pl
M       utah/scripts/coverage/parse_cov_results.pl
M       utah/scripts/john_driver/RunSafely.sh
M       utah/scripts/john_driver/build_compiler.pl
M       utah/scripts/john_driver/evaluate_program.pl
M       utah/scripts/john_driver/kill-random.pl
M       utah/scripts/john_driver/launchn.pl
M       utah/scripts/john_driver/random_test.pl
M       utah/scripts/john_driver/random_test_llvm_killer.pl
M       utah/scripts/john_driver/run_program.pl
M       utah/scripts/john_driver/see_results.sh
M       utah/scripts/one_off/binsrch_det.pl
M       utah/scripts/one_off/binsrch_randomized.pl
M       utah/scripts/one_off/collect_results.pl
M       utah/scripts/one_off/compare_size.pl
M       utah/scripts/one_off/compare_sizes.pl
M       utah/scripts/one_off/conf.pl
M       utah/scripts/one_off/create_result_table_for_journal_paper.pl
M       utah/scripts/one_off/extract_csum.pl
M       utah/scripts/one_off/find_args.pl
M       utah/scripts/one_off/find_termination_bugs.pl
M       utah/scripts/one_off/make_progs.pl
M       utah/scripts/one_off/nonterm.pl
M       utah/scripts/one_off/normalize.pl
M       utah/scripts/one_off/quest_test.pl
M       utah/scripts/one_off/random_test_vc.pl
M       utah/scripts/one_off/run_tests.pl
M       utah/scripts/one_off/runit_test.pl
M       utah/scripts/one_off/select_writes.pl
M       utah/scripts/one_off/simd.pl
M       utah/scripts/one_off/size_hist.pl
M       utah/scripts/one_off/size_test.pl
M       utah/scripts/one_off/small_seeds.pl
M       utah/scripts/one_off/test_clang.pl
M       utah/scripts/one_off/test_clang2.pl
M       utah/scripts/one_off/test_compcert.pl
M       utah/scripts/one_off/test_framac.pl
M       utah/scripts/one_off/test_warnings.pl
M       utah/scripts/one_off/testlto.pl
M       utah/scripts/one_off/unwrap_math.pl
M       utah/scripts/one_off/version_search.pl
M       utah/scripts/reduce/c_delta.pl
M       utah/scripts/reduce/godelta
M       utah/scripts/reduce/prep.pl
M       utah/scripts/reduce/reduce.sh
M       utah/scripts/reduce/reduce_log.sh
M       utah/scripts/reduce/shorten.pl
M       utah/scripts/reduce/simple_delta.pl
M       utah/scripts/reduce/test1_crash.sh
M       utah/scripts/reduce/test1_null.sh
M       utah/scripts/reduce/test1_wrong_code.sh

And I am totally confused. I didn't touch these files at all.

-Xuejun

> -----Original Message-----
> From: csmith-commits-bounces@flux.utah.edu
> [mailto:csmith-commits-bounces@flux.utah.edu] On Behalf Of Eric Eide
> Sent: Wednesday, May 25, 2011 3:14 PM
> To: csmith-commits@flux.utah.edu
> Subject: Re: git merge (again) (was Re: [csmith-project/csmith] 0229d0:
...)
> 
> 	Eric> See yesterday's email for discussion about how to avoid merge
> 	Eric> commits for little bits of work.
> 
> As some evidence of the usefulness of rebasing, consider the current
history:
> 
>   [clos:] eeide% git log --graph --oneline -n 10
>   * 90fb2dc Use `*_HOME' instead of `*_PATH' variable names consistently.
>   * 9cbc259 Rename environment variable `CSMITH_PATH' to
> `CSMITH_HOME'.
>   *   e26ec75 Merge branch 'master' of github.com:csmith-project/csmith
>   |\
>   | * 4dd3514 Quick hack to speed up c_delta: try removing all extra
> whitespace
>   | *   878f618 Merge branch 'master' of github.com:csmith-project/csmith
>   | |\
>   | | * a0cabb4 Reported one more clang wrong code bug
>   | * | cef5282 More paths wrong...
>   | |/
>   | * 5cb9751 Fixup a path.
>   * | 0229d0c fix a assertion failure during generation for seed
1080606471.
>   |/
>   * 4919caf One more gcc crash bug reported by Arthur O'Dwyer
> 
> We now have three parallel lines of development in the recent history.
While
> this is true, it is not very "interesting" in some sense, and this is why
> people try to avoid it.
> 
> If I hadn't rebased my CSMITH_HOME hackery, we could have had an even
> more
> uninterestingly tangled history :-).
> 
> Eric.
> 
> --
>
----------------------------------------------------------------------------
---
> Eric Eide <eeide@cs.utah.edu>  .         University of Utah School of
> Computing
> http://www.cs.utah.edu/~eeide/ . +1 (801) 585-5512 voice, +1 (801)
581-5843
> FAX