Commit 94a1947
committed
fix: promotion over non-existent file
When we use "git diff" as the git tool, we have some logic to resolve
symlinks since "git diff" doesn't handle them. This logic doesn't take
into account the case where the target of a symlink doesn't exist, which
happens when the file you are promoting doesn't exist yet.
This can easily be fixed by taking into account this case.
Signed-off-by: Ali Caglayan <[email protected]>1 parent efe0f89 commit 94a1947
File tree
3 files changed
+14
-8
lines changed- doc/changes/fixed
- src/promote
- test/blackbox-tests/test-cases/promote
3 files changed
+14
-8
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
17 | | - | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
18 | 22 | | |
19 | 23 | | |
20 | 24 | | |
| |||
Lines changed: 6 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
0 commit comments