chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fbdbb12
)
Split brain: Quieten dgit-view checkout
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 6 Dec 2015 20:57:55 +0000
(20:57 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jul 2016 15:47:47 +0000
(16:47 +0100)
dgit
patch
|
blob
|
history
diff --git
a/dgit
b/dgit
index fedc7fb015d8cd255f568b47e978aa9e0dd887b0..1477d1725ac6d3ed09384f2cd0b901173ad890ce 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2583,7
+2583,7
@@
sub quiltify_splitbrain ($$$$$$) {
runcmd shell_cmd 'exec >/dev/null', @gbppq, qw(import);
# gbp-pq import creates a fresh branch; push back to dgit-view
runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
- runcmd @git, qw(checkout dgit-view);
+ runcmd @git, qw(checkout
-q
dgit-view);
}
if (($diffbits->{H2O} & 02) && # user has modified .gitignore
!($diffbits->{O2A} & 02)) { # patches do not change .gitignore