Finalise the package for git-absorb
Andrej Shadura
3 years ago
| 0 | |
- needs git2 0.13
|
| 1 | |
- needs memchr 2.3
|
| 1 | 1 |
|
| 2 | 2 |
* Package git-absorb 0.6.6 from crates.io using debcargo 2.4.3
|
| 3 | 3 |
|
| 4 | |
-- Andrej Shadura <andrewsh@debian.org> Wed, 04 Nov 2020 23:15:14 +0100
|
|
4 |
-- Andrej Shadura <andrewsh@debian.org> Thu, 05 Nov 2020 09:47:43 +0100
|
| 0 | 0 |
overlay = "."
|
| 1 | 1 |
uploaders = ["Andrej Shadura <andrewsh@debian.org>"]
|
|
2 |
|
|
3 |
[packages.bin]
|
|
4 |
section = "vcs"
|
|
5 |
description = """
|
|
6 |
git-absorb is a port of hg absorb to Git.
|
|
7 |
|
|
8 |
git absorb automatically identifies which commits are safe to modify, and which indexed changes belong to each of those commits. It then writes fixup! commits for each of those changes. These fixups can later be folded into the feature branch with Git's built-in autosquash functionality.
|
|
9 |
"""
|
src/git-absorb/debian/manpages
less
more
|
0 |
This reverts commit 9a1983982a3e0ac012231e34d5688cfd76b2aaa5.
|
|
1 |
|
|
2 |
--- a/Cargo.toml
|
|
3 |
+++ b/Cargo.toml
|
|
4 |
@@ -32,11 +32,11 @@ version = "~1.0"
|
|
5 |
version = "~2.33"
|
|
6 |
|
|
7 |
[dependencies.git2]
|
|
8 |
-version = "~0.13"
|
|
9 |
+version = ">= 0.9"
|
|
10 |
default-features = false
|
|
11 |
|
|
12 |
[dependencies.memchr]
|
|
13 |
-version = "~2.3"
|
|
14 |
+version = ">= 2.2"
|
|
15 |
|
|
16 |
[dependencies.slog]
|
|
17 |
version = "~2.5"
|
|
18 |
diff --git a/src/stack.rs b/src/stack.rs
|
|
19 |
index ff7015c..d7cf3c8 100644
|
|
20 |
--- a/src/stack.rs
|
|
21 |
+++ b/src/stack.rs
|
|
22 |
@@ -29,9 +29,9 @@ pub fn working_stack<'repo>(
|
|
23 |
}
|
|
24 |
|
|
25 |
let mut revwalk = repo.revwalk()?;
|
|
26 |
- revwalk.set_sorting(git2::Sort::TOPOLOGICAL)?;
|
|
27 |
+ revwalk.set_sorting(git2::Sort::TOPOLOGICAL);
|
|
28 |
revwalk.push_head()?;
|
|
29 |
- revwalk.simplify_first_parent()?;
|
|
30 |
+ revwalk.simplify_first_parent();
|
|
31 |
debug!(logger, "head pushed"; "head" => head.name());
|
|
32 |
|
|
33 |
let base_commit = match user_provided_base {
|
|
34 |
|
|
0 |
#!/usr/bin/make -f
|
|
1 |
%:
|
|
2 |
dh $@ --buildsystem cargo
|
|
3 |
|
|
4 |
override_dh_auto_install:
|
|
5 |
dh_auto_install
|
|
6 |
mkdir -p debian/git-absorb/usr/lib/git-core
|
|
7 |
mv debian/git-absorb/usr/bin/* debian/git-absorb/usr/lib/git-core
|
|
0 |
#!/usr/bin/make -f
|
|
1 |
%:
|
|
2 |
dh $@ --buildsystem cargo
|