Repository navigation
Conversation
- Files added upstream were found by the epoch date 1969-12-31, which is how diff prints it only west of UTC. In UTC it prints 1970-01-01, so no added files were found. Match either. - The memcheck part printed "add ..."/"remove ...", which are not commands, with valgrind/memcheck/ paths instead of Fjalar's copy in valgrind/fjalar/; and its remove branch could never match. Now it prints git add / git rm -r for valgrind/fjalar/ paths, using the same patterns as the coregrind part. - Use git rm -r, because upstream sometimes removes a whole directory. - Print one command per line, under comment headers, for easier review.
|
Warning Review limit reached
This review includes 5 billable files and costs up to $1.25. Or wait 53 minutes for your next included review. View limit details
Comment |
Compare valgrind-old with valgrind-new directly instead of parsing patch timestamps. Copy binary files, which patch skips; comment out removals of Fjalar's memcheck files; quote paths; fail if run in the wrong directory. Document running the output with bash -ev.
Member
Author
|
Superseded by #103. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
make git-updateprints thegit add/git rmcommands for files that a Valgrind merge added or removed. It had three bugs:1969-12-31, whichdiff --unidirectional-new-fileprints for the epoch only west of UTC. In UTC it prints1970-01-01, so the target silently found no added files at all.valgrind/fjalar/, but the memcheck part printedadd .../remove ...(not commands) withvalgrind/memcheck/...paths. Itsremovebranch matched+++ ... 1969-12-31, which never occurs with--unidirectional-new-file.git rmfor directories that upstream removed, which fails without-r.This PR is based on
masterand doesn't depend on any other open PR; it can merge in any order with #96–#101.Changes
valgrind-old/memcheck/tovalgrind/fjalar/, and finds removals fromOnly in valgrind-old/memcheck...lines.git rm -r.# Memcheck files added upstream; Fjalar may not need all of them, etc.), so the output is easier to review and still runs as a script.Testing
Synthetic old/new upstream trees with files added, removed, and modified in both
coregrind/andmemcheck/, a removed directory in each, and a new file undermemcheck/tests/(whichmemcheck.patchexcludes). Patches were made with the samediffcommands asgenerate-patch-files.sh, in bothTZ=UTCandTZ=America/Los_Angeles.git addat all; in Pacific time,add valgrind/memcheck/mc_added.cfor memcheck and plaingit rmfor directories.bash -ein a toy Fjalar repository staged exactly the expected adds and removals, including both removed directories.make docbuilds.Real upstream examples are rare: the last memcheck source file added was
mc_main_asm.c(3.14.0), and the last removal was in 3.8.0. But the time-zone bug affects every added file.