solit brain: Do not crash in when the two brains are actually identical.

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 7ca97c57f018f5b59df7ca92aa6868f8fa8ee503..5ee61ef95567a5d851f7d8ae4f0f81525ce04cf8 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -551,7 +551,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
               'dgit.default.ssh' => 'ssh',
               'dgit.default.archive-query' => 'madison:',
               'dgit.default.sshpsql-dbname' => 'service=projectb',
-              'dgit.default.dgit-tag-format' => 'old,new,maint',
+              'dgit.default.dgit-tag-format' => 'new,old,maint',
               # old means "repo server accepts pushes with old dgit tags"
               # new means "repo server accepts pushes with new dgit tags"
               # maint means "repo server accepts split brain pushes"
@@ -3909,7 +3909,7 @@ Commit patch to update .gitignore
 END
     }
 
-    my $dgitview = git_rev_parse 'refs/heads/dgit-view';
+    my $dgitview = git_rev_parse 'HEAD';
 
     changedir '../../../..';
     # When we no longer need to support squeeze, use --create-reflog