airflow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlo...@apache.org
Subject [2/3] incubator-airflow git commit: [AIRFLOW-175] Run git-reset before checkout in PR tool
Date Wed, 25 May 2016 15:41:06 GMT
[AIRFLOW-175] Run git-reset before checkout in PR tool

If the user made any changes, git checkout will fail because the
changes would be overwritten. Running git reset blows the changes away.


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/6d87679a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/6d87679a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/6d87679a

Branch: refs/heads/master
Commit: 6d87679a56b7fd6f918439db953ca6b959752721
Parents: 805944b
Author: jlowin <jlowin@apache.org>
Authored: Wed May 25 10:49:10 2016 -0400
Committer: jlowin <jlowin@apache.org>
Committed: Wed May 25 10:53:22 2016 -0400

----------------------------------------------------------------------
 dev/airflow-pr | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/6d87679a/dev/airflow-pr
----------------------------------------------------------------------
diff --git a/dev/airflow-pr b/dev/airflow-pr
index dab9540..8dd8df7 100755
--- a/dev/airflow-pr
+++ b/dev/airflow-pr
@@ -129,6 +129,9 @@ def clean_up():
     if 'original_head' not in globals():
         return
 
+    click.echo('Resetting git to remove any changes')
+    run_cmd('git reset --hard')
+
     click.echo("Restoring head pointer to %s" % original_head)
     run_cmd("git checkout %s" % original_head)
 


Mime
View raw message