Commit b46c37b
Generalization of the `.git/MERGE_MSG' path
In general the `MERGE_MSG' file doesn't need to be located under the
local `.git' directory. In these cases the script `ciq-cherry-pick.py'
will fail.
An example would be a git repository created with `git-worktree'. Assume
the current directory contains a regular git repository `some-project'
with a branch `branch-x' and some commit with a hash
‹some-commit›. Without this change the last command would fail while it
shouldn't
,----
| cd some-project
| git worktree add ../some-project-branch-x branch-x
| cd ../some-project-branch-x
| python3 ‹kernel-src-tree-tools-dir›/ciq-cherry-pick.py --sha ‹some-commit›
`----
In case of the `some-project-branch-x' repoitory the `MERGE_MSG' file is
under `some-project/.git/worktrees/some-project-branch-x/MERGE_MSG'.1 parent 62b7f1a commit b46c37b
1 file changed
+2
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | 6 | | |
6 | 7 | | |
7 | 8 | | |
8 | | - | |
| 9 | + | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
| |||
0 commit comments